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

Merged PR 26897: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk

Browse source 
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20221019.13
- **Date Produced**: October 19, 2022 5:31:15 PM UTC
- **Commit**: f1a8727d38b1e5f2795ed86ec2692edeaa35b042
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.100 to 7.0.100][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1]
  - **Microsoft.NET.Sdk**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.100-rtm.22519.9 to 7.0.100-rtm.22519.13][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.0 to 7.0.0][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22519.1][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.0 to 7.0.0][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8f23e14&targetVersion=GCf1a8727&_a=fil...
This commit is contained in:
DotNet Bot 2022-10-19 18:13:51 +00:00 • committed by Matt Mitchell
parent d127e47bd0
commit 74ab822fa8
3 changed files with 27 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
NuGet.config
View file

@ -20,11 +20,10 @@
<add key="darc-int-dotnet-runtime-d099f07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d099f075/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-8f23e14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-8f23e140/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-f1a8727" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f1a8727d/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-6bcf305" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6bcf3052/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-6bcf305-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-6bcf3052-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-417429f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-417429fc/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@ -51,11 +50,10 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-d099f07" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-8f23e14" value="true" />
<add key="darc-int-dotnet-sdk-f1a8727" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-6bcf305-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-6bcf305" value="true" />
<add key="darc-int-dotnet-windowsdesktop-417429f" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

34
eng/Version.Details.xml
View file

@ -3,19 +3,19 @@
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>6bcf305203796b050f9370b14fd305d7f864c7b8</Sha>
<Sha>417429fc040af552532bb07aad29e5e8639b840f</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-rtm.22517.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.0-rtm.22519.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>6bcf305203796b050f9370b14fd305d7f864c7b8</Sha>
<Sha>417429fc040af552532bb07aad29e5e8639b840f</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-rtm.22517.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.0-rtm.22519.1" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>6bcf305203796b050f9370b14fd305d7f864c7b8</Sha>
<Sha>417429fc040af552532bb07aad29e5e8639b840f</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.0" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>6bcf305203796b050f9370b14fd305d7f864c7b8</Sha>
<Sha>417429fc040af552532bb07aad29e5e8639b840f</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22518.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@ -100,29 +100,29 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.100">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8f23e1401dbb16272293b3cbb7af91d3b775bf75</Sha>
<Sha>f1a8727d38b1e5f2795ed86ec2692edeaa35b042</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rtm.22519.9">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.100-rtm.22519.13">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8f23e1401dbb16272293b3cbb7af91d3b775bf75</Sha>
<Sha>f1a8727d38b1e5f2795ed86ec2692edeaa35b042</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rtm.22519.9">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.100-rtm.22519.13">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8f23e1401dbb16272293b3cbb7af91d3b775bf75</Sha>
<Sha>f1a8727d38b1e5f2795ed86ec2692edeaa35b042</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rtm.22519.9">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.100-rtm.22519.13">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8f23e1401dbb16272293b3cbb7af91d3b775bf75</Sha>
<Sha>f1a8727d38b1e5f2795ed86ec2692edeaa35b042</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-rtm.22517.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-rtm.22518.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>77b444d039791bf7acf4869f99de695b28d7d6ef</Sha>
<Sha>e83409daa530605da4eb5f847c6740a520325d25</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-rtm.22517.5" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-rtm.22518.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>d8beab3a71f4dab53451bf194f6da7e09dbb43ef</Sha>
<Sha>636e2b7a00a434a354a126f510a56e16ce3c6bbc</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.4.0-beta.22513.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>

12
eng/Versions.props
View file

@ -31,11 +31,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-rtm.22517.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.0-rtm.22518.7</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-rtm.22517.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.0-rtm.22518.2</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
@ -64,8 +64,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.100</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-rtm.22519.9</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rtm.22519.9</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.100-rtm.22519.13</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.100-rtm.22519.13</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
@ -86,8 +86,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-rtm.22517.5</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-rtm.22517.5</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.0-rtm.22519.1</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.0-rtm.22519.1</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.0</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.0</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>