From cb884dd589c536f0a0a722e767488b435ddb1969 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Nov 2024 13:24:52 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20241113.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24562.15 -> To Version 10.0.0-beta.24563.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- eng/common/core-templates/job/source-build.yml | 5 +++-- eng/common/core-templates/steps/source-build.yml | 7 ++++++- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 8 ++++---- 7 files changed, 25 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d5c2af782e..a036a8d0a0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,25 +165,25 @@ - + https://github.com/dotnet/arcade - e882d5925ca55013d5810ac51e36574a65c5da84 + 16010cc5b14ca0b6aacd591bb06352ccbe016cbe - + https://github.com/dotnet/arcade - e882d5925ca55013d5810ac51e36574a65c5da84 + 16010cc5b14ca0b6aacd591bb06352ccbe016cbe - + https://github.com/dotnet/arcade - e882d5925ca55013d5810ac51e36574a65c5da84 + 16010cc5b14ca0b6aacd591bb06352ccbe016cbe https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - e882d5925ca55013d5810ac51e36574a65c5da84 + 16010cc5b14ca0b6aacd591bb06352ccbe016cbe https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 46626d1099d..48b1ba9ea7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ 9.0.0-beta.24053.1 - 10.0.0-beta.24562.15 + 10.0.0-beta.24563.7 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c4713c8b6ed..05f7ad6ef0d 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -12,9 +12,10 @@ parameters: # The name of the job. This is included in the job ID. # targetRID: '' # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false + # portableBuild: false # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. + # linux-x64), and compiling against distro-provided packages rather than portable ones. The + # default is portable mode. # skipPublishValidation: false # Disables publishing validation. By default, a check is performed to ensure no packages are # published by source-build. diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index c9271c01158..4da05afe054 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -76,6 +76,11 @@ steps: assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml fi + portableBuildArgs= + if [ '${{ parameters.platform.portableBuild }}' != '' ]; then + portableBuildArgs='/p:PortabelBuild=${{ parameters.platform.portableBuild }}' + fi + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ @@ -85,7 +90,7 @@ steps: $targetRidArgs \ $runtimeOsArgs \ $baseOsArgs \ - /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + $portableBuildArgs \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ /p:AssetManifestFileName=$assetManifestFileName diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index aab40de3fd9..4f0546dce12 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.10.0-pre.4.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7bd54b6ba9b..bd80ccccb51 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.10.0-pre.4.0 - $defaultXCopyMSBuildVersion = '17.10.0-pre.4.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 38302750583..36b936c6dc2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-rc.2.24474.11", + "dotnet": "9.0.100", "runtimes": { "dotnet": [ "2.1.7", @@ -12,11 +12,11 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24562.15" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24563.7", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24563.7" }, "sdk": { - "version": "9.0.100-rc.2.24474.11" + "version": "9.0.100" }, "native-tools": { "strawberry-perl": "5.38.0.1", From 77a20aacc333aa74add6e7cf5b16f9cd3692ebf5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Nov 2024 13:17:02 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20241114.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.24562.15 -> To Version 10.0.0-beta.24564.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a036a8d0a0d..14b434a5064 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -165,25 +165,25 @@ - + https://github.com/dotnet/arcade - 16010cc5b14ca0b6aacd591bb06352ccbe016cbe + c1852b9ac37df9a86630c2f078dbee43f7b186e7 - + https://github.com/dotnet/arcade - 16010cc5b14ca0b6aacd591bb06352ccbe016cbe + c1852b9ac37df9a86630c2f078dbee43f7b186e7 - + https://github.com/dotnet/arcade - 16010cc5b14ca0b6aacd591bb06352ccbe016cbe + c1852b9ac37df9a86630c2f078dbee43f7b186e7 https://github.com/dotnet/arcade f4e11a15c7b8a949d4a366e792a9843ff6e88cd5 - + https://github.com/dotnet/arcade - 16010cc5b14ca0b6aacd591bb06352ccbe016cbe + c1852b9ac37df9a86630c2f078dbee43f7b186e7 https://github.com/dotnet/sourcelink diff --git a/eng/Versions.props b/eng/Versions.props index 48b1ba9ea7f..9fbacdd990d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,7 +52,7 @@ 9.0.0-beta.24053.1 - 10.0.0-beta.24563.7 + 10.0.0-beta.24564.1 diff --git a/global.json b/global.json index 36b936c6dc2..f98921330eb 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24563.7", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24563.7" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24564.1" }, "sdk": { "version": "9.0.100"