Skip to content

Commit 6960dfe

Browse files
authored
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' (#48393)
2 parents 3ba6d93 + b9f973f commit 6960dfe

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

src/Installer/redist-installer/targets/BundledManifests.targets

+5-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,10 @@
5050
</ItemGroup>
5151

5252
<Target Name="ValidateBundledManifestSigning"
53-
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' ">
53+
Condition=" '$(OS)' == 'Windows_NT' and
54+
'$(Architecture)' != 'arm' and
55+
$(BUILD_SOURCEBRANCH) != '' and
56+
$(BUILD_SOURCEBRANCH.Contains('release')) ">
5457
<PropertyGroup>
5558
<SignCheckExe>$(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckExe>
5659
<SignCheckLog Condition="'$(SignCheckLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.log</SignCheckLog>
@@ -60,7 +63,7 @@
6063
<ItemGroup>
6164
<!-- Don't try to validate signing for workload manifests that will be signed as part of post-build signing -->
6265
<BundledManifestsToValidateSigning Include="@(BundledManifests)"
63-
Exclude="Microsoft.NET.Workload.Mono.ToolChain.Current;Microsoft.NET.Workload.Mono.ToolChain.net6;Microsoft.NET.Workload.Mono.ToolChain.net7;Microsoft.NET.Workload.Mono.ToolChain.net8;Microsoft.NET.Workload.Emscripten.Current;Microsoft.NET.Workload.Emscripten.net6;Microsoft.NET.Workload.Emscripten.net7;Microsoft.NET.Workload.Emscripten.net8;Microsoft.NET.Sdk.Aspire">
66+
Exclude="Microsoft.NET.Sdk.Aspire">
6467
<RestoredMsiPathInNupkg>$([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi'))))</RestoredMsiPathInNupkg>
6568
</BundledManifestsToValidateSigning>
6669

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

+2-2
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.25077.4">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
7+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

src/SourceBuild/content/eng/Versions.props

+2-2
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.104</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.104-servicing.25113.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.105</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.105-servicing.25165.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->

src/SourceBuild/content/global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.104"
3+
"dotnet": "9.0.105"
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.25077.4"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5"
99
}
1010
}

0 commit comments

Comments
 (0)