Skip to content

Commit f2cb25a

Browse files
author
Simon Zhao (BEYONDSOFT CONSULTING INC)
committed
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into darc-release/9.0.1xx-49d6e044-8aa2-46ec-bfea-74ec52d84aa7
2 parents bf153aa + 8bc37c8 commit f2cb25a

File tree

8 files changed

+41
-34
lines changed

8 files changed

+41
-34
lines changed

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -325,20 +325,20 @@
325325
<Sha>f6b3a5da75eb405046889a5447ec9b14cc29d285</Sha>
326326
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
327327
</Dependency>
328-
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25275.1">
328+
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25329.4">
329329
<Uri>https://github.com/dotnet/razor</Uri>
330330
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25275.1">
332+
<Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="9.0.0-preview.25329.4">
333333
<Uri>https://github.com/dotnet/razor</Uri>
334334
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
335335
</Dependency>
336-
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25275.1">
336+
<Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="9.0.0-preview.25329.4">
337337
<Uri>https://github.com/dotnet/razor</Uri>
338338
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
339339
</Dependency>
340340
<!-- Intermediate is necessary for source build. -->
341-
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25275.1">
341+
<Dependency Name="Microsoft.SourceBuild.Intermediate.razor" Version="9.0.0-preview.25329.4">
342342
<Uri>https://github.com/dotnet/razor</Uri>
343343
<Sha>44568f7817cd7c6daf90c9340c64c3b69277b7f6</Sha>
344344
<SourceBuild RepoName="razor" ManagedOnly="true" />
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25325.4">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
594+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25302.2">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25325.4">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
598+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25302.2">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25325.4">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
602+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25302.2">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25325.4">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
606+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25302.2">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25325.4">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
610+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25302.2">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25325.4">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
614+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25302.2">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25325.4">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
619+
<Sha>13b20849f8294593bf150a801cab639397e6c29d</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.7">

‎eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@
231231
</PropertyGroup>
232232
<PropertyGroup>
233233
<!-- Dependencies from https://github.com/dotnet/razor -->
234-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25275.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25275.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25275.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
234+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.25329.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
235+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.25329.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
236+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.25329.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
237237
</PropertyGroup>
238238
<PropertyGroup>
239239
<!-- Dependencies from https://github.com/dotnet/wpf -->
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25302.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25302.2</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25302.2</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25302.2</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25325.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25325.4</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25325.4</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25325.4</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jobs:
134134
signType: $(_SignType)
135135
zipSources: false
136136
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
137+
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
138+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
139+
${{ else }}:
140+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
137141
env:
138142
TeamName: $(_TeamName)
139143
MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'

‎eng/common/internal/NuGet.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<clear />
55
<add key="dotnet-core-internal-tooling" value="https://pkgs.dev.azure.com/devdiv/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json" />
66
</packageSources>
7+
<packageSourceMapping>
8+
<clear />
9+
</packageSourceMapping>
710
</configuration>

‎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.106",
3+
"dotnet": "9.0.107",
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.25302.2",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25302.2",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25325.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/SourceBuild/content/eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25263.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25302.2">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>ac63dcf2791c32bf2102fd2b5ebb46479bd48a83</Sha>
7+
<Sha>0d52a8b262d35fa2fde84e398cb2e791b8454bd2</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

‎src/SourceBuild/content/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
2424
are not necessary, and this property is removed from the file.
2525
-->
26-
<PrivateSourceBuiltSdkVersion>9.0.107</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.107-servicing.25270.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.108</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.108-servicing.25317.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->

‎src/SourceBuild/content/global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.107"
3+
"dotnet": "9.0.108"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25263.2"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2"
99
}
1010
}

0 commit comments

Comments
 (0)