diff --git a/.travis.yml b/.travis.yml index 3c816a530..91f820b79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ git: depth: 10 # ASF is based on .NET Core platform, we're not building with Mono -dotnet: 3.0 +dotnet: 3.1 mono: none env: @@ -15,7 +15,7 @@ env: - CONFIGURATION: Release - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 - - NET_CORE_VERSION: netcoreapp3.0 + - NET_CORE_VERSION: netcoreapp3.1 - 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: - | @@ -81,5 +81,5 @@ matrix: dist: bionic - os: osx # Ref: https://docs.travis-ci.com/user/reference/osx - dotnet: 3.0.100 # For OSX, we need absolute dotnet version until https://github.com/dotnet/core-setup/issues/4187 is resolved + dotnet: 3.1.100 # For OSX, we need absolute dotnet version until https://github.com/dotnet/core-setup/issues/4187 is resolved osx_image: xcode11.2 diff --git a/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj b/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj index af807269f..b644ad2f9 100644 --- a/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj +++ b/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj @@ -18,11 +18,11 @@ - netcoreapp3.0;net48 + netcoreapp3.1;net48 - netcoreapp3.0 + netcoreapp3.1 diff --git a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj index 4189f8a29..e5ba7a3b1 100644 --- a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj +++ b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj @@ -19,11 +19,11 @@ - netcoreapp3.0;net48 + netcoreapp3.1;net48 - netcoreapp3.0 + netcoreapp3.1 diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index d2f3c2326..3f28d5ddf 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -28,11 +28,11 @@ - netcoreapp3.0;net48 + netcoreapp3.1;net48 - netcoreapp3.0 + netcoreapp3.1 @@ -69,8 +69,8 @@ - - + + diff --git a/Dockerfile.Service.arm b/Dockerfile.Service.arm index 44e43ad3d..c70fdd31d 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 mcr.microsoft.com/dotnet/core/sdk:3.0 AS build-dotnet +FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet ENV CONFIGURATION Release -ENV NET_CORE_VERSION netcoreapp3.0 +ENV NET_CORE_VERSION netcoreapp3.1 WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm @@ -22,7 +22,7 @@ RUN dotnet --info && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' /nologo /p:ASFVariant=generic /p:PublishTrimmed=false /p:UseAppHost=false && \ cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh" "out/ArchiSteamFarm-Service.sh" -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim-arm32v7 AS runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm32v7 AS runtime ENV ASPNETCORE_URLS= LABEL maintainer="JustArchi " EXPOSE 1242 diff --git a/Dockerfile.Service.x64 b/Dockerfile.Service.x64 index ea99ba475..4dac5d299 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 mcr.microsoft.com/dotnet/core/sdk:3.0 AS build-dotnet +FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet ENV CONFIGURATION Release -ENV NET_CORE_VERSION netcoreapp3.0 +ENV NET_CORE_VERSION netcoreapp3.1 WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm @@ -22,7 +22,7 @@ RUN dotnet --info && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' /nologo /p:ASFVariant=generic /p:PublishTrimmed=false /p:UseAppHost=false && \ cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm-Service.sh" "out/ArchiSteamFarm-Service.sh" -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime ENV ASPNETCORE_URLS= LABEL maintainer="JustArchi " EXPOSE 1242 diff --git a/Dockerfile.arm b/Dockerfile.arm index cdf8fd4f7..2b818d437 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \ npm ci && \ npm run-script deploy -FROM mcr.microsoft.com/dotnet/core/sdk:3.0 AS build-dotnet +FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet ENV CONFIGURATION Release -ENV NET_CORE_VERSION netcoreapp3.0 +ENV NET_CORE_VERSION netcoreapp3.1 WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm @@ -22,7 +22,7 @@ RUN dotnet --info && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' /nologo /p:ASFVariant=docker /p:PublishTrimmed=false /p:UseAppHost=false && \ cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "out/ArchiSteamFarm.sh" -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim-arm32v7 AS runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim-arm32v7 AS runtime ENV ASPNETCORE_URLS= LABEL maintainer="JustArchi " EXPOSE 1242 diff --git a/Dockerfile.x64 b/Dockerfile.x64 index e420dc523..e4c05976c 100644 --- a/Dockerfile.x64 +++ b/Dockerfile.x64 @@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \ npm ci && \ npm run-script deploy -FROM mcr.microsoft.com/dotnet/core/sdk:3.0 AS build-dotnet +FROM mcr.microsoft.com/dotnet/core/sdk:3.1 AS build-dotnet ENV CONFIGURATION Release -ENV NET_CORE_VERSION netcoreapp3.0 +ENV NET_CORE_VERSION netcoreapp3.1 WORKDIR /app COPY --from=build-node /app/dist ASF-ui/dist COPY ArchiSteamFarm ArchiSteamFarm @@ -22,7 +22,7 @@ RUN dotnet --info && \ dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o 'out' /nologo /p:ASFVariant=docker /p:PublishTrimmed=false /p:UseAppHost=false && \ cp "ArchiSteamFarm/overlay/generic/ArchiSteamFarm.sh" "out/ArchiSteamFarm.sh" -FROM mcr.microsoft.com/dotnet/core/aspnet:3.0-buster-slim AS runtime +FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS runtime ENV ASPNETCORE_URLS= LABEL maintainer="JustArchi " EXPOSE 1242 diff --git a/appveyor.yml b/appveyor.yml index 2fa4b2dd2..8adf2132d 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: 3.0 + DOTNET_CHANNEL: 3.1 DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_INSTALL_DIR: C:\Program Files\dotnet DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - NET_CORE_VERSION: netcoreapp3.0 + NET_CORE_VERSION: netcoreapp3.1 NET_FRAMEWORK_VERSION: net48 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 bf2125827..4f0a41237 100755 --- a/cc.sh +++ b/cc.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh set -eu -TARGET_FRAMEWORK="netcoreapp3.0" +TARGET_FRAMEWORK="netcoreapp3.1" MAIN_PROJECT="ArchiSteamFarm" TESTS_PROJECT="${MAIN_PROJECT}.Tests"