Skip to content

Dotnetcore - Add support for .NET 5.0 #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: dotnetcore
Choose a base branch
from
Open

Dotnetcore - Add support for .NET 5.0 #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35c83d3
Add support for net5.0
trondr Sep 19, 2021
6a61887
XmlDoc2CmdletDoc.0.4.1
trondr Sep 19, 2021
54ba185
Convert XmlDoc2CmdletDoc to support .NET 7
trondr Aug 7, 2023
37d309f
Merge branch 'master' into dotnetcore
trondr Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions SolutionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")]
Expand All @@ -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")]
8 changes: 7 additions & 1 deletion XmlDoc2CmdletDoc.Core/XmlDoc2CmdletDoc.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;net48;netstandard2.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net461;net472;net48;netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFramework>net7.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
Expand All @@ -19,6 +20,11 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="System.Management.Automation" Version="7.0.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="System.Management.Automation" Version="7.1.4" />
<PackageReference Include="RedGate.ThirdParty.Jolt.Core" Version="0.4.0.1" />
<PackageReference Include="System.Management.Automation" Version="7.3.6" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\SolutionInfo.cs">
<Link>Properties\SolutionInfo.cs</Link>
Expand Down
8 changes: 7 additions & 1 deletion XmlDoc2CmdletDoc.TestModule/XmlDoc2CmdletDoc.TestModule.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;net48;netstandard2.0;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net461;net472;net48;netstandard2.0;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFramework>net7.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<NoWarn>1591</NoWarn>
</PropertyGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
<PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
<ItemGroup>
<PackageReference Include="System.Management.Automation" Version="7.3.6" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="PowerShellStandard.Library" Version="5.1.0" />
Expand All @@ -17,4 +20,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="System.Management.Automation" Version="7.0.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="System.Management.Automation" Version="7.1.4" />
</ItemGroup>
</Project>
2 changes: 2 additions & 0 deletions XmlDoc2CmdletDoc.Tests/OutOfProcessAcceptanceTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 9 additions & 1 deletion XmlDoc2CmdletDoc.Tests/XmlDoc2CmdletDoc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFramework>net7.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>
Expand All @@ -9,6 +10,10 @@
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.21" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.36" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net48'">
<PackageReference Include="Microsoft.PowerShell.5.ReferenceAssemblies" Version="1.1.0" />
Expand All @@ -19,6 +24,9 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
<PackageReference Include="System.Management.Automation" Version="7.0.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
<PackageReference Include="System.Management.Automation" Version="7.1.4" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion XmlDoc2CmdletDoc/XmlDoc2CmdletDoc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net461;net472;net48;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
<TargetFramework>net7.0</TargetFramework>
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<DebugType>none</DebugType>
Expand All @@ -14,4 +15,7 @@
<Link>Properties\SolutionInfo.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Management.Automation" Version="7.3.6" />
</ItemGroup>
</Project>