Skip to content

Commit

Permalink
Merged PR 42876: [internal/release/6.0.1xx] 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.133 to 6.0.135 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.133-servicing.24417.2 to 6.0.135-servicing.24466.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.133 to 6.0.135 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20240916.24
- **Date Produced**: September 16, 2024 10:45:48 PM UTC
- **Commit**: 954f381d16c2d44b573890786ca2d071c217a433
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.135-servicing.24466.15 to 6.0.135-servicing.24466.24][3]
  - **Microsoft.NET.Sdk**: [from 6.0.135-servicing.24466.15 to 6.0.135-servicing.24466.24][3]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105&targetVersion=GC954f381d16c2d44b573890786ca2d071c217a433&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
  • Loading branch information
@vseanreesermsft
maestro-prod-Primary authored and vseanreesermsft committed Sep 17, 2024
2 parents 38da01b + 817d9ca commit 9b2a203
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 26 deletions.
14 changes: 2 additions & 12 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@
<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" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-b66746d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-b66746d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-5/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-b66746d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-4/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-b66746d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-b66746d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-b66746d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-b66746dd-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-templating-1e5db13" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-1e5db134/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" />
Expand Down Expand Up @@ -55,12 +50,7 @@
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
<!-- Begin: Package sources from dotnet-templating -->
<add key="darc-int-dotnet-templating-b66746d-1" value="true" />
<add key="darc-int-dotnet-templating-b66746d-2" value="true" />
<add key="darc-int-dotnet-templating-b66746d-3" value="true" />
<add key="darc-int-dotnet-templating-b66746d-4" value="true" />
<add key="darc-int-dotnet-templating-b66746d-5" value="true" />
<add key="darc-int-dotnet-templating-b66746d" value="true" />
<add key="darc-int-dotnet-templating-1e5db13" value="true" />
<!-- End: Package sources from dotnet-templating -->
<!-- Begin: Package sources from dotnet-windowsdesktop -->
<add key="darc-int-dotnet-windowsdesktop-fc5b097" value="true" />
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,27 +90,27 @@
<Sha>c40ef7e056b48e011c43a21354d6790ba6b8b4fc</Sha>
<SourceBuild RepoName="test-templates" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.133" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="6.0.135" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>b66746dd945089102c4932375063d67616bea606</Sha>
<Sha>1e5db134e25b38b223858e7dd497f9f8a9312f4e</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.133-servicing.24417.2" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.TemplateEngine.Cli" Version="6.0.135-servicing.24466.4" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>b66746dd945089102c4932375063d67616bea606</Sha>
<Sha>1e5db134e25b38b223858e7dd497f9f8a9312f4e</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.133" CoherentParentDependency="Microsoft.NET.Sdk">
<Dependency Name="Microsoft.DotNet.Common.ProjectTemplates.6.0" Version="6.0.135" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
<Sha>b66746dd945089102c4932375063d67616bea606</Sha>
<Sha>1e5db134e25b38b223858e7dd497f9f8a9312f4e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.135-servicing.24463.32">
<Dependency Name="Microsoft.NET.Sdk" Version="6.0.135-servicing.24466.24">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>040861c1545b11ae75ad0a86c40af20239913b49</Sha>
<Sha>954f381d16c2d44b573890786ca2d071c217a433</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.135-servicing.24463.32">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="6.0.135-servicing.24466.24">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-sdk</Uri>
<Sha>040861c1545b11ae75ad0a86c40af20239913b49</Sha>
<Sha>954f381d16c2d44b573890786ca2d071c217a433</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.35-servicing.24462.9" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/templating -->
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.133</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>6.0.135</MicrosoftDotNetCommonItemTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/test-templates -->
Expand All @@ -55,8 +55,8 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk -->
<MicrosoftNETSdkPackageVersion>6.0.135-servicing.24463.32</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.135-servicing.24463.32</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETSdkPackageVersion>6.0.135-servicing.24466.24</MicrosoftNETSdkPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>6.0.135-servicing.24466.24</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetTemplateLocatorPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetTemplateLocatorPackageVersion>
Expand Down Expand Up @@ -115,7 +115,7 @@
<MicrosoftDotNetWpfProjectTemplates60PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates60PackageVersion>
<NUnit3Templates60PackageVersion>$(NUnit3DotNetNewTemplatePackageVersion)</NUnit3Templates60PackageVersion>
<MicrosoftDotNetCommonItemTemplates60PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonItemTemplates60PackageVersion>
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.133</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<MicrosoftDotNetCommonProjectTemplates60PackageVersion>6.0.135</MicrosoftDotNetCommonProjectTemplates60PackageVersion>
<AspNetCorePackageVersionFor60Templates>$(MicrosoftAspNetCoreAppRuntimePackageVersion)</AspNetCorePackageVersionFor60Templates>
</PropertyGroup>
<!-- infrastructure and test only dependencies -->
Expand Down

0 comments on commit 9b2a203

Please sign in to comment.