Add .NET 7 (#88)

wbaldoumas · Feb 5, 2023 · 0965d99 · 0965d99
1 parent 44fd96f
commit 0965d99
Show file tree

Hide file tree

Showing 20 changed files with 21,367 additions and 21,389 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -48,18 +48,14 @@ jobs:
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
     # Set up required .NET SDKs
-    - name: Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 3.1.x
-    - name: Setup .NET 5.0
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 5.0.x
     - name: Setup .NET 6.0
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 6.0.x        
+    - name: Setup .NET 7.0
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x            
 
     # Restore & Build
     - name: Restore

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -11,21 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet: [netcoreapp3.1, net5.0, net6.0]
+        dotnet: [net6.0, net7.0]
     steps:
     - uses: actions/checkout@v3
-    - name: Setup .NET Core 3.1
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 3.1.x
-    - name: Setup .NET 5.0
+    - name: Setup .NET 6.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 5.0.x
-    - name: Setup .NET 6.0
+        dotnet-version: 6.0.x
+    - name: Setup .NET 7.0
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x        
+        dotnet-version: 7.0.x             
     - name: Install dependencies
       run: cd src && dotnet restore
     - name: Build
@@ -45,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        dotnet: [netcoreapp3.1] # only upload one coverage report
+        dotnet: [net6.0] # only upload one coverage report
     steps:
     - uses: actions/checkout@v3
     - name: Download Code Coverage Results

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Restore Dependencies
       run: cd src && dotnet restore
     - name: Build

diff --git a/.github/workflows/publish_preview.yml b/.github/workflows/publish_preview.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 7.0.x
     - name: Restore Dependencies
       run: dotnet restore src
     - name: Build

diff --git a/src/Atrea.PolicyEngine/Atrea.PolicyEngine.csproj b/src/Atrea.PolicyEngine/Atrea.PolicyEngine.csproj
@@ -44,7 +44,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.4.33">
+	  <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.5.22">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>

diff --git a/tests/Atrea.PolicyEngine.Tests/Atrea.PolicyEngine.Tests.csproj b/tests/Atrea.PolicyEngine.Tests/Atrea.PolicyEngine.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -15,19 +15,19 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="coverlet.msbuild" Version="3.1.2">
+		<PackageReference Include="coverlet.msbuild" Version="3.2.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="FluentAssertions" Version="6.7.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
+		<PackageReference Include="FluentAssertions" Version="6.9.0" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
 		<PackageReference Include="NSubstitute" Version="4.4.0" />
-		<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.15">
+		<PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.16">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
 		<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>