This commit is contained in:
JustArchi
2018-07-10 09:37:51 +02:00
parent 9cb348529f
commit 84331b8c7b
4 changed files with 14 additions and 3 deletions

View File

@@ -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.1;netcoreapp2.0;net472</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">

View File

@@ -21,7 +21,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.1;netcoreapp2.0;net472</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -44,6 +44,11 @@
<PackageReference Include="SteamKit2" Version="2.1.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<PackageReference Include="ILLink.Tasks" Version="0.1.5-preview-1461378" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
<PackageReference Include="ILLink.Tasks" Version="0.1.5-preview-1461378" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="4.5.0" />

View File

@@ -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

2
wiki

Submodule wiki updated: 989e1afaba...429922c223