Skip to content

Commit

Permalink
Merged PR 43922: [internal/release/6.0.4xx] Update dependencies from …
Browse files Browse the repository at this point in the history
…4 repositories

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.NET.Sdk.WindowsDesktop**: from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:388a1e54-5d88-4052-3024-08da65ba4584)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 388a1e54-5d88-4052-3024-08da65ba4584
- **Build**: 20241017.2
- **Date Produced**: October 17, 2024 7:13:08 PM UTC
- **Commit**: 320a638db589cc9b24e3e5217d7ca34df840104a
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.35 to 6.0.36][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.35 to 6.0.36][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24463.5 to 6.0.36-servicing.24517.2][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.35-servicing.24463.5 to 6.0.36-servicing.24517.2][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.3][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCfc5b097885ceb7463eb7163477356a39a359846f&targetVersion=GC320a638db589cc9b24e3e5217d7ca34df840104a&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCc9e44425226553e639116ff82698cfd2808f7769&targetVersion=GCa7dff252f2a6b0ff48ffe946a20584f61282aa13&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:388a1e54-5d88-4052-3024-08da65ba4584)

[marker]: <> (Begin:1963f8a1-5df7-4929-7e1e-08da65ba3032)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1963f8a1-5df7-4929-7e1e-08da65ba3032
- **Build**: 20241016.4
- **Date Produced**: October 16, 2024 6:06:03 PM UTC
- **Commit**: 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.4][3]
  - **dotnet-user-secrets**: [from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.4][3]
  - **Microsoft.AspNetCore.Analyzers**: [from 6.0.35-servicing.24462.14 to 6.0.36-servicing.24516.4][3]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.35 to 6.0.36][3]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from...
  • Loading branch information
maestro-prod-Primary authored and vseanreesermsft committed Oct 17, 2024
2 parents a8897e8 + 11a28dd commit ed841ed
Show file tree
Hide file tree
Showing 3 changed files with 101 additions and 121 deletions.
36 changes: 8 additions & 28 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,21 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-827b960" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-827b960-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-827b960-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-827b960-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-827b9604-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-64ea410" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-64ea4108/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-roslyn-analyzers -->
<!-- End: Package sources from dotnet-roslyn-analyzers -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-b357f86-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-f1dd571" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f1dd5716/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-7de8a28" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7de8a286/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-7de8a28-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7de8a286-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-7de8a28-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7de8a286-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-7de8a28-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7de8a286-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-7a8644f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-7a8644f1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-fc5b0978-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-320a638" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-320a638d/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="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
Expand All @@ -48,26 +38,16 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-7de8a28-1" value="true" />
<add key="darc-int-dotnet-templating-7de8a28-2" value="true" />
<add key="darc-int-dotnet-templating-7de8a28-3" value="true" />
<add key="darc-int-dotnet-templating-7de8a28" value="true" />
<add key="darc-int-dotnet-templating-7a8644f" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-827b960-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-827b960-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-827b960-3" value="true" />
<add key="darc-int-dotnet-aspnetcore-827b960" value="true" />
<add key="darc-int-dotnet-aspnetcore-64ea410" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-b357f86-2" value="true" />
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
<add key="darc-int-dotnet-runtime-f1dd571" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-fc5b097-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097-3" value="true" />
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
<add key="darc-int-dotnet-windowsdesktop-320a638" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
Loading

0 comments on commit ed841ed

Please sign in to comment.