From 1ca910e5f326675d93743b5fa8cc176c1834590d Mon Sep 17 00:00:00 2001
From: Mikkel Nylander Bundgaard <mikkelbu@users.noreply.github.com>
Date: Sat, 20 Apr 2019 00:58:35 +0200
Subject: [PATCH] Set DisableImplicitNuGetFallbackFolder and bump Ubuntu on
 Travis (#611)

* Set DisableImplicitNuGetFallbackFolder for all projects

* Bump Ubuntu version to make build server green

This will be the default in a couple of weeks, see
https://blog.travis-ci.com/2019-04-15-xenial-default-build-environment
---
 .travis.yml                                                   | 4 ++--
 appveyor.yml                                                  | 1 -
 .../nunit3-console.tests/nunit3-console.tests.csproj          | 1 +
 src/NUnitConsole/nunit3-console/nunit3-console.csproj         | 1 +
 src/NUnitEngine/notest-assembly/notest-assembly.csproj        | 1 +
 src/NUnitEngine/nunit-agent/nunit-agent-x86.csproj            | 1 +
 src/NUnitEngine/nunit-agent/nunit-agent.csproj                | 1 +
 src/NUnitEngine/nunit.engine.api/nunit.engine.api.csproj      | 1 +
 src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj  | 1 +
 src/NUnitEngine/nunit.engine/nunit.engine.csproj              | 1 +
 10 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a9a69f18..125ea81d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,9 @@ mono: 5.10.0 # Need 5.2+ for the included MSBuild.
 
 matrix:
   include:
-    - os: linux
+    - dist: xenial
       install:
-        - wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb
+        - wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb
         - sudo dpkg -i packages-microsoft-prod.deb
         - sudo apt-get install apt-transport-https
         - sudo apt-get update
diff --git a/appveyor.yml b/appveyor.yml
index 0d5f7db6e..3fbfecfbd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,7 +5,6 @@ branches:
 image: Visual Studio 2017
 
 build_script:
-  - nuget restore src\NUnitEngine\mock-assembly\mock-assembly.csproj
   - ps: .\build.ps1 -Target "Appveyor" -Configuration "Release"
 
 # disable built-in tests.
diff --git a/src/NUnitConsole/nunit3-console.tests/nunit3-console.tests.csproj b/src/NUnitConsole/nunit3-console.tests/nunit3-console.tests.csproj
index bb56814e2..835afd19c 100644
--- a/src/NUnitConsole/nunit3-console.tests/nunit3-console.tests.csproj
+++ b/src/NUnitConsole/nunit3-console.tests/nunit3-console.tests.csproj
@@ -9,6 +9,7 @@
     <NoWarn>1685</NoWarn>
     <DebugType>Full</DebugType>
     <LangVersion>7</LangVersion>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NSubstitute" Version="2.0.3" />
diff --git a/src/NUnitConsole/nunit3-console/nunit3-console.csproj b/src/NUnitConsole/nunit3-console/nunit3-console.csproj
index 5b2a77945..7757338e5 100644
--- a/src/NUnitConsole/nunit3-console/nunit3-console.csproj
+++ b/src/NUnitConsole/nunit3-console/nunit3-console.csproj
@@ -9,6 +9,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Commandlineparameters>nunit.engine.tests.dll -process:Single</Commandlineparameters>
     <LangVersion>7</LangVersion>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
diff --git a/src/NUnitEngine/notest-assembly/notest-assembly.csproj b/src/NUnitEngine/notest-assembly/notest-assembly.csproj
index ef03a5512..78da729f9 100644
--- a/src/NUnitEngine/notest-assembly/notest-assembly.csproj
+++ b/src/NUnitEngine/notest-assembly/notest-assembly.csproj
@@ -5,6 +5,7 @@
     <TargetFrameworks>net35;netcoreapp1.1;netcoreapp2.0</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.11.0" />
diff --git a/src/NUnitEngine/nunit-agent/nunit-agent-x86.csproj b/src/NUnitEngine/nunit-agent/nunit-agent-x86.csproj
index b78c555cf..caeba18f7 100644
--- a/src/NUnitEngine/nunit-agent/nunit-agent-x86.csproj
+++ b/src/NUnitEngine/nunit-agent/nunit-agent-x86.csproj
@@ -13,6 +13,7 @@
     <IntermediateOutputPath>obj\$(Configuration)\x86\</IntermediateOutputPath>
     <LangVersion>7</LangVersion>
     <GenerateSupportedRuntime>false</GenerateSupportedRuntime>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net20'">
     <Reference Include="System.Runtime.Remoting" />
diff --git a/src/NUnitEngine/nunit-agent/nunit-agent.csproj b/src/NUnitEngine/nunit-agent/nunit-agent.csproj
index 13adf7181..ba2dab167 100644
--- a/src/NUnitEngine/nunit-agent/nunit-agent.csproj
+++ b/src/NUnitEngine/nunit-agent/nunit-agent.csproj
@@ -11,6 +11,7 @@
     <ApplicationIcon>..\..\..\nunit.ico</ApplicationIcon>
     <LangVersion>7</LangVersion>
     <GenerateSupportedRuntime>false</GenerateSupportedRuntime>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net20'">
     <Reference Include="System.Runtime.Remoting" />
diff --git a/src/NUnitEngine/nunit.engine.api/nunit.engine.api.csproj b/src/NUnitEngine/nunit.engine.api/nunit.engine.api.csproj
index 053ab121d..c75fe250a 100644
--- a/src/NUnitEngine/nunit.engine.api/nunit.engine.api.csproj
+++ b/src/NUnitEngine/nunit.engine.api/nunit.engine.api.csproj
@@ -10,6 +10,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>7</LangVersion>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net20'">
     <Reference Include="System.Web" />
diff --git a/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj b/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj
index af19e0817..8a23fb00f 100644
--- a/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj
+++ b/src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj
@@ -11,6 +11,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DebugType>Full</DebugType>
     <LangVersion>7</LangVersion>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net35'">
     <Reference Include="System.Configuration" />
diff --git a/src/NUnitEngine/nunit.engine/nunit.engine.csproj b/src/NUnitEngine/nunit.engine/nunit.engine.csproj
index 2d16f5eab..00f43826a 100644
--- a/src/NUnitEngine/nunit.engine/nunit.engine.csproj
+++ b/src/NUnitEngine/nunit.engine/nunit.engine.csproj
@@ -9,6 +9,7 @@
     <AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <LangVersion>7</LangVersion>
+    <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net20'">
     <PackageReference Include="Mono.Cecil" Version="0.9.6.1" />