diff --git a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj index 5ee92aa7b..e592182bd 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.1;netcoreapp2.0;net472 diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index c48963bb9..20f8a7331 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -21,7 +21,7 @@ https://github.com/JustArchi/ArchiSteamFarm.git linux-arm;linux-x64;osx-x64;win-x64 false - netcoreapp2.1;net472 + netcoreapp2.1;netcoreapp2.0;net472 @@ -44,6 +44,11 @@ + + + + + diff --git a/appveyor.yml b/appveyor.yml index 5074fa527..534256b3c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -15,6 +15,7 @@ environment: DOTNET_CLI_TELEMETRY_OPTOUT: true DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true NET_CORE_VERSION: netcoreapp2.1 + NET_CORE_FALLBACK_VERSION: netcoreapp2.0 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: @@ -87,6 +88,11 @@ after_test: if ($variant -like '*-netf') { $compressionMethod = 'Deflate' # This depends on what ZipArchive supports on given platform $targetFramework = $env:NET_FRAMEWORK_VERSION + } elseif ($variant -eq 'linux-arm') { + # Temporary workaround for https://github.com/dotnet/coreclr/issues/18486 + Write-Warning -Message "$variant is still targetting $env:NET_CORE_FALLBACK_VERSION, ensure to correct this once https://github.com/dotnet/coreclr/issues/18486 is resolved" -WarningAction Continue + $compressionMethod = 'Deflate64' # This depends on what ZipArchive supports on given platform + $targetFramework = $env:NET_CORE_FALLBACK_VERSION } else { $compressionMethod = 'Deflate64' # This depends on what ZipArchive supports on given platform $targetFramework = $env:NET_CORE_VERSION diff --git a/wiki b/wiki index 989e1afab..429922c22 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 989e1afaba7aac0fe70fdf0fd8273df5adcc4643 +Subproject commit 429922c2237dd9b010b2d09e7490384c248dc686