Move everything from .NET 5 to 6

imazen · Aug 5, 2022 · c844914 · c844914
1 parent dc7af0f
commit c844914
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,5 +1,5 @@
 version: '{build}-appveyor' # We override this during 'install'
-image: Visual Studio 2019
+image: Visual Studio 2022
 
 
 install:

diff --git a/examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj b/examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..\src</DockerfileContext>
-    <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/Imageflow.Server.ExampleDocker/Dockerfile b/examples/Imageflow.Server.ExampleDocker/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
 WORKDIR /app
 
 # Copy csproj and restore as distinct layers
@@ -10,7 +10,7 @@ COPY . ./
 RUN dotnet publish -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0-focal
+FROM mcr.microsoft.com/dotnet/aspnet:6.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 ENTRYPOINT ["dotnet", "Imageflow.Server.ExampleDocker.dll"]
diff --git a/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj b/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/examples/Imageflow.Server.ExampleDockerDiskCache/Dockerfile b/examples/Imageflow.Server.ExampleDockerDiskCache/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0-focal AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
 WORKDIR /app
 
 # Copy csproj and restore as distinct layers
@@ -10,7 +10,7 @@ COPY . ./
 RUN dotnet publish -c Release -o out
 
 # Build runtime image
-FROM mcr.microsoft.com/dotnet/aspnet:5.0-focal
+FROM mcr.microsoft.com/dotnet/aspnet:6.0
 WORKDIR /app
 COPY --from=build-env /app/out .
 ENTRYPOINT ["dotnet", "Imageflow.Server.ExampleDockerDiskCache.dll"]
diff --git a/...es/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj b/...es/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/src/NugetPackages.targets b/src/NugetPackages.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
 
-        <Copyright>(c) 2020 Imazen LLC</Copyright>
+        <Copyright>(c) 2022 Imazen LLC</Copyright>
         <PackageProjectUrl>https://github.com/imazen/imageflow-dotnet-server</PackageProjectUrl>
         <RepositoryUrl>https://github.com/imazen/imageflow-dotnet-server.git</RepositoryUrl>
         <RepositoryBranch>main</RepositoryBranch>

diff --git a/tests/Imageflow.Server.Tests/Imageflow.Server.Tests.csproj b/tests/Imageflow.Server.Tests/Imageflow.Server.Tests.csproj
@@ -4,7 +4,7 @@
 
         <IsPackable>false</IsPackable>
 
-        <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/tests/Imazen.Common.Tests/Imazen.Common.Tests.csproj b/tests/Imazen.Common.Tests/Imazen.Common.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
 
     </PropertyGroup>
 

diff --git a/tests/Imazen.HybridCache.Benchmark/Imazen.HybridCache.Benchmark.csproj b/tests/Imazen.HybridCache.Benchmark/Imazen.HybridCache.Benchmark.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/tests/Imazen.HybridCache.Tests/Imazen.HybridCache.Tests.csproj b/tests/Imazen.HybridCache.Tests/Imazen.HybridCache.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net5.0;netcoreapp3.1</TargetFrameworks>
+        <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
     </PropertyGroup>
 
     <ItemGroup>