From 3a764dafb5eb64949a3371b1f72f02161b313ea4 Mon Sep 17 00:00:00 2001 From: lijunle Date: Mon, 20 Jan 2020 01:08:26 -0800 Subject: [PATCH 01/15] Stop generate NuGet package during build. --- Vsxmd/Vsxmd.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vsxmd/Vsxmd.csproj b/Vsxmd/Vsxmd.csproj index ab8ae53..aff0d50 100644 --- a/Vsxmd/Vsxmd.csproj +++ b/Vsxmd/Vsxmd.csproj @@ -20,7 +20,7 @@ - true + false Vsxmd 0.0.0 Junle Li, Sales Lessa Lopes From e551b2c348f698263a19e68823bfe3acac1e3940 Mon Sep 17 00:00:00 2001 From: lijunle Date: Fri, 3 Jan 2020 10:44:49 -0800 Subject: [PATCH 02/15] Target project on .Net Core 3.1. --- Vsxmd/Vsxmd.csproj | 3 +-- Vsxmd/lib/_._ | 0 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 Vsxmd/lib/_._ diff --git a/Vsxmd/Vsxmd.csproj b/Vsxmd/Vsxmd.csproj index aff0d50..8b1ecc7 100644 --- a/Vsxmd/Vsxmd.csproj +++ b/Vsxmd/Vsxmd.csproj @@ -3,8 +3,7 @@ Exe - netcoreapp2.2 - netcoreapp2.2;net46 + netcoreapp3.1 Vsxmd.xml diff --git a/Vsxmd/lib/_._ b/Vsxmd/lib/_._ new file mode 100644 index 0000000..e69de29 From b261ce96d18980e86a43af07e654e703f2fc5b07 Mon Sep 17 00:00:00 2001 From: lijunle Date: Mon, 20 Jan 2020 01:09:37 -0800 Subject: [PATCH 03/15] Stop run the Vsxmd target temporarily. --- Vsxmd/Vsxmd.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vsxmd/Vsxmd.csproj b/Vsxmd/Vsxmd.csproj index 8b1ecc7..5f09b96 100644 --- a/Vsxmd/Vsxmd.csproj +++ b/Vsxmd/Vsxmd.csproj @@ -53,6 +53,6 @@ $(OutputPath)\.. - + From f0683a89ad99c90b1b8edd22f0cd9350a015c38a Mon Sep 17 00:00:00 2001 From: lijunle Date: Fri, 3 Jan 2020 13:17:54 -0800 Subject: [PATCH 04/15] Fix some build warnings on .Net Core 3.1 --- Vsxmd/Units/Extensions.cs | 8 ++++---- Vsxmd/Units/MemberName.cs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Vsxmd/Units/Extensions.cs b/Vsxmd/Units/Extensions.cs index 694ea7b..49db2a2 100644 --- a/Vsxmd/Units/Extensions.cs +++ b/Vsxmd/Units/Extensions.cs @@ -50,7 +50,7 @@ internal static string Suffix(this string value, string suffix) => /// The content. /// The escaped content. internal static string Escape(this string content) => - content.Replace("`", @"\`"); + content.Replace("`", @"\`", StringComparison.InvariantCulture); /// /// Generate an anchor for the . @@ -91,7 +91,7 @@ internal static string ToReferenceLink(this string memberName, bool useShortName internal static string AsCode(this string code) { string backticks = "`"; - while (code.Contains(backticks)) + while (code.Contains(backticks, StringComparison.InvariantCulture)) { backticks += "`"; } @@ -151,7 +151,7 @@ private static string ToMarkdownSpan(XNode node) var text = node as XText; if (text != null) { - return text.Value.Escape().TrimStart(' ').Replace(" ", string.Empty); + return text.Value.Escape().TrimStart(' ').Replace(" ", string.Empty, StringComparison.InvariantCulture); } var child = node as XElement; @@ -170,7 +170,7 @@ private static string ToMarkdownSpan(XNode node) case "code": var lang = child.Attribute("lang")?.Value ?? string.Empty; - string value = child.Nodes().First().ToString().Replace("\t", " "); + string value = child.Nodes().First().ToString().Replace("\t", " ", StringComparison.InvariantCulture); var indexOf = FindIndexOf(value); var codeblockLines = value.Split(Environment.NewLine.ToCharArray()) diff --git a/Vsxmd/Units/MemberName.cs b/Vsxmd/Units/MemberName.cs index 70e9949..459d099 100644 --- a/Vsxmd/Units/MemberName.cs +++ b/Vsxmd/Units/MemberName.cs @@ -54,9 +54,9 @@ internal MemberName(string name) ? MemberKind.Constants : this.type == 'P' ? MemberKind.Property - : this.type == 'M' && this.name.Contains(".#ctor") + : this.type == 'M' && this.name.Contains(".#ctor", StringComparison.InvariantCulture) ? MemberKind.Constructor - : this.type == 'M' && !this.name.Contains(".#ctor") + : this.type == 'M' && !this.name.Contains(".#ctor", StringComparison.InvariantCulture) ? MemberKind.Method : MemberKind.NotSupported; From 12f566f30c0888082fe9f71fd13030fb325c1e9b Mon Sep 17 00:00:00 2001 From: lijunle Date: Mon, 20 Jan 2020 01:44:38 -0800 Subject: [PATCH 05/15] Build cross platform binaries in AppVeyor. --- appveyor.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 74f444a..da92021 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,8 +1,7 @@ version: 0.0.{build} image: - - Visual Studio 2017 - - Ubuntu + - Visual Studio 2019 shallow_clone: true @@ -28,9 +27,14 @@ dotnet_csproj: informational_version: "{version}" before_build: - - ps: msbuild -t:restore - ps: ./Vsxmd/Test.ps1 -Prepare +build_script: + - dotnet publish --runtime win-x64 + - dotnet publish --runtime win-x86 + - dotnet publish --runtime linux-x64 + - dotnet publish --runtime osx-x64 + test_script: - ps: ./Vsxmd/Test.ps1 -Run From 72d308f4d523257c8b6d1b8fc7b5059bdb61d4e0 Mon Sep 17 00:00:00 2001 From: lijunle Date: Mon, 20 Jan 2020 01:47:01 -0800 Subject: [PATCH 06/15] Pack binaries as zip and upload to artifacts. --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index da92021..b16a448 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,9 +34,11 @@ build_script: - dotnet publish --runtime win-x86 - dotnet publish --runtime linux-x64 - dotnet publish --runtime osx-x64 + - 7z a -r Vsxmd\obj\Vsxmd.zip Vsxmd\bin\Release test_script: - ps: ./Vsxmd/Test.ps1 -Run artifacts: + - path: 'Vsxmd\obj\Vsxmd.zip' - path: 'Vsxmd\**\*.nupkg' From 22539f2171fcd911abb868aabbbafddcd95f464d Mon Sep 17 00:00:00 2001 From: lijunle Date: Mon, 20 Jan 2020 01:43:12 -0800 Subject: [PATCH 07/15] Configure to publish as trimmed single executable. --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b16a448..67f24b2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -30,10 +30,10 @@ before_build: - ps: ./Vsxmd/Test.ps1 -Prepare build_script: - - dotnet publish --runtime win-x64 - - dotnet publish --runtime win-x86 - - dotnet publish --runtime linux-x64 - - dotnet publish --runtime osx-x64 + - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime linux-x64 + - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime osx-x64 + - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime win-x64 + - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime win-x86 - 7z a -r Vsxmd\obj\Vsxmd.zip Vsxmd\bin\Release test_script: From 06a67089a8677ba5fcc0028be792f355a518cef9 Mon Sep 17 00:00:00 2001 From: lijunle Date: Mon, 20 Jan 2020 03:53:41 -0800 Subject: [PATCH 08/15] Pack binaries into NuGet package. --- Vsxmd/Vsxmd.csproj | 20 +++++++++----------- appveyor.yml | 5 ++++- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Vsxmd/Vsxmd.csproj b/Vsxmd/Vsxmd.csproj index 5f09b96..558b60e 100644 --- a/Vsxmd/Vsxmd.csproj +++ b/Vsxmd/Vsxmd.csproj @@ -19,7 +19,6 @@ - false Vsxmd 0.0.0 Junle Li, Sales Lessa Lopes @@ -28,25 +27,24 @@ LICENSE https://github.com/lijunle/Vsxmd Vsxmd VS XML document Markdown - tools true - true + false true true - ExcludeDocumentationFile + true + + + <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\linux-x64\publish\" PackagePath="tools\linux-x64\" /> + <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\osx-x64\publish\" PackagePath="tools\osx-x64\" /> + <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\win-x64\publish\" PackagePath="tools\win-x64\" /> + <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\win-x86\publish\" PackagePath="tools\win-x86\" /> + - - - - <_BuildOutputInPackage Remove="$(MSBuildProjectDirectory)\$(DocumentationFile)" /> - <_BuildOutputInPackage Remove="$(MSBuildProjectDirectory)\**\$(DocumentationFile)" /> - - diff --git a/appveyor.yml b/appveyor.yml index 67f24b2..bd42ae6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -34,11 +34,14 @@ build_script: - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime osx-x64 - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime win-x64 - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime win-x86 - - 7z a -r Vsxmd\obj\Vsxmd.zip Vsxmd\bin\Release test_script: - ps: ./Vsxmd/Test.ps1 -Run +after_test: + - 7z a -r Vsxmd\obj\Vsxmd.zip Vsxmd\bin\Release + - dotnet pack Vsxmd --no-restore --no-build + artifacts: - path: 'Vsxmd\obj\Vsxmd.zip' - path: 'Vsxmd\**\*.nupkg' From 8e92d88caa243e7498e4b3173e271df0e56260c4 Mon Sep 17 00:00:00 2001 From: lijunle Date: Mon, 20 Jan 2020 04:02:40 -0800 Subject: [PATCH 09/15] Clean up AppVeyor configuration file. --- appveyor.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index bd42ae6..cd19ab2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,9 +14,6 @@ platform: configuration: - Release -matrix: - fast_finish: true - dotnet_csproj: patch: true file: '**\*.csproj' @@ -27,7 +24,7 @@ dotnet_csproj: informational_version: "{version}" before_build: - - ps: ./Vsxmd/Test.ps1 -Prepare + - ps: Vsxmd\Test.ps1 -Prepare build_script: - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime linux-x64 @@ -36,7 +33,7 @@ build_script: - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime win-x86 test_script: - - ps: ./Vsxmd/Test.ps1 -Run + - ps: Vsxmd\Test.ps1 -Run after_test: - 7z a -r Vsxmd\obj\Vsxmd.zip Vsxmd\bin\Release From 335cb80e53674f72149993d597077a4177c732e1 Mon Sep 17 00:00:00 2001 From: lijunle Date: Mon, 20 Jan 2020 04:06:29 -0800 Subject: [PATCH 10/15] Not generate debug package anymore. --- Vsxmd/Vsxmd.csproj | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Vsxmd/Vsxmd.csproj b/Vsxmd/Vsxmd.csproj index 558b60e..8eaff88 100644 --- a/Vsxmd/Vsxmd.csproj +++ b/Vsxmd/Vsxmd.csproj @@ -29,16 +29,14 @@ Vsxmd VS XML document Markdown true false - true - true true - <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\linux-x64\publish\" PackagePath="tools\linux-x64\" /> - <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\osx-x64\publish\" PackagePath="tools\osx-x64\" /> - <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\win-x64\publish\" PackagePath="tools\win-x64\" /> - <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\win-x86\publish\" PackagePath="tools\win-x86\" /> + <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\linux-x64\publish\Vsxmd" PackagePath="tools\linux-x64\" /> + <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\osx-x64\publish\Vsxmd" PackagePath="tools\osx-x64\" /> + <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\win-x64\publish\Vsxmd.exe" PackagePath="tools\win-x64\" /> + <_PackageFiles Include="bin\$(Configuration)\$(TargetFramework)\win-x86\publish\Vsxmd.exe" PackagePath="tools\win-x86\" /> From 4715cbf6bc383a92799291ec274b8dbc0f789c04 Mon Sep 17 00:00:00 2001 From: lijunle Date: Tue, 21 Jan 2020 15:18:58 -0800 Subject: [PATCH 11/15] Remove buildMultiTargeting file. --- Vsxmd/Vsxmd.csproj | 1 - Vsxmd/buildMultiTargeting/Vsxmd.targets | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 Vsxmd/buildMultiTargeting/Vsxmd.targets diff --git a/Vsxmd/Vsxmd.csproj b/Vsxmd/Vsxmd.csproj index 8eaff88..14f8195 100644 --- a/Vsxmd/Vsxmd.csproj +++ b/Vsxmd/Vsxmd.csproj @@ -41,7 +41,6 @@ - diff --git a/Vsxmd/buildMultiTargeting/Vsxmd.targets b/Vsxmd/buildMultiTargeting/Vsxmd.targets deleted file mode 100644 index 0731c94..0000000 --- a/Vsxmd/buildMultiTargeting/Vsxmd.targets +++ /dev/null @@ -1,4 +0,0 @@ - - - - From e75354b24a01c08f949aa39625e2981cc79a1c0d Mon Sep 17 00:00:00 2001 From: lijunle Date: Tue, 21 Jan 2020 16:26:41 -0800 Subject: [PATCH 12/15] Update the MSBuild targets file. --- Vsxmd/Vsxmd.csproj | 10 ++++++++-- Vsxmd/build/Vsxmd.targets | 14 ++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Vsxmd/Vsxmd.csproj b/Vsxmd/Vsxmd.csproj index 14f8195..09122f4 100644 --- a/Vsxmd/Vsxmd.csproj +++ b/Vsxmd/Vsxmd.csproj @@ -45,9 +45,15 @@ - $(OutputPath)\.. + linux-x64 + osx-x64 + win-x64 + win-x86 + $(OutputPath)/Vsxmd + $(OutputPath)/../Vsxmd + $(OutputPath)/../$(VsxmdRuntime)/Vsxmd - + diff --git a/Vsxmd/build/Vsxmd.targets b/Vsxmd/build/Vsxmd.targets index 83fbdb4..5c01f79 100644 --- a/Vsxmd/build/Vsxmd.targets +++ b/Vsxmd/build/Vsxmd.targets @@ -1,13 +1,15 @@ - + - $(MSBuildThisFileDirectory)/../tools - "$(VsxmdBinaryDirectory)/net46/Vsxmd.exe" - mono "$(VsxmdBinaryDirectory)/net46/Vsxmd.exe" - dotnet "$(VsxmdBinaryDirectory)/netcoreapp2.2/Vsxmd.dll" + linux-x64 + osx-x64 + win-x64 + win-x86 + $(MSBuildThisFileDirectory)/../tools/$(VsxmdRuntime) + $(VsxmdBinaryDirectory)/Vsxmd echo "The Vsxmd command is not currently available." - $(VsxmdBinary) "$(DocumentationFile)" "$(DocumentationMarkdown)" "$(VsxmdAutoDeleteXml)" + "$(VsxmdBinary)" "$(DocumentationFile)" "$(DocumentationMarkdown)" "$(VsxmdAutoDeleteXml)" From f9f83f6b7f3473b43335d3b12b3880adbfeb6fa6 Mon Sep 17 00:00:00 2001 From: lijunle Date: Tue, 21 Jan 2020 16:32:51 -0800 Subject: [PATCH 13/15] Show normal level logs in CI build. --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cd19ab2..bed97ca 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,10 +27,10 @@ before_build: - ps: Vsxmd\Test.ps1 -Prepare build_script: - - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime linux-x64 - - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime osx-x64 - - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime win-x64 - - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --runtime win-x86 + - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --verbosity normal --runtime linux-x64 + - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --verbosity normal --runtime osx-x64 + - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --verbosity normal --runtime win-x64 + - dotnet publish /p:PublishSingleFile=true /p:PublishTrimmed=true --verbosity normal --runtime win-x86 test_script: - ps: Vsxmd\Test.ps1 -Run From 70fbd0c91dc5dcc958478908d091c0310ed93022 Mon Sep 17 00:00:00 2001 From: lijunle Date: Tue, 21 Jan 2020 16:38:49 -0800 Subject: [PATCH 14/15] Update the copyright in NuGet package. --- Vsxmd/Vsxmd.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vsxmd/Vsxmd.csproj b/Vsxmd/Vsxmd.csproj index 09122f4..9a723bf 100644 --- a/Vsxmd/Vsxmd.csproj +++ b/Vsxmd/Vsxmd.csproj @@ -23,7 +23,7 @@ 0.0.0 Junle Li, Sales Lessa Lopes VS XML documentation -> Markdown syntax. - Copyright 2018 + Copyright 2015-Present LICENSE https://github.com/lijunle/Vsxmd Vsxmd VS XML document Markdown From 7ce05d33fa4359897c0912c7a3d8ac9b3d4d68ed Mon Sep 17 00:00:00 2001 From: Junle Li Date: Fri, 24 Jan 2020 03:19:57 -0800 Subject: [PATCH 15/15] Fix the VsxmdBinary variable. --- Vsxmd/build/Vsxmd.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Vsxmd/build/Vsxmd.targets b/Vsxmd/build/Vsxmd.targets index 5c01f79..7079169 100644 --- a/Vsxmd/build/Vsxmd.targets +++ b/Vsxmd/build/Vsxmd.targets @@ -7,7 +7,8 @@ win-x64 win-x86 $(MSBuildThisFileDirectory)/../tools/$(VsxmdRuntime) - $(VsxmdBinaryDirectory)/Vsxmd + $(VsxmdBinaryDirectory)/Vsxmd + $(VsxmdBinaryDirectory)/Vsxmd.exe echo "The Vsxmd command is not currently available." "$(VsxmdBinary)" "$(DocumentationFile)" "$(DocumentationMarkdown)" "$(VsxmdAutoDeleteXml)"