Bump dotnet sdk

rstm-sf · Nov 18, 2021 · 5d6ffff · 5d6ffff
1 parent 6c34563
commit 5d6ffff
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 16 deletions.
diff --git a/.github/workflows/dotnet_deploy.yml b/.github/workflows/dotnet_deploy.yml
@@ -20,8 +20,8 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest]
         sdk:
-          - { version: 3.1.407, framework: netcoreapp3.1 }
-          - { version: 5.0.201, framework: net5.0 }
+          - { version: 3.1.415, framework: netcoreapp3.1 }
+          - { version: 6.0.100, framework: net6.0 }
 
     name: ${{ matrix.os }} / ${{ matrix.sdk.version }}
     runs-on: ${{ matrix.os }}
@@ -50,11 +50,11 @@ jobs:
       run: dotnet test -c ${{ env.configuration }} -f ${{ matrix.sdk.framework }} --no-build
 
     - name: Pack nugets
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.sdk.version == '5.0.201' }}
+      if: ${{ matrix.os == 'ubuntu-latest' && matrix.sdk.version == '6.0.100' }}
       run: dotnet pack -c ${{ env.configuration }} --no-build
 
     - name: Upload artifact
-      if: ${{ matrix.os == 'ubuntu-latest' && matrix.sdk.version == '5.0.201' }}
+      if: ${{ matrix.os == 'ubuntu-latest' && matrix.sdk.version == '6.0.100' }}
       uses: actions/upload-artifact@v2
       with:
         name: ${{ env.zip-name }}
@@ -91,7 +91,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.201
+          dotnet-version: 6.0.100
 
       - name: Push nuget
         if: ${{ env.release-draft == 'false' }}

diff --git a/.github/workflows/dotnet_tests.yml b/.github/workflows/dotnet_tests.yml
@@ -18,8 +18,8 @@ jobs:
       matrix:
         os: [windows-latest, ubuntu-latest]
         sdk:
-          - { version: 3.1.407, framework: netcoreapp3.1 }
-          - { version: 5.0.201, framework: net5.0 }
+          - { version: 3.1.415, framework: netcoreapp3.1 }
+          - { version: 6.0.100, framework: net6.0 }
 
     name: ${{ matrix.os }} / ${{ matrix.sdk.version }}
     runs-on: ${{ matrix.os }}

diff --git a/src/AvaloniaProjectInfoResolver.App/AvaloniaProjectInfoResolver.App.csproj b/src/AvaloniaProjectInfoResolver.App/AvaloniaProjectInfoResolver.App.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AvaloniaVersion>0.10.10</AvaloniaVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/AvaloniaProjectInfoResolver.App/MainWindow.axaml.cs b/src/AvaloniaProjectInfoResolver.App/MainWindow.axaml.cs
@@ -30,7 +30,7 @@ private async Task ShowOpenFileDialog(InteractionContext<Unit, string?> interact
         {
             var dialog = new OpenFileDialog();
             var fileNames = await dialog.ShowAsync(this);
-            interaction.SetOutput(fileNames.FirstOrDefault());
+            interaction.SetOutput(fileNames?.FirstOrDefault());
         }
     }
 }
diff --git a/...aProjectInfoResolver.IntegrationTests/AvaloniaProjectInfoResolver.IntegrationTests.csproj b/...aProjectInfoResolver.IntegrationTests/AvaloniaProjectInfoResolver.IntegrationTests.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.0.3">
+        <PackageReference Include="coverlet.collector" Version="3.1.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/src/AvaloniaProjectInfoResolver.IntegrationTests/ProjectInfoResolverTests.cs b/src/AvaloniaProjectInfoResolver.IntegrationTests/ProjectInfoResolverTests.cs
@@ -28,7 +28,7 @@ public async Task Should_ResolvePreviewProjectInfoAsync_App_References_Avalonia(
 
             var appExecInfoCollection = info.AppExecInfoCollection;
             Assert.Single(appExecInfoCollection);
-            Assert.Equal("netcoreapp3.1", appExecInfoCollection[0].TargetFramework);
+            Assert.Equal("net6.0", appExecInfoCollection[0].TargetFramework);
             Assert.False(string.IsNullOrEmpty(appExecInfoCollection[0].TargetPath));
             Assert.Equal(".NETCoreApp", appExecInfoCollection[0].TargetFrameworkIdentifier);
             Assert.False(string.IsNullOrEmpty(appExecInfoCollection[0].ProjectDepsFilePath));

diff --git a/...rojectInfoResolver.PreviewTask.Debug/AvaloniaProjectInfoResolver.PreviewTask.Debug.csproj b/...rojectInfoResolver.PreviewTask.Debug/AvaloniaProjectInfoResolver.PreviewTask.Debug.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPublishable>false</IsPublishable>
   </PropertyGroup>
 

diff --git a/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewTask.csproj b/src/AvaloniaProjectInfoResolver.PreviewTask/AvaloniaProjectInfoResolver.PreviewTask.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
+    <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -24,10 +25,10 @@
     </Content>
   </ItemGroup>
 
-  <!-- Needs for sdk <= 3.1 -->
+  <!-- Needs for sdk <= 3.1 (tests) -->
   <ItemGroup>
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies"
-                      Version="1.0.0"
+                      Version="1.0.2"
                       PrivateAssets="All" />
   </ItemGroup>