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

Merge pull request #12217 from dotnet/darc-release/6.0.1xx-e4f9ec9a-ba63-4e3e-a47d-5239470566ac

Browse source 
[release/6.0.1xx] Update dependencies from dotnet/sdk
This commit is contained in:
Marc Paine 2021-09-30 15:27:17 -07:00 committed by GitHub
commit b2fac072e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -98,14 +98,14 @@
<Sha>33b3438b8122420b73c8430826222bb0f799f157</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rtm.21480.6">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rtm.21480.28">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>50d84c7c0863ff31052ce4ca40bb4db47df77e49</Sha>
<Sha>685f6d9090d9253aa5dab8340e1583fd57dc309d</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-rtm.21480.6">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-rtm.21480.28">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>50d84c7c0863ff31052ce4ca40bb4db47df77e49</Sha>
<Sha>685f6d9090d9253aa5dab8340e1583fd57dc309d</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="6.0.0-rtm.21479.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -140,9 +140,9 @@
<Sha>6e8bb6f10f79579866458d30abcb764d7da9df85</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21480-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21480-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>5805e34696afed9398bc05e2c88e9a9d4f79a4ce</Sha>
<Sha>bbcce1dff18a5c7cb8751ad240e921774b50ebeb</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0-rc.258" CoherentParentDependency="Microsoft.NET.Sdk">

4
eng/Versions.props
View file

@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-rtm.21480.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-rtm.21480.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-rtm.21480.28</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-rtm.21480.28</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>