.NET Core 2.2 (#958)

* Initial bump * Fix travis
2024-11-10 07:04:27 +00:00 · 2018-12-07 22:04:09 +01:00 · 2018-12-07 22:04:09 +01:00 · 1d78060015
commit 1d78060015
parent 6a909aa1b2
9 changed files with 21 additions and 21 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -10,7 +10,7 @@ git:
 group: travis_latest

 # ASF is based on .NET Core platform, we're not building with Mono
-dotnet: 2.1
+dotnet: 2.2
 mono: none

 env:
@ -18,7 +18,7 @@ env:
    - CONFIGURATION: Release
    - DOTNET_CLI_TELEMETRY_OPTOUT: 1
    - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-    - NET_CORE_VERSION: netcoreapp2.1
+    - NET_CORE_VERSION: netcoreapp2.2
    - VARIANTS="generic linux-arm linux-x64 osx-x64 win-x64" # NOTE: When modifying variants, don't forget to update ASF_VARIANT definitions in SharedInfo.cs!
 before_script:
  - |
@ -83,5 +83,5 @@ matrix:
      dist: xenial
    - os: osx
      # Ref: https://docs.travis-ci.com/user/reference/osx
-      dotnet: 2.1.500 # For OSX, we need absolute dotnet version until https://github.com/dotnet/core-setup/issues/4187 is resolved
+      dotnet: 2.2.100 # For OSX, we need absolute dotnet version until https://github.com/dotnet/core-setup/issues/4187 is resolved
      osx_image: xcode10.1
--- a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj
+++ b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj
@ -16,7 +16,7 @@
    <PackageProjectUrl>https://github.com/JustArchi/ArchiSteamFarm</PackageProjectUrl>
    <RepositoryType>Git</RepositoryType>
    <RepositoryUrl>https://github.com/JustArchi/ArchiSteamFarm.git</RepositoryUrl>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;net472</TargetFrameworks>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
  </PropertyGroup>

--- a/ArchiSteamFarm/ArchiSteamFarm.csproj
+++ b/ArchiSteamFarm/ArchiSteamFarm.csproj
@ -22,7 +22,7 @@
    <RepositoryUrl>https://github.com/JustArchi/ArchiSteamFarm.git</RepositoryUrl>
    <RuntimeIdentifiers>linux-arm;linux-x64;osx-x64;win-x64</RuntimeIdentifiers>
    <ServerGarbageCollection>false</ServerGarbageCollection>
-    <TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.2;net472</TargetFrameworks>
    <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
  </PropertyGroup>

@ -60,7 +60,7 @@
    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0-beta" />
  </ItemGroup>

-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
    <PackageReference Include="ILLink.Tasks" Version="0.1.5-preview-1841731" />
    <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.6.0-preview.18571.3" />
  </ItemGroup>
--- a/Dockerfile.Service.arm
+++ b/Dockerfile.Service.arm
@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \
    npm ci && \
    npm run-script deploy

-FROM microsoft/dotnet:2.1-sdk AS build-dotnet
+FROM microsoft/dotnet:2.2-sdk AS build-dotnet
 ENV CONFIGURATION Release
-ENV NET_CORE_VERSION netcoreapp2.1
+ENV NET_CORE_VERSION netcoreapp2.2
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
@ -19,7 +19,7 @@ RUN dotnet --info && \
    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
    cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh"

-FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7 AS runtime
+FROM microsoft/dotnet:2.2-runtime-stretch-slim-arm32v7 AS runtime
 ENV ASPNETCORE_URLS=
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
--- a/Dockerfile.Service.x64
+++ b/Dockerfile.Service.x64
@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \
    npm ci && \
    npm run-script deploy

-FROM microsoft/dotnet:2.1-sdk AS build-dotnet
+FROM microsoft/dotnet:2.2-sdk AS build-dotnet
 ENV CONFIGURATION Release
-ENV NET_CORE_VERSION netcoreapp2.1
+ENV NET_CORE_VERSION netcoreapp2.2
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
@ -19,7 +19,7 @@ RUN dotnet --info && \
    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=generic /p:LinkDuringPublish=false && \
    cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm-Service.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm-Service.sh"

-FROM microsoft/dotnet:2.1-runtime-stretch-slim AS runtime
+FROM microsoft/dotnet:2.2-runtime-stretch-slim AS runtime
 ENV ASPNETCORE_URLS=
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \
    npm ci && \
    npm run-script deploy

-FROM microsoft/dotnet:2.1-sdk AS build-dotnet
+FROM microsoft/dotnet:2.2-sdk AS build-dotnet
 ENV CONFIGURATION Release
-ENV NET_CORE_VERSION netcoreapp2.1
+ENV NET_CORE_VERSION netcoreapp2.2
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
@ -19,7 +19,7 @@ RUN dotnet --info && \
    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
    cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh"

-FROM microsoft/dotnet:2.1-runtime-stretch-slim-arm32v7 AS runtime
+FROM microsoft/dotnet:2.2-runtime-stretch-slim-arm32v7 AS runtime
 ENV ASPNETCORE_URLS=
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
--- a/Dockerfile.x64
+++ b/Dockerfile.x64
@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \
    npm ci && \
    npm run-script deploy

-FROM microsoft/dotnet:2.1-sdk AS build-dotnet
+FROM microsoft/dotnet:2.2-sdk AS build-dotnet
 ENV CONFIGURATION Release
-ENV NET_CORE_VERSION netcoreapp2.1
+ENV NET_CORE_VERSION netcoreapp2.2
 WORKDIR /app
 COPY --from=build-node /app/dist ASF-ui/dist
 COPY ArchiSteamFarm ArchiSteamFarm
@ -19,7 +19,7 @@ RUN dotnet --info && \
    dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out/publish' /nologo /p:ASFVariant=docker /p:LinkDuringPublish=false && \
    cp "ArchiSteamFarm/scripts/generic/ArchiSteamFarm.sh" "ArchiSteamFarm/out/publish/ArchiSteamFarm.sh"

-FROM microsoft/dotnet:2.1-runtime-stretch-slim AS runtime
+FROM microsoft/dotnet:2.2-runtime-stretch-slim AS runtime
 ENV ASPNETCORE_URLS=
 LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
 EXPOSE 1242
--- a/appveyor.yml
+++ b/appveyor.yml
@ -9,11 +9,11 @@ environment:
  CROWDIN_API_KEY:
    secure: oGuZaQo2z5/JkEYaKrD9Ing+TgwZ3qQVf+9Jdz73Fephy04z5rWPGCCtkjaMLTcY
  CROWDIN_PROJECT_IDENTIFIER: archisteamfarm
-#  DOTNET_CHANNEL: 2.1
+  DOTNET_CHANNEL: 2.2
  DOTNET_CLI_TELEMETRY_OPTOUT: true
  DOTNET_INSTALL_DIR: tools\dotnet
  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  NET_CORE_VERSION: netcoreapp2.1
+  NET_CORE_VERSION: netcoreapp2.2
  NET_FRAMEWORK_VERSION: net472
  VARIANTS: generic generic-netf linux-arm linux-x64 osx-x64 win-x64 # NOTE: When modifying variants, don't forget to update ASF_VARIANT definitions in SharedInfo.cs!
 matrix:
--- a/cc.sh
+++ b/cc.sh
@ -6,7 +6,7 @@ TESTS_PROJECT="${MAIN_PROJECT}.Tests"
 SOLUTION="${MAIN_PROJECT}.sln"
 CONFIGURATION="Release"
 OUT="out/source"
-TARGET_FRAMEWORK="netcoreapp2.1"
+TARGET_FRAMEWORK="netcoreapp2.2"

 CLEAN=0
 LINK_DURING_PUBLISH=1