Skip to content

Commit

Permalink
Merged PR 30280: [internal/release/7.0.2xx] 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.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.4 to 7.0.5 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230327.18
- **Date Produced**: March 27, 2023 9:16:58 PM UTC
- **Commit**: e8a9e33
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.203 to 7.0.203][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1]
  - **Microsoft.NET.Sdk**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.203-servicing.23176.4 to 7.0.203-servicing.23177.18][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.4 to 7.0.5][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.4-servicing.23176.2 to 7.0.5-servicing.23177.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.5][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.4 to 7.0.5][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC6791a59d6b&targetVersion=GCe8a9e334c1&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC21bafd4940&targetVersion=GC265ddce1c1&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
  • Loading branch information
@dotnet-bot @mmitche
dotnet-bot authored and mmitche committed Mar 28, 2023
1 parent a17b97b commit 5b005c1
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 25 deletions.
14 changes: 10 additions & 4 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,13 @@
<add key="darc-int-dotnet-runtime-8042d61" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8042d61b/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-6791a59" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-6791a59d/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-e8a9e33" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-e8a9e334/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-e8a9e33-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-e8a9e334-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-sdk-e8a9e33-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-e8a9e334-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-21bafd4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-21bafd49/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-265ddce" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-265ddce1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-265ddce-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-265ddce1-1/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 +52,13 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-8042d61" value="true" />
<!-- Begin: Package sources from dotnet-sdk -->
<add key="darc-int-dotnet-sdk-6791a59" value="true" />
<add key="darc-int-dotnet-sdk-e8a9e33-1" value="true" />
<add key="darc-int-dotnet-sdk-e8a9e33-2" value="true" />
<add key="darc-int-dotnet-sdk-e8a9e33" value="true" />
<!-- End: Package sources from dotnet-sdk -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-21bafd4" value="true" />
<add key="darc-int-dotnet-windowsdesktop-265ddce-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-265ddce" 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
30 changes: 15 additions & 15 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="7.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>21bafd49406659961eaf4853853d1b4a4e669654</Sha>
<Sha>265ddce1c1939672e1223e750544bb0443a8f74b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.4-servicing.23176.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0" Version="7.0.5-servicing.23177.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>21bafd49406659961eaf4853853d1b4a4e669654</Sha>
<Sha>265ddce1c1939672e1223e750544bb0443a8f74b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.4-servicing.23176.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0" Version="7.0.5-servicing.23177.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>21bafd49406659961eaf4853853d1b4a4e669654</Sha>
<Sha>265ddce1c1939672e1223e750544bb0443a8f74b</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="7.0.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop</Uri>
<Sha>21bafd49406659961eaf4853853d1b4a4e669654</Sha>
<Sha>265ddce1c1939672e1223e750544bb0443a8f74b</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.5-servicing.23174.5" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -100,20 +100,20 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="7.0.203">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>6791a59d6bb0085576413fde227dcb163572b762</Sha>
<Sha>e8a9e334c151df38ce00d696d54f52d4f0c65989</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.203-servicing.23176.4">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="7.0.203-servicing.23177.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>6791a59d6bb0085576413fde227dcb163572b762</Sha>
<Sha>e8a9e334c151df38ce00d696d54f52d4f0c65989</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.203-servicing.23176.4">
<Dependency Name="Microsoft.NET.Sdk" Version="7.0.203-servicing.23177.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>6791a59d6bb0085576413fde227dcb163572b762</Sha>
<Sha>e8a9e334c151df38ce00d696d54f52d4f0c65989</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.203-servicing.23176.4">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="7.0.203-servicing.23177.18">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>6791a59d6bb0085576413fde227dcb163572b762</Sha>
<Sha>e8a9e334c151df38ce00d696d54f52d4f0c65989</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.5-servicing.23175.1" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
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 @@ -70,8 +70,8 @@
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>7.0.203</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.203-servicing.23176.4</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.203-servicing.23176.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>7.0.203-servicing.23177.18</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>7.0.203-servicing.23177.18</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand All @@ -92,10 +92,10 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.4-servicing.23176.2</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.4-servicing.23176.2</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.4</MicrosoftWindowsDesktopAppRefPackageVersion>
<VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>7.0.5-servicing.23177.5</VSRedistCommonWindowsDesktopSharedFrameworkx6470PackageVersion>
<VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>7.0.5-servicing.23177.5</VSRedistCommonWindowsDesktopTargetingPackx6470PackageVersion>
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>7.0.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
<MicrosoftWindowsDesktopAppRefPackageVersion>7.0.5</MicrosoftWindowsDesktopAppRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 -->
Expand Down

0 comments on commit 5b005c1

Please sign in to comment.