Skip to content

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #48393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Apr 14, 2025
Merged

[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx' #48393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
131977c
Update the sign check to remove the exclusions but only check on sign…
marcpopMSFT Apr 8, 2025
6be82af
Update dependencies from https://github.com/dotnet/arcade build 20250…
dotnet-maestro[bot] Apr 9, 2025
48364da
Switch to using the source branch that's set in our builds.
marcpopMSFT Apr 9, 2025
9d59011
Update dependencies from https://github.com/dotnet/msbuild build 2025…
dotnet-maestro[bot] Apr 10, 2025
c4db488
Update dependencies from https://github.com/dotnet/templating build 2…
dotnet-maestro[bot] Apr 10, 2025
89bccbe
[release/8.0.4xx] Update dependencies from dotnet/msbuild (#48337)
v-wuzhai Apr 10, 2025
8c6ee8e
Disable Publish_HostedApp_WithRidSpecifiedAsArgument_NoSelfContained_…
v-wuzhai Apr 10, 2025
c08f02b
[release/8.0.4xx] Update dependencies from dotnet/templating (#48338)
v-wuzhai Apr 10, 2025
64a8d60
[release/8.0.4xx] Update dependencies from dotnet/arcade (#48289)
v-wuzhai Apr 11, 2025
652d22a
Merge branch 'release/9.0.1xx' of https://github.com/dotnet/sdk into …
v-wuzhai Apr 11, 2025
f0f1694
[automated] Merge branch 'release/8.0.4xx' => 'release/9.0.1xx' (#48365)
v-wuzhai Apr 11, 2025
135d2cd
Merging internal commits for release/9.0.1xx (#48266)
vseanreesermsft Apr 11, 2025
4bbdf76
.NET Source-Build 9.0.105 April 2025 Updates (#48274)
dotnet-sb-bot Apr 11, 2025
fe6d1ce
Update the sign check to remove the exclusions but only check on sign…
marcpopMSFT Apr 11, 2025
b9f973f
Merge branch 'release/9.0.2xx' of https://github.com/dotnet/sdk into …
v-wuzhai Apr 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Installer/redist-installer/targets/BundledManifests.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@
</ItemGroup>

<Target Name="ValidateBundledManifestSigning"
Condition=" '$(OS)' == 'Windows_NT' and '$(Architecture)' != 'arm' ">
Condition=" '$(OS)' == 'Windows_NT' and
'$(Architecture)' != 'arm' and
$(BUILD_SOURCEBRANCH) != '' and
$(BUILD_SOURCEBRANCH.Contains('release')) ">
<PropertyGroup>
<SignCheckExe>$(PkgMicrosoft_DotNet_SignCheck)\tools\Microsoft.DotNet.SignCheck.exe</SignCheckExe>
<SignCheckLog Condition="'$(SignCheckLog)' == ''">$(ArtifactsLogDir)\workloadmanifestsigncheck.log</SignCheckLog>
Expand All @@ -60,7 +63,7 @@
<ItemGroup>
<!-- Don't try to validate signing for workload manifests that will be signed as part of post-build signing -->
<BundledManifestsToValidateSigning Include="@(BundledManifests)"
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">
Exclude="Microsoft.NET.Sdk.Aspire">
<RestoredMsiPathInNupkg>$([MSBuild]::NormalizePath($([System.IO.Directory]::GetFiles('%(RestoredMsiNupkgContentPath)/data/', '*$(MsiArchitectureForWorkloadManifests).msi'))))</RestoredMsiPathInNupkg>
</BundledManifestsToValidateSigning>

Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25077.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>bac7e1caea791275b7c3ccb4cb75fd6a04a26618</Sha>
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
are not necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltSdkVersion>9.0.104</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.104-servicing.25113.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltSdkVersion>9.0.105</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.105-servicing.25165.1</PrivateSourceBuiltArtifactsVersion>
<!-- command-line-api dependencies -->
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
<!-- msbuild dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"tools": {
"dotnet": "9.0.104"
"dotnet": "9.0.105"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5"
}
}
Loading