Skip to content

Commit 873b736

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.3xx' of https://github.com/dotnet/sdk into merge/release/9.0.1xx-to-release/9.0.3xx
2 parents 46b4ef2 + 62e86e2 commit 873b736

File tree

4 files changed

+40
-26
lines changed

4 files changed

+40
-26
lines changed

‎NuGet.config

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@
2525
<!-- End: Package sources from dotnet-aspire -->
2626
<!-- Begin: Package sources from dotnet-aspnetcore -->
2727
<add key="darc-int-dotnet-aspnetcore-215a587" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-215a587e/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-aspnetcore-215a587-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-215a587e-2/nuget/v3/index.json" />
29+
<add key="darc-int-dotnet-aspnetcore-215a587-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-215a587e-1/nuget/v3/index.json" />
2830
<!-- End: Package sources from dotnet-aspnetcore -->
2931
<!-- Begin: Package sources from dotnet-emsdk -->
3032
<add key="darc-pub-dotnet-emsdk-0bcc3e6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67/nuget/v3/index.json" />
33+
<add key="darc-pub-dotnet-emsdk-0bcc3e6-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67-3/nuget/v3/index.json" />
34+
<add key="darc-pub-dotnet-emsdk-0bcc3e6-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67-2/nuget/v3/index.json" />
3135
<add key="darc-pub-dotnet-emsdk-0bcc3e6-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-0bcc3e67-1/nuget/v3/index.json" />
3236
<!-- End: Package sources from dotnet-emsdk -->
3337
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
@@ -37,12 +41,16 @@
3741
<!-- End: Package sources from dotnet-roslyn-analyzers -->
3842
<!-- Begin: Package sources from dotnet-runtime -->
3943
<add key="darc-int-dotnet-runtime-aae90fa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0/nuget/v3/index.json" />
44+
<add key="darc-int-dotnet-runtime-aae90fa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-2/nuget/v3/index.json" />
45+
<add key="darc-int-dotnet-runtime-aae90fa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-aae90fa0-1/nuget/v3/index.json" />
4046
<!-- End: Package sources from dotnet-runtime -->
4147
<!-- Begin: Package sources from dotnet-templating -->
42-
<add key="darc-pub-dotnet-templating-8f75dca" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8f75dca0/nuget/v3/index.json" />
48+
<add key="darc-pub-dotnet-templating-53394f7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-53394f71/nuget/v3/index.json" />
4349
<!-- End: Package sources from dotnet-templating -->
4450
<!-- Begin: Package sources from dotnet-windowsdesktop -->
4551
<add key="darc-int-dotnet-windowsdesktop-1d6033e" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3/nuget/v3/index.json" />
52+
<add key="darc-int-dotnet-windowsdesktop-1d6033e-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3-2/nuget/v3/index.json" />
53+
<add key="darc-int-dotnet-windowsdesktop-1d6033e-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-1d6033e3-1/nuget/v3/index.json" />
4654
<!-- End: Package sources from dotnet-windowsdesktop -->
4755
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4856
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -73,12 +81,18 @@
7381
<!-- Begin: Package sources from dotnet-templating -->
7482
<!-- End: Package sources from dotnet-templating -->
7583
<!-- Begin: Package sources from dotnet-aspnetcore -->
84+
<add key="darc-int-dotnet-aspnetcore-215a587-1" value="true" />
85+
<add key="darc-int-dotnet-aspnetcore-215a587-2" value="true" />
7686
<add key="darc-int-dotnet-aspnetcore-215a587" value="true" />
7787
<!-- End: Package sources from dotnet-aspnetcore -->
7888
<!-- Begin: Package sources from dotnet-runtime -->
89+
<add key="darc-int-dotnet-runtime-aae90fa-1" value="true" />
90+
<add key="darc-int-dotnet-runtime-aae90fa-2" value="true" />
7991
<add key="darc-int-dotnet-runtime-aae90fa" value="true" />
8092
<!-- End: Package sources from dotnet-runtime -->
8193
<!-- Begin: Package sources from dotnet-windowsdesktop -->
94+
<add key="darc-int-dotnet-windowsdesktop-1d6033e-1" value="true" />
95+
<add key="darc-int-dotnet-windowsdesktop-1d6033e-2" value="true" />
8296
<add key="darc-int-dotnet-windowsdesktop-1d6033e" value="true" />
8397
<!-- End: Package sources from dotnet-windowsdesktop -->
8498
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<ProductDependencies>
44
<Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="9.0.305">
55
<Uri>https://github.com/dotnet/templating</Uri>
6-
<Sha>8f75dca081e1ebd54bbc0d1ae57fc3d6b7172ec9</Sha>
6+
<Sha>53394f71a3061f4a0aa1c1197026d65b3efe308b</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.305-servicing.25406.4">
8+
<Dependency Name="Microsoft.TemplateEngine.Mocks" Version="9.0.305-servicing.25407.8">
99
<Uri>https://github.com/dotnet/templating</Uri>
10-
<Sha>8f75dca081e1ebd54bbc0d1ae57fc3d6b7172ec9</Sha>
10+
<Sha>53394f71a3061f4a0aa1c1197026d65b3efe308b</Sha>
1111
</Dependency>
1212
<!-- Intermediate is necessary for source build. -->
1313
<Dependency Name="Microsoft.SourceBuild.Intermediate.templating" Version="9.0.300-preview.25209.5">
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25406.1">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25407.2">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
560+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25406.1">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25407.2">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
564+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25406.1">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25407.2">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
568+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25406.1">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25407.2">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
572+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25406.1">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25407.2">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
576+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25406.1">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25407.2">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
580+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25406.1">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25407.2">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>cfad7219713eb776273d540fa1b65f1662fdf241</Sha>
585+
<Sha>e29823691315ed6b3acff20d5bdf3b0be7628283</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.8">

‎eng/Versions.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
196196
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
197197
<!-- test dependencies -->
198-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.305-servicing.25406.4</MicrosoftTemplateEngineMocksPackageVersion>
198+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.305-servicing.25407.8</MicrosoftTemplateEngineMocksPackageVersion>
199199
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
200200
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
201201
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -272,10 +272,10 @@
272272
</PropertyGroup>
273273
<PropertyGroup>
274274
<!-- Dependencies from https://github.com/dotnet/arcade -->
275-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25406.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25406.1</MicrosoftDotNetSignToolVersion>
277-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25406.1</MicrosoftDotNetXliffTasksVersion>
278-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25406.1</MicrosoftDotNetXUnitExtensionsVersion>
275+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25407.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
276+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25407.2</MicrosoftDotNetSignToolVersion>
277+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25407.2</MicrosoftDotNetXliffTasksVersion>
278+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25407.2</MicrosoftDotNetXUnitExtensionsVersion>
279279
</PropertyGroup>
280280
<PropertyGroup>
281281
<!-- 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.107",
3+
"dotnet": "9.0.109",
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.25406.1",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25406.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25407.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

0 commit comments

Comments
 (0)