Merge pull request #347 from laedit/switch-to-net6

Switch to net6.0
laedit · May 17, 2022 · c662464 · c662464
2 parents 7a41f33 + 5fc392d
commit c662464
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -29,9 +29,9 @@ jobs:
           nuget-
 
     - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+      uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 3.1.x
+        dotnet-version: '6.0.x'
 
     - name: Install GitVersion
       uses: gittools/actions/gitversion/setup@v0.9.11
@@ -60,10 +60,10 @@ jobs:
     - name: GendarmeAnalysis
       run: |
         nuget install mono.gendarme -ExcludeVersion -OutputDirectory tools
-        ./tools/Mono.Gendarme/tools/gendarme.exe --xml GendarmeReport.xml --ignore gendarme.ignore .\src\NVika\bin\Release\netcoreapp3.1\NVika.exe
+        ./tools/Mono.Gendarme/tools/gendarme.exe --xml GendarmeReport.xml --ignore gendarme.ignore .\src\NVika\bin\Release\net6.0\NVika.exe
       
     - name: LaunchNVika
-      run: .\src\NVika\bin\Release\netcoreapp3.1\NVika.exe --debug --includesource inspectcodereport.xml ./src/NVika/bin/Release/netcoreapp3.1/static-analysis.sarif.json GendarmeReport.xml
+      run: .\src\NVika\bin\Release\net6.0\NVika.exe --debug --includesource inspectcodereport.xml ./src/NVika/bin/Release/net6.0/static-analysis.sarif.json GendarmeReport.xml
 
     # - name: Create release notes
       # run: |
@@ -74,13 +74,13 @@ jobs:
       run: |
         Copy-Item -Path resources/icon.png -Destination src\NVika.MSBuild\
         mkdir src\NVika.MSBuild\tools\
-        Copy-Item -Path "src/NVika/bin/Release/netcoreapp3.1/publish/*" -Destination src\NVika.MSBuild\tools\
+        Copy-Item -Path "src/NVika/bin/Release/net6.0/publish/*" -Destination src\NVika.MSBuild\tools\
         nuget pack src/NVika.MSBuild/NVika.MSBuild.nuspec -Version ${{ steps.gitversion.outputs.nuGetVersionV2 }} -OutputDirectory artifacts/nuget
 
     - name: Create netcore packages
       run: |
         mkdir ./artifacts/zips
-        Compress-Archive -Path src/NVika/bin/Release/netcoreapp3.1/publish/* -DestinationPath "artifacts/zips/NVika.netcore.${{ steps.gitversion.outputs.nuGetVersionV2 }}.zip"
+        Compress-Archive -Path src/NVika/bin/Release/net6.0/publish/* -DestinationPath "artifacts/zips/NVika.netcore.${{ steps.gitversion.outputs.nuGetVersionV2 }}.zip"
         Copy-Item -Path "src/NVika/bin/Release/NVika.${{ steps.gitversion.outputs.nuGetVersionV2 }}.nupkg" -Destination artifacts/nuget
 
     - name: Create windows version

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,3 +1,7 @@
+# 3.0.0 (2022-05-xx)
+
+- [#347](https://github.com/laedit/vika/pull/347) - Switch to .NET 6 +breaking
+
 # 2.3.0 (2022-05-17)
 
 - [#343](https://github.com/laedit/vika/pull/343) - Include suggestions in GitHub output by [DanRigby](https://github.com/DanRigby) +enhancement

diff --git a/src/NVika.Tests/BuildServers/AppVeyorTest.cs b/src/NVika.Tests/BuildServers/AppVeyorTest.cs
@@ -214,7 +214,7 @@ public void WriteIntegration_AppVeyorAPIError()
 
             var logs = _loggerOutput.ToString();
             Assert.NotNull(logs);
-            Assert.Contains("An error is occurred during the call to AppVeyor API: \"StatusCode: 403, ReasonPhrase: 'Forbidden', Version: 1.1, Content: <null>, Headers:", logs);
+            Assert.Contains("An error is occurred during the call to AppVeyor API: \"StatusCode: 403, ReasonPhrase: 'Forbidden', Version: 1.1, Content: System.Net.Http.EmptyContent, Headers:", logs);
         }
 
         private MockHttpClientFactory GetHttpClientFactory(HttpStatusCode responseStatusCode = HttpStatusCode.OK)

diff --git a/src/NVika.Tests/NVika.Tests.csproj b/src/NVika.Tests/NVika.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/NVika/NVika.csproj b/src/NVika/NVika.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>netcoreapp3.1</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<ErrorLog>bin\$(Configuration)\$(TargetFramework)\static-analysis.sarif.json;version=2</ErrorLog>
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>nvika</ToolCommandName>

diff --git a/src/NVika/Parsers/SarifParser.cs b/src/NVika/Parsers/SarifParser.cs
@@ -63,7 +63,7 @@ public override IEnumerable<Issue> Parse(string reportPath)
 
                 string filePath = null;
                 Region region = null;
-                if (result.Locations.Count > 0)
+                if (result.Locations?.Count > 0)
                 {
                     if (result.Locations[0].PhysicalLocation != null)
                     {