Akatsuki-Misaki/ArchiSteamFarm
1
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm.git synced 2025-12-16 14:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

.NET Core 2.2 (#958)

Browse Source 
* Initial bump

* Fix travis
This commit is contained in:
Łukasz Domeradzki
2018-12-07 22:04:09 +01:00
committed by GitHub
parent 6a909aa1b2
commit 1d78060015
9 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@@ -10,7 +10,7 @@ git:
group: travis_latest group: travis_latest
# ASF is based on .NET Core platform, we're not building with Mono # ASF is based on .NET Core platform, we're not building with Mono
dotnet: 2.1 dotnet: 2.2
mono: none mono: none
env: env:
@@ -18,7 +18,7 @@ env:
- CONFIGURATION: Release - CONFIGURATION: Release
- DOTNET_CLI_TELEMETRY_OPTOUT: 1 - DOTNET_CLI_TELEMETRY_OPTOUT: 1
- DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 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! - 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: before_script:
- | - |
@@ -83,5 +83,5 @@ matrix:
dist: xenial dist: xenial
- os: osx - os: osx
# Ref: https://docs.travis-ci.com/user/reference/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 osx_image: xcode10.1

2
ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj
View File

@@ -16,7 +16,7 @@
<PackageProjectUrl>https://github.com/JustArchi/ArchiSteamFarm</PackageProjectUrl> <PackageProjectUrl>https://github.com/JustArchi/ArchiSteamFarm</PackageProjectUrl>
<RepositoryType>Git</RepositoryType> <RepositoryType>Git</RepositoryType>
<RepositoryUrl>https://github.com/JustArchi/ArchiSteamFarm.git</RepositoryUrl> <RepositoryUrl>https://github.com/JustArchi/ArchiSteamFarm.git</RepositoryUrl>
<TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks> <TargetFrameworks>netcoreapp2.2;net472</TargetFrameworks>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
</PropertyGroup> </PropertyGroup>

4
ArchiSteamFarm/ArchiSteamFarm.csproj
View File

@@ -22,7 +22,7 @@
<RepositoryUrl>https://github.com/JustArchi/ArchiSteamFarm.git</RepositoryUrl> <RepositoryUrl>https://github.com/JustArchi/ArchiSteamFarm.git</RepositoryUrl>
<RuntimeIdentifiers>linux-arm;linux-x64;osx-x64;win-x64</RuntimeIdentifiers> <RuntimeIdentifiers>linux-arm;linux-x64;osx-x64;win-x64</RuntimeIdentifiers>
<ServerGarbageCollection>false</ServerGarbageCollection> <ServerGarbageCollection>false</ServerGarbageCollection>
<TargetFrameworks>netcoreapp2.1;net472</TargetFrameworks> <TargetFrameworks>netcoreapp2.2;net472</TargetFrameworks>
<TargetLatestRuntimePatch>true</TargetLatestRuntimePatch> <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
</PropertyGroup> </PropertyGroup>
@@ -60,7 +60,7 @@
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0-beta" /> <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.0.0-beta" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'"> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.2'">
<PackageReference Include="ILLink.Tasks" Version="0.1.5-preview-1841731" /> <PackageReference Include="ILLink.Tasks" Version="0.1.5-preview-1841731" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.6.0-preview.18571.3" /> <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.6.0-preview.18571.3" />
</ItemGroup> </ItemGroup>

6
Dockerfile.Service.arm
View File

@@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \
npm ci && \ npm ci && \
npm run-script deploy 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 CONFIGURATION Release
ENV NET_CORE_VERSION netcoreapp2.1 ENV NET_CORE_VERSION netcoreapp2.2
WORKDIR /app WORKDIR /app
COPY --from=build-node /app/dist ASF-ui/dist COPY --from=build-node /app/dist ASF-ui/dist
COPY ArchiSteamFarm ArchiSteamFarm 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 && \ 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" 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= ENV ASPNETCORE_URLS=
LABEL maintainer="JustArchi <JustArchi@JustArchi.net>" LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
EXPOSE 1242 EXPOSE 1242

6
Dockerfile.Service.x64
View File

@@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \
npm ci && \ npm ci && \
npm run-script deploy 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 CONFIGURATION Release
ENV NET_CORE_VERSION netcoreapp2.1 ENV NET_CORE_VERSION netcoreapp2.2
WORKDIR /app WORKDIR /app
COPY --from=build-node /app/dist ASF-ui/dist COPY --from=build-node /app/dist ASF-ui/dist
COPY ArchiSteamFarm ArchiSteamFarm 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 && \ 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" 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= ENV ASPNETCORE_URLS=
LABEL maintainer="JustArchi <JustArchi@JustArchi.net>" LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
EXPOSE 1242 EXPOSE 1242

6
Dockerfile.arm
View File

@@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \
npm ci && \ npm ci && \
npm run-script deploy 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 CONFIGURATION Release
ENV NET_CORE_VERSION netcoreapp2.1 ENV NET_CORE_VERSION netcoreapp2.2
WORKDIR /app WORKDIR /app
COPY --from=build-node /app/dist ASF-ui/dist COPY --from=build-node /app/dist ASF-ui/dist
COPY ArchiSteamFarm ArchiSteamFarm 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 && \ 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" 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= ENV ASPNETCORE_URLS=
LABEL maintainer="JustArchi <JustArchi@JustArchi.net>" LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
EXPOSE 1242 EXPOSE 1242

6
Dockerfile.x64
View File

@@ -6,9 +6,9 @@ RUN echo "node: $(node --version)" && \
npm ci && \ npm ci && \
npm run-script deploy 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 CONFIGURATION Release
ENV NET_CORE_VERSION netcoreapp2.1 ENV NET_CORE_VERSION netcoreapp2.2
WORKDIR /app WORKDIR /app
COPY --from=build-node /app/dist ASF-ui/dist COPY --from=build-node /app/dist ASF-ui/dist
COPY ArchiSteamFarm ArchiSteamFarm 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 && \ 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" 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= ENV ASPNETCORE_URLS=
LABEL maintainer="JustArchi <JustArchi@JustArchi.net>" LABEL maintainer="JustArchi <JustArchi@JustArchi.net>"
EXPOSE 1242 EXPOSE 1242

4
appveyor.yml
View File

@@ -9,11 +9,11 @@ environment:
CROWDIN_API_KEY: CROWDIN_API_KEY:
secure: oGuZaQo2z5/JkEYaKrD9Ing+TgwZ3qQVf+9Jdz73Fephy04z5rWPGCCtkjaMLTcY secure: oGuZaQo2z5/JkEYaKrD9Ing+TgwZ3qQVf+9Jdz73Fephy04z5rWPGCCtkjaMLTcY
CROWDIN_PROJECT_IDENTIFIER: archisteamfarm CROWDIN_PROJECT_IDENTIFIER: archisteamfarm
# DOTNET_CHANNEL: 2.1 DOTNET_CHANNEL: 2.2
DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_CLI_TELEMETRY_OPTOUT: true
DOTNET_INSTALL_DIR: tools\dotnet DOTNET_INSTALL_DIR: tools\dotnet
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
NET_CORE_VERSION: netcoreapp2.1 NET_CORE_VERSION: netcoreapp2.2
NET_FRAMEWORK_VERSION: net472 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! 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: matrix:

2
cc.sh
View File

@@ -6,7 +6,7 @@ TESTS_PROJECT="${MAIN_PROJECT}.Tests"
SOLUTION="${MAIN_PROJECT}.sln" SOLUTION="${MAIN_PROJECT}.sln"
CONFIGURATION="Release" CONFIGURATION="Release"
OUT="out/source" OUT="out/source"
TARGET_FRAMEWORK="netcoreapp2.1" TARGET_FRAMEWORK="netcoreapp2.2"
CLEAN=0 CLEAN=0
LINK_DURING_PUBLISH=1 LINK_DURING_PUBLISH=1