Skip to content

Commit

Permalink
Set DisableImplicitNuGetFallbackFolder and bump Ubuntu on Travis (#611)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
mikkelbu authored and ChrisMaddock committed Apr 19, 2019
1 parent 23fff2b commit 1ca910e
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion appveyor.yml
Expand Up @@ -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.
Expand Down
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions src/NUnitConsole/nunit3-console/nunit3-console.csproj
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/NUnitEngine/notest-assembly/notest-assembly.csproj
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions src/NUnitEngine/nunit-agent/nunit-agent-x86.csproj
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions src/NUnitEngine/nunit-agent/nunit-agent.csproj
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions src/NUnitEngine/nunit.engine.api/nunit.engine.api.csproj
Expand Up @@ -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" />
Expand Down
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions src/NUnitEngine/nunit.engine/nunit.engine.csproj
Expand Up @@ -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" />
Expand Down

0 comments on commit 1ca910e

Please sign in to comment.