diff --git a/.travis.yml b/.travis.yml index df6159140..37b9f8eda 100644 --- 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 diff --git a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj index 669835c08..79eb54a35 100644 --- a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj +++ b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj @@ -16,7 +16,7 @@ https://github.com/JustArchi/ArchiSteamFarm Git https://github.com/JustArchi/ArchiSteamFarm.git - netcoreapp2.1;net472 + netcoreapp2.2;net472 true diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index fe9c0c6ab..ed4bc06db 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -22,7 +22,7 @@ https://github.com/JustArchi/ArchiSteamFarm.git linux-arm;linux-x64;osx-x64;win-x64 false - netcoreapp2.1;net472 + netcoreapp2.2;net472 true @@ -60,7 +60,7 @@ - + diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm index b743939d9..84526a0b3 100644 --- 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 " EXPOSE 1242 diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64 index 7a428a52f..a1fb13d73 100644 --- 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 " EXPOSE 1242 diff --git a/Dockerfile.arm b/Dockerfile.arm index 66b8420fd..6db9fe494 100644 --- 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 " EXPOSE 1242 diff --git a/Dockerfile.x64 b/Dockerfile.x64 index bed0c3730..b84a9e6be 100644 --- 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 " EXPOSE 1242 diff --git a/appveyor.yml b/appveyor.yml index bf29ddd49..5fdfa0b3e 100644 --- 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: diff --git a/cc.sh b/cc.sh index fa09d669e..37a2d4e01 100755 --- 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