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

Merge pull request #9980 from dotnet/darc-master-fae094ec-8631-49fd-8164-b61dc3411e88

Browse source 
[master] Update dependencies from dotnet/sdk
This commit is contained in:
v-wuzhai 2021-03-17 17:07:23 +08:00 • committed by GitHub
commit 76e3136a9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

36
eng/Version.Details.xml
View file

@ -43,33 +43,29 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ec1897724f6dc5ab49eebde5f35292493e1bed7b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-preview.3.21166.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="6.0.0-preview.3.21166.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c0a2024a54c848c85ddff460dbf3fb12b7898f70</Sha>
<Sha>0a7a6202dead422fc3071b55b06ab5d33d63b370</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-preview.3.21166.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="6.0.0-preview.3.21166.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c0a2024a54c848c85ddff460dbf3fb12b7898f70</Sha>
<Sha>0a7a6202dead422fc3071b55b06ab5d33d63b370</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21166.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.0-preview.3.21166.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c0a2024a54c848c85ddff460dbf3fb12b7898f70</Sha>
<Sha>0a7a6202dead422fc3071b55b06ab5d33d63b370</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21166.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.3.21166.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c0a2024a54c848c85ddff460dbf3fb12b7898f70</Sha>
<Sha>0a7a6202dead422fc3071b55b06ab5d33d63b370</Sha>
</Dependency>
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.0-preview.3.21165.3" CoherentParentDependency="Microsoft.AspNetCore.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/efcore</Uri>
<Sha>3d6009b84224ba009143dfe8e08a4198acdc0afe</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="6.0.0-preview.3.21166.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-dev-certs" Version="6.0.0-preview.3.21166.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c0a2024a54c848c85ddff460dbf3fb12b7898f70</Sha>
<Sha>0a7a6202dead422fc3071b55b06ab5d33d63b370</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="6.0.0-preview.3.21166.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="dotnet-user-secrets" Version="6.0.0-preview.3.21166.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>c0a2024a54c848c85ddff460dbf3fb12b7898f70</Sha>
<Sha>0a7a6202dead422fc3071b55b06ab5d33d63b370</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.21166.4">
<Uri>https://github.com/dotnet/test-templates</Uri>
@ -87,13 +83,13 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>5067a9034f799eceb42846a62e5431a3ec8a267b</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21166.10">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.3.21166.16">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>7626a76d96636225bd3b5507839f87f5dcd60fe7</Sha>
<Sha>4f14f93c0a4aee68d0ee6a8979c539895f80035f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21166.10">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.3.21166.16">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>7626a76d96636225bd3b5507839f87f5dcd60fe7</Sha>
<Sha>4f14f93c0a4aee68d0ee6a8979c539895f80035f</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.21126.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

16
eng/Versions.props
View file

@ -45,20 +45,20 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21166.7</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-preview.3.21166.7</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-preview.3.21166.7</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21166.7</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-preview.3.21166.7</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-preview.3.21166.7</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>6.0.0-preview.3.21166.12</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>6.0.0-preview.3.21166.12</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>6.0.0-preview.3.21166.12</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>6.0.0-preview.3.21166.12</VSRedistCommonAspNetCoreSharedFrameworkx6460PackageVersion>
<dotnetdevcertsPackageVersion>6.0.0-preview.3.21166.12</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>6.0.0-preview.3.21166.12</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21166.10</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21166.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-preview.3.21166.16</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.3.21166.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>