From 2605df8ac55f0b6062bc9cb424fe4be4d350fb48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Domeradzki?= <JustArchi@JustArchi.net>
Date: Thu, 7 Nov 2019 21:01:14 +0100
Subject: [PATCH] Enable Linux in travis again (#1491)

* Testing

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Keep trying

* Keep trying

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml
---
 .travis.yml                                              | 9 +++------
 .../ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj    | 4 ++--
 ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj         | 4 ++--
 ArchiSteamFarm/ArchiSteamFarm.csproj                     | 4 ++--
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f578f8055..23c2ef200 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,6 @@ solution: ArchiSteamFarm.sln
 git:
   depth: 10
 
-# Use latest images for building: https://blog.travis-ci.com/2017-12-01-new-update-schedule-for-linux-build-images
-group: travis_latest
-
 # ASF is based on .NET Core platform, we're not building with Mono
 dotnet: 3.0
 mono: none
@@ -57,7 +54,7 @@ script:
             # TODO: Workaround https://github.com/mono/linker/issues/286 (don't forget to remove it from docker files too)
             dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" --no-restore /nologo "/p:ASFVariant=$1" "/p:PublishTrimmed=false" "/p:UseAppHost=false"
         else
-            dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" -r "$1" --no-restore /nologo "/p:ASFVariant=$1"
+            dotnet publish ArchiSteamFarm -c "$CONFIGURATION" -f "$NET_CORE_VERSION" -o "out/${1}" -r "$1" --no-restore /nologo "/p:ASFVariant=$1" "/p:LinkDuringPublish=false"
         fi
 
         # If we include any overlay for this variant, copy it to output directory
@@ -75,7 +72,7 @@ script:
     wait
     set +u # This is needed to continue Travis build
 matrix:
-  # TODO: Remove failure allow once linux works with 3.0
+  # TODO: Remove failure allow once Linux works with 3.0
   allow_failures:
     - os: linux
   # We can use fast finish, as we don't need to wait for allow_failures builds to mark build as success
@@ -84,7 +81,7 @@ matrix:
     # We're building ASF with dotnet on latest versions of Linux and OS X
     # Sadly, travis is still missing support for selecting latest images: https://github.com/travis-ci/travis-ci/issues/8922
     - os: linux
-      # Ref: https://docs.travis-ci.com/user/reference/bionic
+      # Ref: https://docs.travis-ci.com/user/reference/linux
       dist: bionic
     - os: osx
       # Ref: https://docs.travis-ci.com/user/reference/osx
diff --git a/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj b/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj
index b93dae068..af807269f 100644
--- a/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj
+++ b/ArchiSteamFarm.CustomPlugins.ExamplePlugin/ArchiSteamFarm.CustomPlugins.ExamplePlugin.csproj
@@ -9,8 +9,8 @@
     <LangVersion>8.0</LangVersion>
     <NoWarn />
     <OutputType>Library</OutputType>
-    <PackageIconUrl>https://github.com/JustArchiNET/ArchiSteamFarm/raw/master/resources/ASF.ico</PackageIconUrl>
-    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <PackageIcon>../resources/ASF.ico</PackageIcon>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/JustArchiNET/ArchiSteamFarm</PackageProjectUrl>
     <RepositoryType>Git</RepositoryType>
     <RepositoryUrl>https://github.com/JustArchi/ArchiSteamFarm.git</RepositoryUrl>
diff --git a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj
index 6c3d11548..4189f8a29 100644
--- a/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj
+++ b/ArchiSteamFarm.Tests/ArchiSteamFarm.Tests.csproj
@@ -10,8 +10,8 @@
     <LangVersion>8.0</LangVersion>
     <NoWarn />
     <OutputType>Library</OutputType>
-    <PackageIconUrl>https://github.com/JustArchiNET/ArchiSteamFarm/raw/master/resources/ASF.ico</PackageIconUrl>
-    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <PackageIcon>../resources/ASF.ico</PackageIcon>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/JustArchiNET/ArchiSteamFarm</PackageProjectUrl>
     <RepositoryType>Git</RepositoryType>
     <RepositoryUrl>https://github.com/JustArchiNET/ArchiSteamFarm.git</RepositoryUrl>
diff --git a/ArchiSteamFarm/ArchiSteamFarm.csproj b/ArchiSteamFarm/ArchiSteamFarm.csproj
index 05c2fc07a..baa3247d8 100644
--- a/ArchiSteamFarm/ArchiSteamFarm.csproj
+++ b/ArchiSteamFarm/ArchiSteamFarm.csproj
@@ -16,8 +16,8 @@
     <NoWarn>1591</NoWarn>
     <OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
     <OutputType>Exe</OutputType>
-    <PackageIconUrl>https://github.com/JustArchiNET/ArchiSteamFarm/raw/master/resources/ASF.ico</PackageIconUrl>
-    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <PackageIcon>../resources/ASF.ico</PackageIcon>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/JustArchiNET/ArchiSteamFarm</PackageProjectUrl>
     <PublishTrimmed>false</PublishTrimmed>
     <RepositoryType>Git</RepositoryType>