diff --git a/.travis.yml b/.travis.yml index 5c8c2781a..8a0c565c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ branches: group: travis_latest # ASF is based on .NET Core platform -dotnet: 2.1.300 +dotnet: 2.1.301 mono: none env: @@ -70,10 +70,11 @@ matrix: fast_finish: true include: # We're building ASF with dotnet on latest versions of Linux and OS X + # Sadly, travis is still missing https://github.com/travis-ci/travis-ci/issues/8922 - os: linux # Ref: https://docs.travis-ci.com/user/reference/trusty/ dist: trusty sudo: false - os: osx # Ref: https://docs.travis-ci.com/user/reference/osx/ - osx_image: xcode9.3 + osx_image: xcode9.4 diff --git a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj index 915e032a2..5ee92aa7b 100644 --- a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj +++ b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj @@ -5,6 +5,7 @@ JustArchi JustArchi Copyright © ArchiSteamFarm 2015-2018 + $(DefaultItemExcludes);debug/**;out/** ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously. none latest diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj index a3cb01c5f..2ed62c990 100644 --- a/ArchiSteamFarm/ArchiSteamFarm.csproj +++ b/ArchiSteamFarm/ArchiSteamFarm.csproj @@ -7,6 +7,7 @@ JustArchi true Copyright © ArchiSteamFarm 2015-2018 + $(DefaultItemExcludes);debug/**;out/** ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously. none 3.2.0.3 diff --git a/appveyor.yml b/appveyor.yml index 6401c99ff..1875ad2b6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -16,8 +16,7 @@ environment: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true NET_CORE_VERSION: netcoreapp2.1 NET_FRAMEWORK_VERSION: net472 - SINGLE_VARIANTS: generic-netf # 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! + 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: allow_failures: - image: Visual Studio 2017 Preview @@ -107,8 +106,8 @@ after_test: Copy-Item "ArchiSteamFarm\scripts\$variant\*" -Destination "ArchiSteamFarm\out\$variant" } + # Until https://github.com/dotnet/cli/issues/3267 happens, we'll hack dotnet binary icon on Windows and include .ico file on other platforms if ($targetFramework -eq "$env:NET_CORE_VERSION") { - # Until https://github.com/dotnet/cli/issues/3267 happens, we'll hack dotnet binary icon on Windows and include .ico file on other platforms if (Test-Path -Path "ArchiSteamFarm\out\$variant\ArchiSteamFarm.exe" -PathType Leaf) { tools\rcedit\rcedit-x64.exe "ArchiSteamFarm\out\$variant\ArchiSteamFarm.exe" --set-icon 'resources\ASF.ico' @@ -120,12 +119,17 @@ after_test: } } + # By default use fastest compression + $compressionArgs = '-mx=1' + + # Include extra logic for builds marked for release if ($env:APPVEYOR_REPO_TAG -eq 'true') { # Update link in Changelog.html accordingly if (Test-Path -Path "ArchiSteamFarm\out\$variant\Changelog.html" -PathType Leaf) { (Get-Content -Path "ArchiSteamFarm\out\$variant\Changelog.html").Replace('ArchiSteamFarm/commits/master', "ArchiSteamFarm/releases/tag/$env:APPVEYOR_REPO_TAG_NAME") | Set-Content -Path "ArchiSteamFarm\out\$variant\Changelog.html" } + # If this build is going to be deployed further, prefer maximum compression if ($env:APPVEYOR_BUILD_WORKER_IMAGE -eq 'Visual Studio 2017') { $compressionArgs = '-mx=9', '-mpass=15' @@ -135,8 +139,6 @@ after_test: $compressionArgs += '-mfb=258' } } - } else { - $compressionArgs = '-mx=1' } 7z a -bd -tzip "-mm=$compressionMethod" $compressionArgs "ArchiSteamFarm\out\ASF-$variant.zip" "$env:APPVEYOR_BUILD_FOLDER\ArchiSteamFarm\out\$variant\*" @@ -153,10 +155,6 @@ after_test: } } - foreach ($variant in $env:SINGLE_VARIANTS.Split([char[]] $null, [System.StringSplitOptions]::RemoveEmptyEntries)) { - Start-Job -Name "$variant" -ScriptBlock $PublishBlock -ArgumentList "$variant" | Receive-Job -AutoRemoveJob -Wait - } - foreach ($variant in $env:VARIANTS.Split([char[]] $null, [System.StringSplitOptions]::RemoveEmptyEntries)) { Start-Job -Name "$variant" -ScriptBlock $PublishBlock -ArgumentList "$variant" }