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

Merge pull request #10660 from dotnet/darc-release/6.0.1xx-preview5-f6016132-c3b9-496c-9fe9-1c56a1c1fa9e

Browse source 
[release/6.0.1xx-preview5] Update dependencies from dotnet/sdk
This commit is contained in:
Sarah Oslund 2021-05-18 08:49:31 -07:00 committed by GitHub
commit ad604d6489
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
eng/Version.Details.xml
View file

@ -83,13 +83,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>c13bd264a0eeae6b79dfb01ec814290b383b894b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.5.21267.9">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.5.21267.21">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>44f611903d0d9a555016b5c2e003ab5f5514db4a</Sha>
<Sha>d64d5fbe80abe706289baecb429e6900b42c9f22</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.5.21267.9">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.5.21267.21">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>44f611903d0d9a555016b5c2e003ab5f5514db4a</Sha>
<Sha>d64d5fbe80abe706289baecb429e6900b42c9f22</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-preview.5.21226.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -100,9 +100,9 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>068dc59e2e5316b5533017a3bb57ef1fb4ac337f</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="11.4.2-beta.21262.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21267.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>1b23bbeda88ea3cb9be9af777f4c99fa8663df81</Sha>
<Sha>eed88d48c9f6ebd9d1df11a57f81eba7a40c9bf5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-preview-20210512-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
@ -113,9 +113,9 @@
<Sha>7a5c445a69359415b7ff18b91cd24472ef9509ff</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-2.21264.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.0.0-1.21267.34" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>29bf93d703d4001fa1c1e71f5383d08d924cc1c1</Sha>
<Sha>344acb8100d629969228fd76474befc2c969cb10</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21267-01" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>

4
eng/Versions.props
View file

@ -57,8 +57,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-preview.5.21267.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.5.21267.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-preview.5.21267.21</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.5.21267.21</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>