From c8449144bac5feac3cd22dd1ad5f257e1dbbdbc2 Mon Sep 17 00:00:00 2001 From: Lilith River Date: Fri, 5 Aug 2022 16:26:44 -0600 Subject: [PATCH] Move everything from .NET 5 to 6 --- appveyor.yml | 2 +- .../Imageflow.Server.Example/Imageflow.Server.Example.csproj | 2 +- examples/Imageflow.Server.ExampleDocker/Dockerfile | 4 ++-- .../Imageflow.Server.ExampleDocker.csproj | 2 +- examples/Imageflow.Server.ExampleDockerDiskCache/Dockerfile | 4 ++-- .../Imageflow.Server.ExampleDockerDiskCache.csproj | 2 +- src/NugetPackages.targets | 2 +- tests/Imageflow.Server.Tests/Imageflow.Server.Tests.csproj | 2 +- tests/Imazen.Common.Tests/Imazen.Common.Tests.csproj | 2 +- .../Imazen.HybridCache.Benchmark.csproj | 2 +- .../Imazen.HybridCache.Tests/Imazen.HybridCache.Tests.csproj | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 97985544..95da9875 100644 --- 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 index 79569799..108d961e 100644 --- a/examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj +++ b/examples/Imageflow.Server.Example/Imageflow.Server.Example.csproj @@ -3,7 +3,7 @@ Linux ..\..\src - net5.0;netcoreapp3.1 + net6.0;netcoreapp3.1 diff --git a/examples/Imageflow.Server.ExampleDocker/Dockerfile b/examples/Imageflow.Server.ExampleDocker/Dockerfile index ab3a4754..1e712f5d 100644 --- 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"] \ No newline at end of file diff --git a/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj b/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj index 226f8986..20f9cf6b 100644 --- a/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj +++ b/examples/Imageflow.Server.ExampleDocker/Imageflow.Server.ExampleDocker.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/examples/Imageflow.Server.ExampleDockerDiskCache/Dockerfile b/examples/Imageflow.Server.ExampleDockerDiskCache/Dockerfile index c90291e5..23e87c13 100644 --- 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"] \ No newline at end of file diff --git a/examples/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj b/examples/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj index 1aebfb1a..e943e8c6 100644 --- a/examples/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj +++ b/examples/Imageflow.Server.ExampleDockerDiskCache/Imageflow.Server.ExampleDockerDiskCache.csproj @@ -1,7 +1,7 @@ - net5.0 + net6.0 diff --git a/src/NugetPackages.targets b/src/NugetPackages.targets index 968111f8..665993f0 100644 --- a/src/NugetPackages.targets +++ b/src/NugetPackages.targets @@ -1,7 +1,7 @@ - (c) 2020 Imazen LLC + (c) 2022 Imazen LLC https://github.com/imazen/imageflow-dotnet-server https://github.com/imazen/imageflow-dotnet-server.git main diff --git a/tests/Imageflow.Server.Tests/Imageflow.Server.Tests.csproj b/tests/Imageflow.Server.Tests/Imageflow.Server.Tests.csproj index 3abb66a9..6d04059e 100644 --- a/tests/Imageflow.Server.Tests/Imageflow.Server.Tests.csproj +++ b/tests/Imageflow.Server.Tests/Imageflow.Server.Tests.csproj @@ -4,7 +4,7 @@ false - net5.0;netcoreapp3.1 + net6.0;netcoreapp3.1 diff --git a/tests/Imazen.Common.Tests/Imazen.Common.Tests.csproj b/tests/Imazen.Common.Tests/Imazen.Common.Tests.csproj index c270d7d0..60df2a27 100644 --- a/tests/Imazen.Common.Tests/Imazen.Common.Tests.csproj +++ b/tests/Imazen.Common.Tests/Imazen.Common.Tests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;netcoreapp3.1 diff --git a/tests/Imazen.HybridCache.Benchmark/Imazen.HybridCache.Benchmark.csproj b/tests/Imazen.HybridCache.Benchmark/Imazen.HybridCache.Benchmark.csproj index 776707bf..c36c6a26 100644 --- a/tests/Imazen.HybridCache.Benchmark/Imazen.HybridCache.Benchmark.csproj +++ b/tests/Imazen.HybridCache.Benchmark/Imazen.HybridCache.Benchmark.csproj @@ -2,7 +2,7 @@ Exe - net5.0;netcoreapp3.1 + net6.0;netcoreapp3.1 diff --git a/tests/Imazen.HybridCache.Tests/Imazen.HybridCache.Tests.csproj b/tests/Imazen.HybridCache.Tests/Imazen.HybridCache.Tests.csproj index c4e9ac8c..33529ed1 100644 --- a/tests/Imazen.HybridCache.Tests/Imazen.HybridCache.Tests.csproj +++ b/tests/Imazen.HybridCache.Tests/Imazen.HybridCache.Tests.csproj @@ -1,7 +1,7 @@ - net5.0;netcoreapp3.1 + net6.0;netcoreapp3.1