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

Merge pull request #10994 from dotnet/darc-main-eb49c359-b7e9-42d1-bb86-fa0fcdee6f70

Browse source
This commit is contained in:
Ankit Jain 2021-06-28 14:51:33 -04:00 • committed by GitHub
commit 3479477fa8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
eng/Version.Details.xml
View file

@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.0-preview.7.21323.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.0-preview.7.21325.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>30d2e1ff863eaaf8fdadfc31aebfe653196a93b4</Sha>
<Sha>cba7c52c4d3354afcbe0f0f194bc355aa54a5b38</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-preview.7.21323.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-preview.7.21325.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>30d2e1ff863eaaf8fdadfc31aebfe653196a93b4</Sha>
<Sha>cba7c52c4d3354afcbe0f0f194bc355aa54a5b38</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.7.21323.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.7.21325.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>30d2e1ff863eaaf8fdadfc31aebfe653196a93b4</Sha>
<Sha>cba7c52c4d3354afcbe0f0f194bc355aa54a5b38</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.7.21326.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -86,14 +86,14 @@
<Sha>d1a5e13e74fc9f51a37f75f80be541a47ae94859</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.7.21327.2">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.7.21328.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>b2074fb995650ef0194ff118083c3e8791c1dca8</Sha>
<Sha>c3b4cd8e57268828f02e16e0d8d34c9e8598138b</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.7.21327.2">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.7.21328.3">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>b2074fb995650ef0194ff118083c3e8791c1dca8</Sha>
<Sha>c3b4cd8e57268828f02e16e0d8d34c9e8598138b</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.7.21317.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
@ -113,13 +113,13 @@
<Sha>334fb20360e5aac33c1ba7ab21693186fc2350a6</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-preview-20210626-05" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.Test.Sdk" Version="17.0.0-preview-20210627-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>e6f02d6ff5d9958808d6cd25f7994f29ae904c18</Sha>
<Sha>6da66988869c2e59e89793f1ef1bb6eb64de6f0c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21322.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="6.0.100-preview.6.21327.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/mono/linker</Uri>
<Sha>a07cab7b71a1321a9e68571c0b6095144a177b4e</Sha>
<Sha>1c0138c71850bdab14d740e9c4c8808ed034dc51</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
<RepoName>linker</RepoName>
</Dependency>
@ -128,9 +128,9 @@
<Sha>445e572f369dbbdb7fc210c18b775d10d1d57f91</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21323-02" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.Build" Version="17.0.0-preview-21325-03" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>67ba2dfd7df95a64f8b03694b6b4871974be58e0</Sha>
<Sha>e9593e841ab16e9792894267548e10b17c98c535</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="NuGet.Build.Tasks" Version="6.0.0-preview.1.66" CoherentParentDependency="Microsoft.NET.Sdk">

12
eng/Versions.props
View file

@ -57,8 +57,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-preview.7.21327.2</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.7.21327.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-preview.7.21328.3</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.7.21328.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -78,9 +78,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-preview.7.21323.1</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0-preview.7.21323.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0-preview.7.21323.1</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-preview.7.21325.1</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0-preview.7.21325.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0-preview.7.21325.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
@ -149,7 +149,7 @@
<PropertyGroup>
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
<MicrosoftNETTestSdkVersion>17.0.0-preview-20210626-05</MicrosoftNETTestSdkVersion>
<MicrosoftNETTestSdkVersion>17.0.0-preview-20210627-02</MicrosoftNETTestSdkVersion>
</PropertyGroup>
<!-- dependencies for source-build tarball -->
<PropertyGroup>