Upgrading to .NET 6

pauldotknopf · Jun 26, 2022 · a6aed32 · a6aed32
1 parent 9c7b596
commit a6aed32
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 34 deletions.
diff --git a/build.sh b/build.sh
@@ -3,4 +3,4 @@
 SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 cd $SCRIPT_DIR
 
-dotnet run -p ./build/scripts/Build.csproj -- $*
+dotnet run --project ./build/scripts/Build.csproj -- $*
diff --git a/build/scripts/Build.csproj b/build/scripts/Build.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
  <PropertyGroup>
- <TargetFramework>netcoreapp3.1</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <Import Project="Buildary\Build.proj" />
 </Project>
diff --git a/build/scripts/Buildary b/build/scripts/Buildary
diff --git a/examples/Statik.Examples.Mvc/Statik.Examples.Mvc.csproj b/examples/Statik.Examples.Mvc/Statik.Examples.Mvc.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp5.0</TargetFramework>
- <LangVersion>7.1</LangVersion>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
  <ProjectReference Include="..\..\src\Statik.Mvc\Statik.Mvc.csproj" />

diff --git a/examples/Statik.Examples.Pages/Statik.Examples.Pages.csproj b/examples/Statik.Examples.Pages/Statik.Examples.Pages.csproj
@@ -1,20 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp5.0</TargetFramework>
- <LangVersion>7.1</LangVersion>
- <!--
- This is required for compiling razor views in a console app.
- It is supposed to be fixed in 2.1, so we can remove it then.
- https://github.com/aspnet/Razor/issues/1212
--->
- <PreserveCompilationContext>true</PreserveCompilationContext>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
  <ProjectReference Include="..\..\src\Statik.Mvc\Statik.Mvc.csproj" />
  <ProjectReference Include="..\..\src\Statik\Statik.csproj" />
  </ItemGroup>
  <ItemGroup>
- <PackageReference Include="Markdig" Version="0.26.0" />
+ <PackageReference Include="Markdig" Version="0.30.2" />
  </ItemGroup>
 </Project>
diff --git a/examples/Statik.Examples.Simple/Statik.Examples.Simple.csproj b/examples/Statik.Examples.Simple/Statik.Examples.Simple.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
  <OutputType>Exe</OutputType>
- <TargetFramework>netcoreapp5.0</TargetFramework>
- <LangVersion>7.1</LangVersion>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
  <ProjectReference Include="..\..\src\Statik\Statik.csproj" />

diff --git a/src/Statik.Files/Statik.Files.csproj b/src/Statik.Files/Statik.Files.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>netcoreapp5.0</TargetFrameworks>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
  <ProjectReference Include="..\Statik\Statik.csproj" />

diff --git a/src/Statik.Markdown/Statik.Markdown.csproj b/src/Statik.Markdown/Statik.Markdown.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>netcoreapp5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
  <PackageReference Include="Markdig" Version="0.26.0" />

diff --git a/src/Statik.Mvc/Statik.Mvc.csproj b/src/Statik.Mvc/Statik.Mvc.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>netcoreapp5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
  <ProjectReference Include="..\Statik\Statik.csproj" />

diff --git a/src/Statik/Statik.csproj b/src/Statik/Statik.csproj
@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>netcoreapp5.0</TargetFrameworks>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
- <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="5.0.0" />
- <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
- <PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.2.0" />
- <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" Version="5.0.0" />
- <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.9" />
+ <FrameworkReference Include="Microsoft.AspNetCore.App" />
+ </ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.6" />
+ <PackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="6.0.0" />
  </ItemGroup>
 </Project>
diff --git a/test/Statik.Files.Tests/Statik.Files.Tests.csproj b/test/Statik.Files.Tests/Statik.Files.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>netcoreapp5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
  <PrivateAssets>all</PrivateAssets>

diff --git a/test/Statik.Mvc.Tests/Statik.Mvc.Tests.csproj b/test/Statik.Mvc.Tests/Statik.Mvc.Tests.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>netcoreapp5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
  <PrivateAssets>all</PrivateAssets>

diff --git a/test/Statik.Tests/Statik.Tests.csproj b/test/Statik.Tests/Statik.Tests.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFramework>netcoreapp5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
- <PackageReference Include="FluentAssertions" Version="6.1.0" />
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
- <PackageReference Include="Moq" Version="4.16.1" />
+ <PackageReference Include="FluentAssertions" Version="6.7.0" />
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+ <PackageReference Include="Moq" Version="4.18.1" />
  <PackageReference Include="xunit" Version="2.4.1" />
  <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
  <PrivateAssets>all</PrivateAssets>