Skip to content

Commit

Permalink
Merged PR 39289: [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.DotNet.Common.ItemTemplates**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk)

[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**: 20240429.15
- **Date Produced**: April 29, 2024 10:47:36 PM UTC
- **Commit**: b47e9d314726020921851f007797b479a5f6905e
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1]
  - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8cf6c33a08b323b46d298b83937a623059638611&targetVersion=GCb47e9d314726020921851f007797b479a5f6905e&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&targetVersion=GC086db5520af132ac32dcf8cce8ad4d561b868363&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Apr 29, 2024
1 parent 9efa2d1 commit ae2bd4e
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 12 deletions.
18 changes: 16 additions & 2 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,29 @@
<!--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-1d69605" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1d696053/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-1d69605-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1d696053-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-aspnetcore-1d69605-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-1d696053-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-3b28b2c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3b28b2c8/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-3b28b2c-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3b28b2c8-2/nuget/v3/index.json" />
<add key="darc-pub-dotnet-emsdk-3b28b2c-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3b28b2c8-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- 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-runtime -->
<add key="darc-int-dotnet-runtime-97d8f4c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-97d8f4c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-97d8f4c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-97d8f4ca-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-effe0d0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-effe0d00/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-086db55" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-086db552/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d0dfc31" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-d0dfc311-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 @@ -43,15 +51,21 @@
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
<!-- End: Package sources from DotNet-msbuild-Trusted -->
<!-- Begin: Package sources from dotnet-aspnetcore -->
<add key="darc-int-dotnet-aspnetcore-1d69605-1" value="true" />
<add key="darc-int-dotnet-aspnetcore-1d69605-2" value="true" />
<add key="darc-int-dotnet-aspnetcore-1d69605" value="true" />
<!-- End: Package sources from dotnet-aspnetcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-97d8f4c-1" value="true" />
<add key="darc-int-dotnet-runtime-97d8f4c-2" value="true" />
<add key="darc-int-dotnet-runtime-97d8f4c" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-effe0d0" value="true" />
<add key="darc-int-dotnet-templating-086db55" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-1" value="true" />
<add key="darc-int-dotnet-windowsdesktop-d0dfc31-2" value="true" />
<add key="darc-int-dotnet-windowsdesktop-d0dfc31" value="true" />
<!-- End: Package sources from dotnet-windowsdesktop -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
Expand Down
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,25 @@
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.422" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>effe0d00ab994d57a5e1334667dec144f9f2a9e9</Sha>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.422-rtm.24219.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.422-rtm.24229.7" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>effe0d00ab994d57a5e1334667dec144f9f2a9e9</Sha>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.422" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>effe0d00ab994d57a5e1334667dec144f9f2a9e9</Sha>
<Sha>086db5520af132ac32dcf8cce8ad4d561b868363</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.422-servicing.24219.30">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.422-servicing.24229.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8cf6c33a08b323b46d298b83937a623059638611</Sha>
<Sha>b47e9d314726020921851f007797b479a5f6905e</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.422-servicing.24219.30">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.422-servicing.24229.15">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>8cf6c33a08b323b46d298b83937a623059638611</Sha>
<Sha>b47e9d314726020921851f007797b479a5f6905e</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.30-servicing.24216.19" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down
4 changes: 2 additions & 2 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.422-servicing.24219.30</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.422-servicing.24219.30</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.422-servicing.24229.15</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.422-servicing.24229.15</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down

0 comments on commit ae2bd4e

Please sign in to comment.