Skip to content

Commit 7280562

Browse files
vseanreesermsftvseanreesermsft
committed
Merged PR 47590: [internal/release/9.0.2xx] Merge from public
Merge from public release/9.0.2xx to internal/release/9.0.2xx and resolve conflicts if necessary ---- #### AI description (iteration 1) #### PR Classification Merge from public branch to internal release branch. #### PR Summary This pull request updates dependencies and package sources to newer versions. - Updated dependency versions in `/eng/Version.Details.xml`. - Added multiple new package sources in `/NuGet.config`. <!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->
2 parents c91ad80 + 601d9ee commit 7280562

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<add key="darc-int-dotnet-runtime-831d23e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-831d23e5/nuget/v3/index.json" />
5454
<!-- End: Package sources from dotnet-runtime -->
5555
<!-- Begin: Package sources from dotnet-templating -->
56-
<add key="darc-pub-dotnet-templating-8c5b547" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8c5b547a/nuget/v3/index.json" />
56+
<add key="darc-pub-dotnet-templating-1828413" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-18284132/nuget/v3/index.json" />
5757
<!-- End: Package sources from dotnet-templating -->
5858
<!-- Begin: Package sources from dotnet-windowsdesktop -->
5959
<add key="darc-int-dotnet-windowsdesktop-f971ec2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-f971ec24/nuget/v3/index.json" />

‎eng/Version.Details.xml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.201">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>8c5b547aae29264f91da1a90466b050167d7389e</Sha>
6+
<Sha>18284132b745ea1dddd65889bfd45ea97872322e</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.201-servicing.25105.7">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.201-servicing.25111.3">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>8c5b547aae29264f91da1a90466b050167d7389e</Sha>
10+
<Sha>18284132b745ea1dddd65889bfd45ea97872322e</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
13-
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.201-servicing.25105.7">
13+
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.201-servicing.25111.3">
1414
<Uri>https://github.com/dotnet/templating</Uri>
15-
<Sha>8c5b547aae29264f91da1a90466b050167d7389e</Sha>
15+
<Sha>18284132b745ea1dddd65889bfd45ea97872322e</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
1818
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.3">
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25077.4">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
560+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25077.4">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25111.5">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
564+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25077.4">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25111.5">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
568+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25077.4">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25111.5">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
572+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25077.4">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25111.5">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
576+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25077.4">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25111.5">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
580+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25077.4">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25111.5">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
585+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.3">

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@
191191
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
192192
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
193193
<!-- test dependencies -->
194-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.201-servicing.25105.7</MicrosoftTemplateEngineMocksPackageVersion>
194+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.201-servicing.25111.3</MicrosoftTemplateEngineMocksPackageVersion>
195195
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
196196
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
197197
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -268,10 +268,10 @@
268268
</PropertyGroup>
269269
<PropertyGroup>
270270
<!-- Dependencies from https://github.com/dotnet/arcade -->
271-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25077.4</MicrosoftDotNetSignToolVersion>
273-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25077.4</MicrosoftDotNetXliffTasksVersion>
274-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25077.4</MicrosoftDotNetXUnitExtensionsVersion>
271+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25111.5</MicrosoftDotNetSignToolVersion>
273+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25111.5</MicrosoftDotNetXliffTasksVersion>
274+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25111.5</MicrosoftDotNetXUnitExtensionsVersion>
275275
</PropertyGroup>
276276
<PropertyGroup>
277277
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎global.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.102",
3+
"dotnet": "9.0.103",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)