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

Merge pull request #9790 from dotnet/darc-master-29aafb07-e156-48f4-a906-faef662f1b98

Browse source 
[master] Update dependencies from dotnet/sdk
This commit is contained in:
v-wuzhai 2021-02-24 21:39:15 -08:00 committed by GitHub
commit 9d5f2bb95b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
eng/Version.Details.xml
View file

@ -13,25 +13,25 @@
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>37f4a2c2df3d14692a7f7a4ef3a0ff6641277a35</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21123.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>87a7159be8ca598838ae014bcd11bff5c7d779c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.0-preview.3.21123.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>87a7159be8ca598838ae014bcd11bff5c7d779c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21123.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>87a7159be8ca598838ae014bcd11bff5c7d779c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="6.0.0-preview.3.21123.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>87a7159be8ca598838ae014bcd11bff5c7d779c5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="6.0.0-preview.3.21123.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>87a7159be8ca598838ae014bcd11bff5c7d779c5</Sha>
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
<!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@ -39,37 +39,37 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21123.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.0-preview.3.21123.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b121bcacec60f10b316b25eb9d0b7113599bc508</Sha>
<Sha>87a7159be8ca598838ae014bcd11bff5c7d779c5</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-preview.3.21123.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-preview.3.21124.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4de1c4593e4af94db076b68d47f858de28953a46</Sha>
<Sha>e51b58e3dde10f7aaee169a89e0d15dbaa069c93</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-preview.3.21123.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-preview.3.21124.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4de1c4593e4af94db076b68d47f858de28953a46</Sha>
<Sha>e51b58e3dde10f7aaee169a89e0d15dbaa069c93</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21123.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21124.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4de1c4593e4af94db076b68d47f858de28953a46</Sha>
<Sha>e51b58e3dde10f7aaee169a89e0d15dbaa069c93</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21123.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21124.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4de1c4593e4af94db076b68d47f858de28953a46</Sha>
<Sha>e51b58e3dde10f7aaee169a89e0d15dbaa069c93</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.0-preview.3.21123.3" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>6e45ea2e967e0e7fe575f61e91fe83d1dbef30ba</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.0-preview.3.21123.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.0-preview.3.21124.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4de1c4593e4af94db076b68d47f858de28953a46</Sha>
<Sha>e51b58e3dde10f7aaee169a89e0d15dbaa069c93</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.0-preview.3.21123.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.0-preview.3.21124.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>4de1c4593e4af94db076b68d47f858de28953a46</Sha>
<Sha>e51b58e3dde10f7aaee169a89e0d15dbaa069c93</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="6.0.0-preview.2.21108.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@ -91,13 +91,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>02cac30b1fbd0111c05c3b7684cb62b27aabd8c0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21124.10">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21124.28">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>64eeae7bf81196b8b078261e86520b334fcda267</Sha>
<Sha>a0086041e0c6d198fda3d2a3bc6976c3b147d258</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21124.10">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21124.28">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>64eeae7bf81196b8b078261e86520b334fcda267</Sha>
<Sha>a0086041e0c6d198fda3d2a3bc6976c3b147d258</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.3.21123.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -116,22 +116,22 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>e6fe66c093ae861dd3b051fc360993ddff368bd4</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21118.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.2.21124.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/mono/linker</Uri>
<Sha>422f2f710707c1cf95dd513022c8fbef19f177dc</Sha>
<Sha>6b3a3050c70577bd1b3fd7611eef56679e22a4f1</Sha>
<RepoName>linker</RepoName>
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-2.21124.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="3.10.0-2.21125.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>4affc3fa9e5777a0a865cc0750dd19de5a10385d</Sha>
<Sha>630d85f259f64a75fd57c50e3815fa37d7801653</Sha>
</Dependency>
<Dependency Name="Microsoft.Build" Version="16.10.0-preview-21124-17" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>30bbc5a5d8e21034676182480407c32079af28b5</Sha>
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="5.9.0-rc.7122" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted</Uri>
<Sha>abf0ba0638070af16427cea69bd47a9945fd5d7a</Sha>
<Dependency Name="NuGet.Build.Tasks" Version="5.9.0-preview.3.7027" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/NuGet/NuGet.Client</Uri>
<Sha>cceb05e4ed5910f0609e14c8937c905288520c03</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cli.CommandLine" Version="1.0.0-preview.19208.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/CliCommandLineParser</Uri>

28
eng/Versions.props
View file

@ -45,12 +45,12 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21123.9</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-preview.3.21123.9</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-preview.3.21123.9</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21123.9</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-preview.3.21123.9</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-preview.3.21123.9</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21124.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-preview.3.21124.5</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-preview.3.21124.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21124.5</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-preview.3.21124.5</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-preview.3.21124.5</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>6.0.0-preview.2.21108.6</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
@ -58,23 +58,23 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21124.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21124.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21124.28</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21124.28</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-preview.3.21123.2</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>6.0.0-preview.3.21123.15</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21123.2</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21123.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.0-preview.3.21123.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.3.21123.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.3.21123.2</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21123.15</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21123.15</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>6.0.0-preview.3.21123.15</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-preview.3.21123.15</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-preview.3.21123.15</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>