Skip to content

Commit

Permalink
Merged PR 38480: [internal/release/6.0.4xx] Update dependencies from …
Browse files Browse the repository at this point in the history 
…dnceng/internal/dotnet-sdk

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 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**:
- **Date Produced**: March 22, 2024 4:35:16 PM UTC
- **Commit**: e35ea426ec2ee54f57501b661ec7d656caf480d6
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24171.14 to 6.0.421-servicing.24172.16][1]
  - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24171.14 to 6.0.421-servicing.24172.16][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.29 to 6.0.29][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.29-servicing.24169.15 to 6.0.29-servicing.24171.6][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6f9b73911c7a5bd447666c341acc4fffe64635b5&targetVersion=GCe35ea4...
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Mar 22, 2024
1 parent 3d530de commit 04f2754
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<add key="darc-int-dotnet-templating-9ebb8d1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-9ebb8d1d/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-0692302" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-0692302e/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-75c9b26" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-75c9b263/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" />
Expand Down Expand Up @@ -51,7 +51,7 @@
<add key="darc-int-dotnet-templating-9ebb8d1" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-0692302" value="true" />
<add key="darc-int-dotnet-windowsdesktop-75c9b26" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<!-- End: Package sources from dotnet-windowsdesktop -->
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>0692302e909ffbc02bca94378eab9213ba3f4455</Sha>
<Sha>75c9b26383d5e6908e8b07d68d134f115c696324</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.29-servicing.24169.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0" Version="6.0.29-servicing.24171.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>0692302e909ffbc02bca94378eab9213ba3f4455</Sha>
<Sha>75c9b26383d5e6908e8b07d68d134f115c696324</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.29-servicing.24169.26" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0" Version="6.0.29-servicing.24171.9" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>0692302e909ffbc02bca94378eab9213ba3f4455</Sha>
<Sha>75c9b26383d5e6908e8b07d68d134f115c696324</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="6.0.29" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>0692302e909ffbc02bca94378eab9213ba3f4455</Sha>
<Sha>75c9b26383d5e6908e8b07d68d134f115c696324</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.29-servicing.24171.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -103,23 +103,23 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>9ebb8d1d13e5672c54d1682cdc82eb5f474b9586</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.421-servicing.24171.14">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.421-servicing.24172.16">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>6f9b73911c7a5bd447666c341acc4fffe64635b5</Sha>
<Sha>e35ea426ec2ee54f57501b661ec7d656caf480d6</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.421-servicing.24171.14">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.421-servicing.24172.16">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>6f9b73911c7a5bd447666c341acc4fffe64635b5</Sha>
<Sha>e35ea426ec2ee54f57501b661ec7d656caf480d6</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.29-servicing.24169.15" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.29-servicing.24171.6" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>8b4de777b2ddf7e0f4a06dec30bbc152315fdef8</Sha>
<Sha>6525c5174ef1b8ee5b29c397e8a4b76e76487927</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.29-servicing.24169.12" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.29-servicing.24171.7" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>f3f959782e4e407301c19cd90dc0d1da329425bf</Sha>
<Sha>6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.0.5-beta.22513.8" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/fsharp</Uri>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.29-servicing.24169.15</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>6.0.29-servicing.24171.6</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.29-servicing.24169.12</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>6.0.29-servicing.24171.7</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
Expand Down Expand Up @@ -56,8 +56,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.421-servicing.24171.14</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.421-servicing.24171.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.421-servicing.24172.16</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.421-servicing.24172.16</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand All @@ -78,8 +78,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.29-servicing.24169.26</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.29-servicing.24169.26</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.29-servicing.24171.9</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>6.0.29-servicing.24171.9</VSRedistCommonWindowsDesktopTargetingPackx6460PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>6.0.29</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>6.0.29</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
Expand Down

0 comments on commit 04f2754

Please sign in to comment.