mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5448 from dotnet/darc-master-286c981d-8070-454e-aeb1-4fe6ec02270d

Browse source 
[master] Update dependencies from dotnet/toolset
This commit is contained in:
Nick Guerrera 2019-11-01 15:07:24 -07:00 committed by GitHub
commit 2efea5a5c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eng/TestVersions.props
View file

@ -1,7 +1,6 @@
<Project>
<PropertyGroup>
<NuGetFrameworksPackageVersion>5.3.0</NuGetFrameworksPackageVersion>
<NuGetProjectModelPackageVersion>$(NuGetFrameworksPackageVersion)</NuGetProjectModelPackageVersion>
<MicrosoftDotNetCliUtilsPackageVersion>$(MicrosoftDotnetToolsetInternalPackageVersion)</MicrosoftDotNetCliUtilsPackageVersion>
<MicrosoftDotNetCliCommandLinePackageVersion>0.1.1</MicrosoftDotNetCliCommandLinePackageVersion>
<MicrosoftNETTestSdkPackageVersion>15.8.0</MicrosoftNETTestSdkPackageVersion>

8
eng/Version.Details.xml
View file

@ -75,17 +75,17 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>6f180514b4aefc006d50c07c947da61e0ac2ed4c</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="5.0.100-alpha.1.19531.4">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="5.0.100-alpha.1.19551.5">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>3951661fbea1c10abd197b1bf9d70277b25d7ee4</Sha>
<Sha>15814fe3b5c44a68dd73bb7236ad368d94f02eff</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-alpha1.19501.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>419501cb5731805c7e49bae276a2938e7c1844de</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-alpha.1.19531.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-alpha.1.19551.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>3951661fbea1c10abd197b1bf9d70277b25d7ee4</Sha>
<Sha>15814fe3b5c44a68dd73bb7236ad368d94f02eff</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.0-alpha1.19462.11" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

4
eng/Versions.props
View file

@ -13,7 +13,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/toolset -->
<MicrosoftDotnetToolsetInternalPackageVersion>5.0.100-alpha.1.19531.4</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>5.0.100-alpha.1.19551.5</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
@ -46,7 +46,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-alpha.1.19531.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-alpha.1.19551.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>

3
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj
View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TargetFramework>netcoreapp5.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
@ -8,6 +8,5 @@
<PackageReference Include="xunit" Version="2.2.0" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="$(MicrosoftDotNetPlatformAbstractionsPackageVersion)" />
<PackageReference Include="Microsoft.DotNet.Cli.Utils" Version="$(MicrosoftDotNetCliUtilsPackageVersion)" />
<PackageReference Include="NuGet.ProjectModel" Version="$(NuGetProjectModelPackageVersion)" />
</ItemGroup>
</Project>