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

Merge pull request #13470 from dotnet/darc-main-187a8858-a81f-4e12-9cf4-b67a3c0927af

Browse source 
[main] Update dependencies from dotnet/sdk
This commit is contained in:
Marc Paine 2022-03-25 13:47:11 -07:00 • committed by GitHub
commit 6c86bbcde7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
eng/Version.Details.xml
View file

@ -17,30 +17,30 @@
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>34ce693fe39218ad556f9fe29f20c657eb389790</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.4.22174.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c33d61412e372b26aa47640c00babd85a733f247</Sha>
<Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.4.22174.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c33d61412e372b26aa47640c00babd85a733f247</Sha>
<Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.4.22174.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.7.0" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c33d61412e372b26aa47640c00babd85a733f247</Sha>
<Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.4.22174.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c33d61412e372b26aa47640c00babd85a733f247</Sha>
<Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.4.22174.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c33d61412e372b26aa47640c00babd85a733f247</Sha>
<Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.4.22174.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c33d61412e372b26aa47640c00babd85a733f247</Sha>
<Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</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. -->
@ -48,9 +48,9 @@
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>7d57652f33493fa022125b7f63aad0d70c52d810</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.4.22174.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c33d61412e372b26aa47640c00babd85a733f247</Sha>
<Sha>cd5beb14b0ce11ae1e4e3f1d30bffba7e37ce606</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="7.0.0-preview.4.22174.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
@ -103,14 +103,14 @@
<Sha>afbebf33947f8d8afa5b76bd2d85099673c2c8c1</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.4.22175.3">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-preview.4.22175.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>efd4338e20b302e9ac11cebc7bc2a5a5bb5dd349</Sha>
<Sha>67304f2a2a66e3974d7f2d47134905cfa6e095ae</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.4.22175.3">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-preview.4.22175.5">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>efd4338e20b302e9ac11cebc7bc2a5a5bb5dd349</Sha>
<Sha>67304f2a2a66e3974d7f2d47134905cfa6e095ae</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="7.0.0-preview.3.22166.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">

18
eng/Versions.props
View file

@ -64,24 +64,24 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>7.0.100-preview.4.22175.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.4.22175.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-preview.4.22175.5</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-preview.4.22175.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/corefx -->
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-preview.4.22174.1</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCorePlatformsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/core-setup -->
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.4.22174.1</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-preview.4.22174.1</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.4.22174.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-preview.4.22174.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.4.22174.1</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.4.22174.1</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-preview.4.22174.7</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<VSRedistCommonNetCoreTargetingPackx6470PackageVersion>7.0.0-preview.4.22174.7</VSRedistCommonNetCoreTargetingPackx6470PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>7.0.0-preview.4.22174.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>