From 35c83d3b9fad0faba1df7d8043de8b5b8246771f Mon Sep 17 00:00:00 2001 From: trondr Date: Sun, 19 Sep 2021 13:10:12 +0200 Subject: [PATCH 1/3] Add support for net5.0 --- XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj | 5 ++++- .../XmlDoc2CmdletDoc.TestModule.csproj | 5 ++++- XmlDoc2CmdletDoc.Tests/OutOfProcessAcceptanceTestBase.cs | 2 ++ XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj | 5 ++++- XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj b/XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj index c8ea183..0506cd0 100644 --- a/XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj +++ b/XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj @@ -1,6 +1,6 @@ - net461;net472;net48;netstandard2.0;netcoreapp2.1;netcoreapp3.1 + net461;net472;net48;netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0 true false @@ -19,6 +19,9 @@ + + + Properties\SolutionInfo.cs diff --git a/XmlDoc2CmdletDoc.TestModule/XmlDoc2CmdletDoc.TestModule.csproj b/XmlDoc2CmdletDoc.TestModule/XmlDoc2CmdletDoc.TestModule.csproj index 0ff217a..a271719 100644 --- a/XmlDoc2CmdletDoc.TestModule/XmlDoc2CmdletDoc.TestModule.csproj +++ b/XmlDoc2CmdletDoc.TestModule/XmlDoc2CmdletDoc.TestModule.csproj @@ -1,6 +1,6 @@  - net461;net472;net48;netstandard2.0;netcoreapp2.1;netcoreapp3.1 + net461;net472;net48;netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0 true false 1591 @@ -17,4 +17,7 @@ + + + \ No newline at end of file diff --git a/XmlDoc2CmdletDoc.Tests/OutOfProcessAcceptanceTestBase.cs b/XmlDoc2CmdletDoc.Tests/OutOfProcessAcceptanceTestBase.cs index 3db8755..54d65e0 100644 --- a/XmlDoc2CmdletDoc.Tests/OutOfProcessAcceptanceTestBase.cs +++ b/XmlDoc2CmdletDoc.Tests/OutOfProcessAcceptanceTestBase.cs @@ -34,6 +34,8 @@ protected override void GenerateHelpForTestAssembly(string assemblyPath) var toolFrameworkName = "netcoreapp2.1"; #elif NETCOREAPP3_1 var toolFrameworkName = "netcoreapp3.1"; +#elif NET5_0 + var toolFrameworkName = "net5.0"; #endif var toolDir = Path.Combine(SolutionDir, "XmlDoc2CmdletDoc", "bin", Configuration, toolFrameworkName); diff --git a/XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj b/XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj index 60483cf..220bc2d 100644 --- a/XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj +++ b/XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj @@ -1,6 +1,6 @@  - net461;net472;net48;netcoreapp2.1;netcoreapp3.1 + net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 false true @@ -19,6 +19,9 @@ + + + diff --git a/XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj b/XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj index d5c2d79..6d8e96b 100644 --- a/XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj +++ b/XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj @@ -1,6 +1,6 @@  - net461;net472;net48;netcoreapp2.1;netcoreapp3.1 + net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0 Exe false none From 6a61887848ab4670ab5c7df96c2a690b30486aa5 Mon Sep 17 00:00:00 2001 From: trondr Date: Sun, 19 Sep 2021 13:17:57 +0200 Subject: [PATCH 2/3] XmlDoc2CmdletDoc.0.4.1 --- SolutionInfo.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SolutionInfo.cs b/SolutionInfo.cs index db29415..f161a57 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyCompany("Redgate")] [assembly: AssemblyProduct("XmlDoc2CmdletDoc")] -[assembly: AssemblyCopyright("Copyright © 2014-2020, Red Gate Software Ltd and other contributors.")] +[assembly: AssemblyCopyright("Copyright © 2014-2021, Red Gate Software Ltd and other contributors.")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -18,6 +18,6 @@ // The following attributes are automatically set by the build scripts. Please do not modify them manually. // Instead, change the value defined in version-number.txt. -[assembly: AssemblyVersion("0.4.0")] -[assembly: AssemblyFileVersion("0.4.0")] -[assembly: AssemblyInformationalVersion("0.4.0-dotnetcore0000")] +[assembly: AssemblyVersion("0.4.1")] +[assembly: AssemblyFileVersion("0.4.1")] +[assembly: AssemblyInformationalVersion("0.4.1-dotnetcore0000")] From 54ba185842ba02c57675b31547bce8008dd0825f Mon Sep 17 00:00:00 2001 From: trondr Date: Mon, 7 Aug 2023 12:26:16 +0200 Subject: [PATCH 3/3] Convert XmlDoc2CmdletDoc to support .NET 7 --- XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj | 4 ++-- .../XmlDoc2CmdletDoc.TestModule.csproj | 4 ++-- XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj | 11 +++++------ XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj | 5 ++++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj b/XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj index 08e7870..720ef81 100644 --- a/XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj +++ b/XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj @@ -1,12 +1,12 @@  - net45 + net7.0 true false - + diff --git a/XmlDoc2CmdletDoc.TestModule/XmlDoc2CmdletDoc.TestModule.csproj b/XmlDoc2CmdletDoc.TestModule/XmlDoc2CmdletDoc.TestModule.csproj index de308b4..3c5498b 100644 --- a/XmlDoc2CmdletDoc.TestModule/XmlDoc2CmdletDoc.TestModule.csproj +++ b/XmlDoc2CmdletDoc.TestModule/XmlDoc2CmdletDoc.TestModule.csproj @@ -1,11 +1,11 @@  - net45 + net7.0 true false 1591 - + \ No newline at end of file diff --git a/XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj b/XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj index e0a064c..8ca9825 100644 --- a/XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj +++ b/XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj @@ -1,15 +1,14 @@  - net45 + net7.0 false false - - - - - + + + + diff --git a/XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj b/XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj index 6ec1542..5f78760 100644 --- a/XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj +++ b/XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj @@ -1,6 +1,6 @@  - net45 + net7.0 Exe false false @@ -13,4 +13,7 @@ Properties\SolutionInfo.cs + + + \ No newline at end of file