File tree Expand file tree Collapse file tree 5 files changed +11
-10
lines changed
Expand file tree Collapse file tree 5 files changed +11
-10
lines changed Original file line number Diff line number Diff line change @@ -54,8 +54,8 @@ extends:
5454 image : mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.22-amd64
5555 azureLinux30 :
5656 image : mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8.0-build-amd64
57- cblMariner20Fpm :
58- image : mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2 .0-fpm
57+ azureLinux30fpm :
58+ image : mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8 .0-fpm-amd64
5959 centosStream9 :
6060 image : mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
6161 debian12 :
@@ -276,7 +276,7 @@ extends:
276276 parameters :
277277 agentOs : Linux
278278 jobName : Build_Linux_Portable_Rpm_Release_x64
279- container : cblMariner20Fpm
279+ container : azureLinux30fpm
280280 buildConfiguration : Release
281281 buildArchitecture : x64
282282 # Do not publish zips and tarballs. The linux-x64 binaries are
@@ -288,7 +288,7 @@ extends:
288288 parameters :
289289 agentOs : Linux
290290 jobName : Build_Linux_Portable_Rpm_Release_Arm64
291- container : cblMariner20Fpm
291+ container : azureLinux30fpm
292292 buildConfiguration : Release
293293 buildArchitecture : arm64
294294 runtimeIdentifier : ' linux-arm64'
Original file line number Diff line number Diff line change @@ -244,7 +244,7 @@ stages:
244244 parameters :
245245 agentOs : Linux
246246 jobName : Build_Linux_Portable_Rpm_Release_x64
247- container : ' mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2 .0-fpm'
247+ container : ' mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8 .0-fpm-amd64 '
248248 buildConfiguration : Release
249249 buildArchitecture : x64
250250 # Do not publish zips and tarballs. The linux-x64 binaries are
@@ -256,7 +256,7 @@ stages:
256256 parameters :
257257 agentOs : Linux
258258 jobName : Build_Linux_Portable_Rpm_Release_Arm64
259- container : ' mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2 .0-fpm'
259+ container : ' mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net8 .0-fpm-amd64 '
260260 buildConfiguration : Release
261261 buildArchitecture : arm64
262262 runtimeIdentifier : ' linux-arm64'
Original file line number Diff line number Diff line change 3030 These URLs can't be composed from their base URL and version as we read them from the
3131 prep.sh and pipeline scripts, outside of MSBuild.
3232 -->
33- <PrivateSourceBuiltArtifactsUrl >https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.119 -servicing.25373 .1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl >
34- <PrivateSourceBuiltSdkUrl >https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.119 -centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl >
33+ <PrivateSourceBuiltArtifactsUrl >https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.120 -servicing.25421 .1.centos.9-x64.tar.gz</PrivateSourceBuiltArtifactsUrl >
34+ <PrivateSourceBuiltSdkUrl >https://builds.dotnet.microsoft.com/source-built-artifacts/sdks/dotnet-sdk-8.0.120 -centos.9-x64.tar.gz</PrivateSourceBuiltSdkUrl >
3535 </PropertyGroup >
3636</Project >
Original file line number Diff line number Diff line change 11{
22 "tools" : {
3- "dotnet" : " 8.0.119 "
3+ "dotnet" : " 8.0.120 "
44 },
55 "msbuild-sdks" : {
66 "Microsoft.Build.CentralPackageVersions" : " 2.0.1" ,
77 "Microsoft.Build.Traversal" : " 2.0.2" ,
88 "Microsoft.NET.Sdk.IL" : " 3.0.0-preview-27107-01" ,
9- "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.25326.1 " ,
9+ "Microsoft.DotNet.Arcade.Sdk" : " 8.0.0-beta.25415.2 " ,
1010 "Yarn.MSBuild" : " 1.15.2"
1111 }
1212}
Original file line number Diff line number Diff line change 2020 <PackageReference Include =" System.Net.Http" Version =" 4.3.4" />
2121 <PackageReference Include =" System.Formats.Asn1" Version =" $(SystemFormatsAsn1PackageVersion)" />
2222 <PackageReference Include =" Microsoft.IO.Redist" Version =" $(MicrosoftIORedistPackageVersion)" Condition =" '$(DotNetBuildFromSource)' != 'true'" />
23+ <PackageReference Include =" System.Text.Json" Version =" $(SystemTextJsonPackageVersion)" Condition =" '$(DotNetBuildFromSource)' != 'true'" />
2324 </ItemGroup >
2425
2526 <ItemGroup Condition =" '$(TargetFrameworkIdentifier)' == '.NETFramework'" >
You can’t perform that action at this time.
0 commit comments