Skip to content

Commit bb3627c

Browse files
author
Jason Zhai
committed
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into darc-release/9.0.2xx-d92361ab-9328-4a86-9848-e735132dd000
2 parents 2ca62af + b79f92e commit bb3627c

File tree

125 files changed

+6560
-31
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+6560
-31
lines changed

‎NuGet.config

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@
3636
<!-- End: Package sources from dotnet-runtime -->
3737
<!-- Begin: Package sources from dotnet-templating -->
3838
<add key="darc-pub-dotnet-templating-8cc88f9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8cc88f99/nuget/v3/index.json" />
39+
<add key="darc-pub-dotnet-templating-8cc88f9-8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8cc88f99-8/nuget/v3/index.json" />
40+
<add key="darc-pub-dotnet-templating-8cc88f9-7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8cc88f99-7/nuget/v3/index.json" />
41+
<add key="darc-pub-dotnet-templating-8cc88f9-6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8cc88f99-6/nuget/v3/index.json" />
42+
<add key="darc-pub-dotnet-templating-8cc88f9-5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8cc88f99-5/nuget/v3/index.json" />
43+
<add key="darc-pub-dotnet-templating-8cc88f9-4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8cc88f99-4/nuget/v3/index.json" />
44+
<add key="darc-pub-dotnet-templating-8cc88f9-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8cc88f99-3/nuget/v3/index.json" />
3945
<add key="darc-pub-dotnet-templating-8cc88f9-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8cc88f99-2/nuget/v3/index.json" />
4046
<add key="darc-pub-dotnet-templating-8cc88f9-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8cc88f99-1/nuget/v3/index.json" />
4147
<!-- End: Package sources from dotnet-templating -->

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -321,20 +321,20 @@
321321
<Sha>d5dc8a13cc618b9cbdc1e5744b4806c594d49553</Sha>
322322
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
323323
</Dependency>
324-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25175.7">
324+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25256.4">
325325
<Uri>https://github.com/dotnet/razor</Uri>
326326
<Sha>4b389085ef5cc73e1000acfd196458d75bdd8c89</Sha>
327327
</Dependency>
328-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25175.7">
328+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25256.4">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330330
<Sha>4b389085ef5cc73e1000acfd196458d75bdd8c89</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25175.7">
332+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25256.4">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334334
<Sha>4b389085ef5cc73e1000acfd196458d75bdd8c89</Sha>
335335
</Dependency>
336336
<!-- Intermediate is necessary for source build. -->
337-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25175.7">
337+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25256.4">
338338
<Uri>https://github.com/dotnet/razor</Uri>
339339
<Sha>4b389085ef5cc73e1000acfd196458d75bdd8c89</Sha>
340340
<SourceBuild RepoName="razor" ManagedOnly="true" />
@@ -555,34 +555,34 @@
555555
</Dependency>
556556
</ProductDependencies>
557557
<ToolsetDependencies>
558-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25208.6">
558+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25255.5">
559559
<Uri>https://github.com/dotnet/arcade</Uri>
560-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
560+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
561561
</Dependency>
562-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25208.6">
562+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25255.5">
563563
<Uri>https://github.com/dotnet/arcade</Uri>
564-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
564+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
565565
</Dependency>
566-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25208.6">
566+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25255.5">
567567
<Uri>https://github.com/dotnet/arcade</Uri>
568-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
568+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
569569
</Dependency>
570-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25208.6">
570+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25255.5">
571571
<Uri>https://github.com/dotnet/arcade</Uri>
572-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
572+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
573573
</Dependency>
574-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25208.6">
574+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25255.5">
575575
<Uri>https://github.com/dotnet/arcade</Uri>
576-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
576+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
577577
</Dependency>
578-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25208.6">
578+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25255.5">
579579
<Uri>https://github.com/dotnet/arcade</Uri>
580-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
580+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
581581
</Dependency>
582582
<!-- Intermediate is necessary for source build. -->
583-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25208.6">
583+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25255.5">
584584
<Uri>https://github.com/dotnet/arcade</Uri>
585-
<Sha>aa61e8c20a869bcc994f8b29eb07d927d2bec6f4</Sha>
585+
<Sha>1cfa39f82d00b3659a3d367bc344241946e10681</Sha>
586586
<SourceBuild RepoName="arcade" ManagedOnly="true" />
587587
</Dependency>
588588
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.4">

‎eng/Versions.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<VersionMajor>9</VersionMajor>
77
<VersionMinor>0</VersionMinor>
88
<VersionSDKMinor>2</VersionSDKMinor>
9-
<VersionFeature>04</VersionFeature>
9+
<VersionFeature>05</VersionFeature>
1010
<!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
1111
It should always be the hundreds-value of the current SDK version, never any
1212
preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -229,9 +229,9 @@
229229
</PropertyGroup>
230230
<PropertyGroup>
231231
<!-- Dependencies from https://github.com/dotnet/razor -->
232-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25175.7</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
233-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25175.7</MicrosoftCodeAnalysisRazorToolingInternalVersion>
234-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25175.7</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
232+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25256.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
233+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25256.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
234+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25256.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -268,10 +268,10 @@
268268
</PropertyGroup>
269269
<PropertyGroup>
270270
<!-- Dependencies from https://github.com/dotnet/arcade -->
271-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25208.6</MicrosoftDotNetSignToolVersion>
273-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25208.6</MicrosoftDotNetXliffTasksVersion>
274-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25208.6</MicrosoftDotNetXUnitExtensionsVersion>
271+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25255.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
272+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25255.5</MicrosoftDotNetSignToolVersion>
273+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25255.5</MicrosoftDotNetXliffTasksVersion>
274+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25255.5</MicrosoftDotNetXUnitExtensionsVersion>
275275
</PropertyGroup>
276276
<PropertyGroup>
277277
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎eng/common/core-templates/job/source-build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ parameters:
2626
# Specifies the build script to invoke to perform the build in the repo. The default
2727
# './build.sh' should work for typical Arcade repositories, but this is customizable for
2828
# difficult situations.
29+
# buildArguments: ''
30+
# Specifies additional build arguments to pass to the build script.
2931
# jobProperties: {}
3032
# A list of job properties to inject at the top level, for potential extensibility beyond
3133
# container and pool.

‎eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
runAsPublic: false
3-
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
4-
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
3+
sourceIndexUploadPackageVersion: 2.0.0-20250425.2
4+
sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2
55
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
66
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
77
preSteps: []

‎eng/common/core-templates/steps/source-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ steps:
7979
${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \
8080
--configuration $buildConfig \
8181
--restore --build --pack $publishArgs -bl \
82+
${{ parameters.platform.buildArguments }} \
8283
$officialBuildArgs \
8384
$internalRuntimeDownloadArgs \
8485
$internalRestoreArgs \

‎eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
44
</packages>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25208.6",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25255.5",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/arcade/eng/common/BuildConfiguration/build-configuration.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"RetryCountLimit": 1,
3+
"RetryByAnyError": false
4+
}

‎src/arcade/eng/common/PSScriptAnalyzerSettings.psd1

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
@{
2+
IncludeRules=@('PSAvoidUsingCmdletAliases',
3+
'PSAvoidUsingWMICmdlet',
4+
'PSAvoidUsingPositionalParameters',
5+
'PSAvoidUsingInvokeExpression',
6+
'PSUseDeclaredVarsMoreThanAssignments',
7+
'PSUseCmdletCorrectly',
8+
'PSStandardDSCFunctionsInResource',
9+
'PSUseIdenticalMandatoryParametersForDSC',
10+
'PSUseIdenticalParametersForDSC')
11+
}

0 commit comments

Comments
 (0)