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

Merge branch 'release/5.0.1xx-preview1' into fix-toolset-flow

Browse source
This commit is contained in:
Matt Mitchell 2020-03-04 13:37:56 -08:00 • committed by GitHub
commit 62d48feb56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
eng/Version.Details.xml
View file

@ -75,13 +75,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>4c1a4ba9c52eccd5bf50e35426135cd835a2240a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.1.20153.3">
<Dependency Name="Microsoft.NET.Sdk" Version="5.0.100-preview.1.20154.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>0220fbd858261bf809188fa9a6b52b075995b530</Sha>
<Sha>5ae7875811f6559583710ad26e6f7a92f927e09e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.1.20153.3">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="5.0.100-preview.1.20154.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>0220fbd858261bf809188fa9a6b52b075995b530</Sha>
<Sha>5ae7875811f6559583710ad26e6f7a92f927e09e</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-preview.1.20120.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

4
eng/Versions.props
View file

@ -49,8 +49,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>5.0.100-preview.1.20153.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.1.20153.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>5.0.100-preview.1.20154.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.1.20154.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>