Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GH2817: Bump dependencies #2779

Merged
merged 1 commit into from
Jun 29, 2020
Merged

GH2817: Bump dependencies #2779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Cake.Common.Tests/Cake.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>Cake.Common.Tests</AssemblyName>
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<IsCakeTestProject>true</IsCakeTestProject>
</PropertyGroup>
Expand All @@ -17,11 +17,11 @@
</ItemGroup>
<!-- Global packages -->
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="Castle.Core" Version="4.4.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
<!-- .NET Framework packages -->
Expand Down
8 changes: 4 additions & 4 deletions src/Cake.Core.Tests/Cake.Core.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>Cake.Core.Tests</AssemblyName>
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<IsCakeTestProject>true</IsCakeTestProject>
</PropertyGroup>
Expand All @@ -15,11 +15,11 @@
</ItemGroup>
<!-- Global packages -->
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="Castle.Core" Version="4.4.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Core/Cake.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<Import Project="..\Shared.msbuild" />
<!-- .NET Core packages -->
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.Win32.Registry" Version="4.4.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="4.7.0" />
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
</ItemGroup>
<!-- .NET Framework packages -->
<ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
Expand Down
8 changes: 4 additions & 4 deletions src/Cake.NuGet.Tests/Cake.NuGet.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>Cake.NuGet.Tests</AssemblyName>
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<IsCakeTestProject>true</IsCakeTestProject>
</PropertyGroup>
Expand All @@ -16,11 +16,11 @@
</ItemGroup>
<!-- Global packages -->
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="Castle.Core" Version="4.4.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
<!-- .NET Framework packages -->
Expand Down
18 changes: 9 additions & 9 deletions src/Cake.NuGet/Cake.NuGet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
</ItemGroup>
<!-- Global packages -->
<ItemGroup>
<PackageReference Include="NuGet.Frameworks" Version="5.4.0" />
<PackageReference Include="NuGet.Versioning" Version="5.4.0" />
<PackageReference Include="NuGet.Protocol" Version="5.4.0" />
<PackageReference Include="NuGet.Packaging" Version="5.4.0" />
<PackageReference Include="NuGet.Resolver" Version="5.4.0" />
<PackageReference Include="NuGet.Common" Version="5.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.0" />
<PackageReference Include="NuGet.Frameworks" Version="5.5.1" />
<PackageReference Include="NuGet.Versioning" Version="5.5.1" />
<PackageReference Include="NuGet.Protocol" Version="5.5.1" />
<PackageReference Include="NuGet.Packaging" Version="5.5.1" />
<PackageReference Include="NuGet.Resolver" Version="5.5.1" />
<PackageReference Include="NuGet.Common" Version="5.5.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.4" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="3.1.0" GeneratePathProperty="true">
<PackageReference Include="Microsoft.NETCore.Platforms" Version="3.1.1" GeneratePathProperty="true">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<EmbeddedResource Include="$(PkgMicrosoft_NETCore_Platforms)\runtime.json">
Expand Down
8 changes: 4 additions & 4 deletions src/Cake.Tests/Cake.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>Cake.Tests</AssemblyName>
<TargetFrameworks>net461;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
<TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
<IsCakeTestProject>true</IsCakeTestProject>
</PropertyGroup>
Expand All @@ -16,11 +16,11 @@
</ItemGroup>
<!-- Global packages -->
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="Castle.Core" Version="4.2.1" />
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="Castle.Core" Version="4.4.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>
<!-- .NET Framework packages -->
Expand Down
14 changes: 7 additions & 7 deletions tests/integration/Cake.Common/Tools/DotNetCore/DotNetCoreAliases.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreBuild")
// Given
var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNetCore");
var project = path.CombineWithFilePath("hwapp/hwapp.csproj");
var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.0/hwapp.dll");
var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll");

// When
DotNetCoreBuild(project.FullPath);
Expand All @@ -61,7 +61,7 @@ Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreVSTest")
{
// Given
var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNetCore");
var assembly = path.CombineWithFilePath("hwapp.tests/bin/Debug/netcoreapp3.0/hwapp.tests.dll");
var assembly = path.CombineWithFilePath("hwapp.tests/bin/Debug/netcoreapp3.1/hwapp.tests.dll");

// When
DotNetCoreVSTest(assembly.FullPath);
Expand Down Expand Up @@ -118,7 +118,7 @@ Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreNuGetPush")
var nugetServerPath = path.Combine("DotNetCorePush");
var nugetSource = outputPath.CombineWithFilePath("hwapp.1.0.0.nupkg");
var nugetDestination = nugetServerPath.CombineWithFilePath("hwapp.1.0.0.nupkg");

EnsureDirectoryExist(outputPath);
EnsureDirectoryExist(nugetServerPath);
Assert.True(System.IO.File.Exists(nugetSource.FullPath), "Path:" + nugetSource.FullPath);
Expand All @@ -138,7 +138,7 @@ Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreNuGetDelete")
var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNetCore");
var nugetServerPath = path.Combine("DotNetCorePush");
var nugetDestination = nugetServerPath.CombineWithFilePath("hwapp.1.0.0.nupkg");

EnsureDirectoryExist(nugetServerPath);
Assert.True(System.IO.File.Exists(nugetDestination.FullPath), "Path:" + nugetDestination.FullPath);

Expand Down Expand Up @@ -184,7 +184,7 @@ Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreExecute")
{
// Given
var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNetCore");
var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.0/hwapp.dll");
var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll");

// When
DotNetCoreExecute(assembly);
Expand All @@ -197,7 +197,7 @@ Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreClean")
// Given
var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNetCore");
var project = path.CombineWithFilePath("hwapp/hwapp.csproj");
var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.0/hwapp.dll");
var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll");
Assert.True(System.IO.File.Exists(assembly.FullPath));

// When
Expand All @@ -214,7 +214,7 @@ Task("Cake.Common.Tools.DotNetCore.DotNetCoreAliases.DotNetCoreMSBuild")
// Given
var path = Paths.Temp.Combine("./Cake.Common/Tools/DotNetCore");
var project = path.CombineWithFilePath("hwapp/hwapp.csproj");
var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.0/hwapp.dll");
var assembly = path.CombineWithFilePath("hwapp/bin/Debug/netcoreapp3.1/hwapp.dll");

// When
DotNetCoreMSBuild(project.FullPath);
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/resources/Cake.Common/Tools/DotNetCore/hwapp.tests/hwapp.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="coverlet.collector" Version="1.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
<PackageReference Include="coverlet.collector" Version="1.2.1" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/resources/Cake.Common/Tools/DotNetCore/hwapp/hwapp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\hwapp.common\hwapp.common.csproj" />
Expand Down