Skip to content

Commit 3b6b5e9

Browse files
Update packages to support .NET 6.0 and .NET 7.0 targets (#65)
* Update packages Add support for .NET 6.0 & .NET 7.0 * Update build scripts
1 parent 720ce17 commit 3b6b5e9

File tree

7 files changed

+19
-13
lines changed

7 files changed

+19
-13
lines changed

Solutions/Argotic.Common/Argotic.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;</TargetFrameworks>
55
<Product>Argotic Syndication Framework</Product>
66
<Copyright>Copyright © Brian William Kuhn 2008</Copyright>
77
<Authors>Brian William Kuhn, endjin</Authors>

Solutions/Argotic.Core/Argotic.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;</TargetFrameworks>
55
<Product>Argotic Syndication Framework</Product>
66
<Copyright>Copyright © Brian William Kuhn 2008</Copyright>
77
<Authors>Brian William Kuhn, endjin</Authors>

Solutions/Argotic.Examples/Argotic.Examples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;</TargetFrameworks>
55
<Authors>Brian William Kuhn, endjin</Authors>
66
</PropertyGroup>
77

Solutions/Argotic.Extensions.Tests/Argotic.Extensions.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<Product>Argotic Syndication Framework</Product>
77
<Copyright>Copyright © Brian William Kuhn 2008</Copyright>
88
<Authors>Brian William Kuhn, endjin</Authors>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1313
<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
1414
<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
1515
<PackageReference Include="coverlet.msbuild" Version="3.2.0">

Solutions/Argotic.Extensions/Argotic.Extensions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.1;netstandard2.0;net6.0;net7.0;</TargetFrameworks>
55
<Copyright>Copyright © Brian William Kuhn 2008</Copyright>
66
<Description>Argotic Entity Extensibility Class Library, that contains the classes, interfaces, and enumerations that enable web content syndication extensibility.</Description>
77
<Authors>Brian William Kuhn, endjin</Authors>

azure-pipelines.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ jobs:
2222
service_connection_nuget_org: $(Endjin_Service_Connection_NuGet_Org)
2323
service_connection_github: $(Endjin_Service_Connection_GitHub)
2424
solution_to_build: $(Endjin_Solution_To_Build)
25-
netSdkVersion: '6.x'
25+
netSdkVersion: '7.x'
2626
additionalNetSdkVersions:
27-
- 3.x
27+
- 3.x
28+
- 6.x

build.ps1

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ param (
4343
[string[]] $Tasks = @("."),
4444

4545
[Parameter()]
46-
[string] $Configuration = "Debug",
46+
[string] $Configuration = "Release",
4747

4848
[Parameter()]
4949
[string] $BuildRepositoryUri = "",
@@ -71,7 +71,7 @@ param (
7171
[string] $BuildModulePath,
7272

7373
[Parameter()]
74-
[version] $BuildModuleVersion = "1.1.1",
74+
[version] $BuildModuleVersion = "1.3.5",
7575

7676
[Parameter()]
7777
[version] $InvokeBuildModuleVersion = "5.7.1"
@@ -127,10 +127,9 @@ $SkipVersion = $false
127127
$SkipBuild = $false
128128
$CleanBuild = $Clean
129129
$SkipTest = $false
130-
$SkipTestReport = $false
131-
$SkipAnalysis = $false
130+
$SkipTestReport = $true # Temporarily skip the test report due .NET 7 MSBuild issue
132131
$SkipPackage = $false
133-
$SkipPublish = $false
132+
$SkipAnalysis = $false
134133

135134

136135
#
@@ -152,6 +151,12 @@ $NuSpecFilesToPackage = @(
152151
#
153152
$ExcludeFilesFromCodeCoverage = ""
154153

154+
#
155+
# Update to the latest report generator versions
156+
#
157+
$ReportGeneratorToolVersion = "5.1.10"
158+
159+
155160
# Synopsis: Build, Test and Package
156161
task . FullBuild
157162

0 commit comments

Comments
 (0)