Skip to content

Commit faf36a8

Browse files
ellahathawayellahathaway
authored
Merge branch 'release/9.0.1xx' into internal-merge-9.0.1xx-2025-10-14-1153
2 parents 8cc0ee9 + 2ebd518 commit faf36a8

File tree

6 files changed

+28
-29
lines changed

6 files changed

+28
-29
lines changed

‎.vsts-ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ extends:
213213
# Do not publish zips and tarballs. The linux-x64 binaries are already published by Official.
214214
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false
215215
officialBuildProperties: $(_officialBuildProperties)
216-
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
216+
osProperties: $(linuxOsPortableProperties) /p:BuildSdkRpm=true
217217
runTests: false
218218
- categoryName: Portable
219219
container: azureLinux30fpm
@@ -222,7 +222,7 @@ extends:
222222
# Do not publish zips and tarballs. The linux-arm64 binaries are already published by Official.
223223
publishArgument: $(_publishArgument) /p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true
224224
officialBuildProperties: $(_officialBuildProperties)
225-
osProperties: $(linuxOsPortableProperties) /p:IsRPMBasedDistro=true
225+
osProperties: $(linuxOsPortableProperties) /p:BuildSdkRpm=true
226226
runTests: false
227227
### MUSL ###
228228
- categoryName: Musl

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25503.3">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25515.2">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
594+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25503.3">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.25515.2">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
598+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25503.3">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25515.2">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
602+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25503.3">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.25515.2">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
606+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25503.3">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.25515.2">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
610+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25503.3">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.25515.2">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
614+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25503.3">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.25515.2">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>f8c9a6d12e5a3b281661924da22d7de1cc6ab27d</Sha>
619+
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.10">

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,10 @@
270270
</PropertyGroup>
271271
<PropertyGroup>
272272
<!-- Dependencies from https://github.com/dotnet/arcade -->
273-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25503.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274-
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25503.3</MicrosoftDotNetSignToolVersion>
275-
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25503.3</MicrosoftDotNetXliffTasksVersion>
276-
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25503.3</MicrosoftDotNetXUnitExtensionsVersion>
273+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.25515.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
274+
<MicrosoftDotNetSignToolVersion>9.0.0-beta.25515.2</MicrosoftDotNetSignToolVersion>
275+
<MicrosoftDotNetXliffTasksVersion>9.0.0-beta.25515.2</MicrosoftDotNetXliffTasksVersion>
276+
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.25515.2</MicrosoftDotNetXUnitExtensionsVersion>
277277
</PropertyGroup>
278278
<PropertyGroup>
279279
<!-- 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.110",
3+
"dotnet": "9.0.111",
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.25503.3",
21-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25503.3",
20+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25515.2",
21+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25515.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/Installer/redist-installer/targets/GenerateRPMs.targets‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
<Target Name="GenerateRpmsInner"
1515
DependsOnTargets="TestFPMTool;BuildRpms"
16-
Condition=" '$(IsRPMBasedDistro)' == 'True' "
16+
Condition=" '$(BuildSdkRpm)' == 'True' "
1717
Outputs="@(GeneratedInstallers)" />
1818

1919
<Target Name="BuildRpms"
2020
DependsOnTargets="GenerateSdkRpm"
21-
Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' " />
21+
Condition=" '$(BuildSdkRpm)' == 'True' and '$(FPMPresent)' == 'True' " />
2222

2323
<Target Name="GenerateSdkRpm"
2424
DependsOnTargets="SetupRpmProps">
@@ -301,10 +301,8 @@
301301
<FPMPresent Condition=" '$(FPMExitCode)' == '0' ">True</FPMPresent>
302302
</PropertyGroup>
303303

304-
<!-- Workaround for Jenkins machines that don't have the necessary packages https://github.com/dotnet/core-setup/issues/2260 -->
305-
<Message Condition=" '$(FPMPresent)' != 'True' "
306-
Text="FPM tool Not found, RPM packages will not be built."
307-
Importance="High" />
304+
<Error Condition=" '$(FPMPresent)' != 'True' "
305+
Text="FPM tool Not found, RPM packages will not be built." />
308306
</Target>
309307

310308
<!-- Removed the TestSdkRpm task as it would fail when the installed package exactly matched the upgrade package -->

‎src/Installer/redist-installer/targets/GetRuntimeInformation.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
<IsDebianBaseDistro Condition=" $(HostRid.StartsWith('ubuntu')) OR $(HostRid.StartsWith('debian')) ">true</IsDebianBaseDistro>
2929
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) AND '$(HostRid)' != 'rhel.6-x64' ">true</IsRPMBasedDistro>
3030
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('centos')) ">true</IsRPMBasedDistro>
31+
<IsRPMBasedDistro Condition=" $(HostRid.StartsWith('azurelinux')) ">true</IsRPMBasedDistro>
3132
<PublishNativeInstallers Condition=" '$(IslinuxPortable)' != 'true' AND '$(HostRid)' != 'rhel.6-x64' AND !$(Rid.StartsWith('linux-musl'))">true</PublishNativeInstallers>
3233
<PublishArchives Condition=" '$(IslinuxPortable)' == 'true' OR ('$(IsDebianBaseDistro)' != 'true' AND '$(IsRPMBasedDistro)' != 'true') ">true</PublishArchives>
3334
</PropertyGroup>

0 commit comments

Comments
 (0)