Skip to content

Commit

Permalink
Merged PR 38391: [internal/release/7.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 7.0.18 to 7.0.18 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.18-servicing.24169.11 to 7.0.18-servicing.24170.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.18-servicing.24169.11 to 7.0.18-servicing.24170.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.18 to 7.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.18-servicing.24164.4 to 7.0.18-servicing.24169.17 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.18 to 7.0.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.18-servicing.24168.10 to 7.0.18-servicing.24169.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**:
- **Date Produced**: March 20, 2024 9:58:17 PM UTC
- **Commit**: 211ad1ab808465ae86733730447bc261f6aaf37a
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.408 to 7.0.408][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.408-servicing.24170.4 to 7.0.408-servicing.24170.14][1]
  - **Microsoft.NET.Sdk**: [from 7.0.408-servicing.24170.4 to 7.0.408-servicing.24170.14][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.408-servicing.24170.4 to 7.0.408-servicing.24170.14][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.18 to 7.0.18][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.18-servicing.24169.11 to 7.0.18-servicing.24170.3][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.18-servicing.24169.11 to 7.0.18-servicing.24170.3][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.18 to 7.0.18][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.18-servicing.24164.4 to 7.0.18-servicing.24169.17][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.18 to 7.0.18][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.18-servicing.24168.10...
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Mar 20, 2024
2 parents 6259421 + 35282d1 commit 03a0111
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 27 deletions.
8 changes: 4 additions & 4 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<add key="darc-int-dotnet-runtime-544c7e6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-544c7e6e/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-f7fb0a3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-f7fb0a3c/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-211ad1a" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-211ad1ab/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-769e147" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-769e1471/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-af494c5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-af494c5c/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 All @@ -49,10 +49,10 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-544c7e6" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-f7fb0a3" value="true" />
<add key="darc-int-dotnet-sdk-211ad1a" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-769e147" value="true" />
<add key="darc-int-dotnet-windowsdesktop-af494c5" 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.-->
Expand Down
34 changes: 17 additions & 17 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="7.0.18" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.18-servicing.24169.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.18-servicing.24170.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.18-servicing.24169.11" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.18-servicing.24170.3" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.18" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>769e1471d5b304a50d0dbaa45d9be58c5764d140</Sha>
<Sha>af494c5c30f33cdb12a68420c4d4a7d791b21ed0</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.18-servicing.24169.14" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -100,29 +100,29 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.408">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>f7fb0a3cab053494319a2379898b06930dfe53df</Sha>
<Sha>211ad1ab808465ae86733730447bc261f6aaf37a</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.408-servicing.24170.4">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.408-servicing.24170.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>f7fb0a3cab053494319a2379898b06930dfe53df</Sha>
<Sha>211ad1ab808465ae86733730447bc261f6aaf37a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.408-servicing.24170.4">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.408-servicing.24170.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>f7fb0a3cab053494319a2379898b06930dfe53df</Sha>
<Sha>211ad1ab808465ae86733730447bc261f6aaf37a</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.408-servicing.24170.4">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.408-servicing.24170.14">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>f7fb0a3cab053494319a2379898b06930dfe53df</Sha>
<Sha>211ad1ab808465ae86733730447bc261f6aaf37a</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.18-servicing.24164.4" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.18-servicing.24169.17" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>825dfb818b455c03681f7215ce60ca304b3456d5</Sha>
<Sha>1a5db9acafb5677490e44ad00d91cfff0dc11ddf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.18-servicing.24168.10" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.18-servicing.24169.14" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>4ee6b308b4cc05cf92d7552cb00f52041a1e4793</Sha>
<Sha>71273b560061b69cef763838282ef085e53a73cb</Sha>
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="12.7.403-beta.23525.1" 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 @@ -37,11 +37,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.18-servicing.24164.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>7.0.18-servicing.24169.17</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.18-servicing.24168.10</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>7.0.18-servicing.24169.14</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
Expand Down Expand Up @@ -70,8 +70,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.408</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.408-servicing.24170.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.408-servicing.24170.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.408-servicing.24170.14</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.408-servicing.24170.14</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand All @@ -96,8 +96,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.18-servicing.24169.11</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.18-servicing.24169.11</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.18-servicing.24170.3</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.18-servicing.24170.3</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.18</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.18</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
Expand Down

0 comments on commit 03a0111

Please sign in to comment.