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 20211018.1 (#12419)

Browse source 
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21514.16 to 6.0.0-rtm.21517.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21515.5 to 6.0.0-rtm.21517.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21515.3 to 6.0.0-rtm.21517.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
This commit is contained in:
dotnet-maestro[bot] 2021-10-18 08:19:38 +00:00 committed by GitHub
parent f771064a6d
commit dd9ce324ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
eng/Version.Details.xml
View file

@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.0-rtm.21515.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.0-rtm.21517.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>21b37ecbada4c45250565d873b972d3bfd9104e7</Sha>
<Sha>e94662dc8eb09ea9c50f3e132da6014da64a43aa</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-rtm.21515.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.0-rtm.21517.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>21b37ecbada4c45250565d873b972d3bfd9104e7</Sha>
<Sha>e94662dc8eb09ea9c50f3e132da6014da64a43aa</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.0-rtm.21515.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.0-rtm.21517.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>21b37ecbada4c45250565d873b972d3bfd9104e7</Sha>
<Sha>e94662dc8eb09ea9c50f3e132da6014da64a43aa</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-rtm.21515.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.0-rtm.21517.6" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
<Sha>21b37ecbada4c45250565d873b972d3bfd9104e7</Sha>
<Sha>e94662dc8eb09ea9c50f3e132da6014da64a43aa</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.0-rtm.21515.15" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
@ -103,23 +103,23 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>243e70b8bafe63eaf7953c60aef047e7b830c303</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rtm.21517.6">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.100-rtm.21518.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1add14eb935aace8b769996307a974ce1de753b9</Sha>
<Sha>1b4a7c1c66ff47d971a81360a90c08a768a2aeb8</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-rtm.21517.6">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.100-rtm.21518.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>1add14eb935aace8b769996307a974ce1de753b9</Sha>
<Sha>1b4a7c1c66ff47d971a81360a90c08a768a2aeb8</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-rtm.21514.16" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.0-rtm.21517.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>1eab25c83581a91e7c808aed960b0e27cefc54c9</Sha>
<Sha>4f2c62360b84ff6faba86bd3a0f6cd5b7a3ab726</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.0-rtm.21515.3" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.0-rtm.21517.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>ab1debe519b68f533df9f3d3e3ecd2ea20a8378e</Sha>
<Sha>25a68a19de0de45ade5015f0db75aac0092dede6</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.0-beta.21514.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>

16
eng/Versions.props
View file

@ -23,11 +23,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.0-rtm.21514.16</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.0-rtm.21517.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.0-rtm.21515.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.0-rtm.21517.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.100-rtm.21517.6</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-rtm.21517.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.100-rtm.21518.1</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.100-rtm.21518.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -78,10 +78,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-rtm.21515.5</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.0-rtm.21515.5</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0-rtm.21515.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0-rtm.21515.5</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-rtm.21517.6</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.0-rtm.21517.6</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.0-rtm.21517.6</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.0-rtm.21517.6</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->