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

Update dependencies from https://github.com/dotnet/sdk build 20210622.13 (#10953)

Browse source 
[release/6.0.1xx-preview6] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-preview.6.21317.5 to 6.0.0-preview.6.21322.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-preview.6.21317.5 to 6.0.0-preview.6.21322.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21317.5 to 6.0.0-preview.6.21322.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-preview.6.21317.3 to 6.0.0-preview.6.21318.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-preview.6.21317.5 to 6.0.0-preview.6.21322.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-preview.6.21317.3 to 6.0.0-preview.6.21322.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
This commit is contained in:
dotnet-maestro[bot] 2021-06-22 23:45:49 +00:00 committed by GitHub
parent cea112a722
commit 426e40bbd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
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.6.21317.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.0-preview.6.21322.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9d23eba2a0295fa530d510cfe45ce6982f461be1</Sha>
<Sha>4927b7fafc023b13fd7db9e91c3be188d5e3e0b7</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21317.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21322.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9d23eba2a0295fa530d510cfe45ce6982f461be1</Sha>
<Sha>4927b7fafc023b13fd7db9e91c3be188d5e3e0b7</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.6.21317.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-preview.6.21322.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>9d23eba2a0295fa530d510cfe45ce6982f461be1</Sha>
<Sha>4927b7fafc023b13fd7db9e91c3be188d5e3e0b7</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-preview.6.21317.12" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -83,22 +83,22 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>8615f76c05d26cfd415d2ef251cc471fe60e4793</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.6.21322.12">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-preview.6.21322.13">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>b80b435fda5aaceeab6067e5270a656267b4e17c</Sha>
<Sha>15c70cf9d717179af0f1a5f1f670b2ae0229e54b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.6.21322.12">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-preview.6.21322.13">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>b80b435fda5aaceeab6067e5270a656267b4e17c</Sha>
<Sha>15c70cf9d717179af0f1a5f1f670b2ae0229e54b</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.6.21317.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-preview.6.21318.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>2e42461f881f3e821a7290d6dafa0d5e32a93728</Sha>
<Sha>ce7170424b8e46ca2941c82a259fd7edced0ebcb</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.0-preview.6.21317.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.0-preview.6.21322.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>11854a18ebb516bc25e005642cd73fec4a8e8c96</Sha>
<Sha>5bee0ffd87db19c41c1d0033b72f7f925aa12d9a</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21321.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>

14
eng/Versions.props
View file

@ -24,11 +24,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.0-preview.6.21317.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.0-preview.6.21318.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.0-preview.6.21317.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.0-preview.6.21322.1</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@ -57,8 +57,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-preview.6.21322.12</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.6.21322.12</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-preview.6.21322.13</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-preview.6.21322.13</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.6.21317.5</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0-preview.6.21317.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0-preview.6.21317.5</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-preview.6.21322.1</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0-preview.6.21322.1</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0-preview.6.21322.1</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->