From b46d699aed5c752e5333db92946ef0a13219504f Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 7 Feb 2025 14:17:27 -0800 Subject: [PATCH 01/77] Update global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index afecb397d..39e01afd1 100644 --- a/global.json +++ b/global.json @@ -5,7 +5,7 @@ "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3" + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } -} \ No newline at end of file +} From 301224dbb8a8cb0e6c7ff0680c185214ff157cb2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 10 Feb 2025 13:47:10 -0800 Subject: [PATCH 02/77] Remove the feature band as we split into three branches (#312) * Add the feature band parameter * Fix the global.json formatting * Update default featureBand to 10.0.100 * Remove the feature band implementation as we're moving to a separate branch model * Update the VS insertion branches --- eng/Versions.props | 16 ---------------- eng/pipelines/official.yml | 2 -- 2 files changed, 18 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 248529b9a..ca2e9757a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,22 +18,6 @@ - - 2 - 00 - 0 - - - 3 - 00 - 0 - false - - preview - 0 - $(VersionMajor).$(VersionSDKMinor)$(VersionFeature).$(VersionPatch) diff --git a/eng/pipelines/official.yml b/eng/pipelines/official.yml index 38522d84c..a6cbaf30e 100644 --- a/eng/pipelines/official.yml +++ b/eng/pipelines/official.yml @@ -45,9 +45,7 @@ parameters: displayName: Primary VS insertion branches type: object default: - - main - rel/d17.12 - - rel/d17.13 # These insert packs only into VS [no (pre)components]. - name: secondaryVsInsertionBranches displayName: 'Secondary VS insertion branches [packs only]' From f84ca3abc0a8e0305d75e0f65cfab4352a120fcf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2025 21:01:12 -0800 Subject: [PATCH 03/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk (#322) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250207.30 Microsoft.NET.Sdk From Version 9.0.103-servicing.25071.13 -> To Version 9.0.104-servicing.25107.30 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250211.35 Microsoft.NET.Sdk From Version 9.0.103-servicing.25071.13 -> To Version 9.0.104-servicing.25111.35 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250212.10 Microsoft.NET.Sdk From Version 9.0.103-servicing.25071.13 -> To Version 9.0.104-servicing.25112.10 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.2 -> To Version 9.0.3 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250213.30 Microsoft.NET.Sdk From Version 9.0.103-servicing.25071.13 -> To Version 9.0.104-servicing.25113.30 * Update VersionFeature to 04 in Versions.props --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 31 +++---------------------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index bbcd98f2b..1d5718f64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,30 +15,10 @@ - - - - - - - - - - - - - - - - + - - - - - - + @@ -62,12 +42,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e0d3d23a..05c5d9b46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - 2c27e405e17595694d91892159593d6dd10e61e2 + dad5528e5bdf92a05a5a404c5f7939523390b96d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 80aa709f5d919c6814726788dc6dabe23e79e672 + 831d23e56149cd59c40fc00c7feb7c5334bd19c4 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui 85f2a06ecd11e4ba5a9e567d86f9d2fb49a2c5ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 96da45d427abd4d74c27960061daf18b51cd474f + 2750432faabfdcf0d08b9650ff1d0a5e45ca6e59 diff --git a/eng/Versions.props b/eng/Versions.props index ca2e9757a..f9d139b0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 - 03 + 04 0 false @@ -44,7 +44,7 @@ - 9.0.2 + 9.0.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.2 + 9.0.3 $(MicrosoftNETCoreAppRefPackageVersion) From acfee88dc82d5d43f42cc9c219176314bf6571c7 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Mon, 24 Feb 2025 12:12:14 -0800 Subject: [PATCH 04/77] Manually update Maui versions. --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1d5718f64..e1095f7fa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05c5d9b46..613b55346 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,25 +10,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 831d23e56149cd59c40fc00c7feb7c5334bd19c4 - + https://github.com/dotnet/android - 0ccdc57cf7fc59bd3f6cbf900c9cdbebadfe4609 + 1719a35b8a0348a4a8dd0061cfc4dd7fe6612a3c - + https://github.com/xamarin/xamarin-macios - b3ee0f2422cd950a0c0c676fb8ac9e7dc5f98290 + 63d5ccc690e8c35e0ea0f608b5d05a664f9b7775 - + https://github.com/xamarin/xamarin-macios - b3ee0f2422cd950a0c0c676fb8ac9e7dc5f98290 + 63d5ccc690e8c35e0ea0f608b5d05a664f9b7775 - + https://github.com/xamarin/xamarin-macios - b3ee0f2422cd950a0c0c676fb8ac9e7dc5f98290 + 63d5ccc690e8c35e0ea0f608b5d05a664f9b7775 - + https://github.com/xamarin/xamarin-macios - b3ee0f2422cd950a0c0c676fb8ac9e7dc5f98290 + 63d5ccc690e8c35e0ea0f608b5d05a664f9b7775 https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index f9d139b0d..95ac7760f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,11 +51,11 @@ 9.0.100 - 35.0.39 - 18.2.9173 - 18.2.9173 - 18.2.9173 - 15.2.9173 + 35.0.50 + 18.2.9180 + 18.2.9180 + 18.2.9180 + 15.2.9180 9.0.14 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) From 471219e7327c426a8bab4f207d3a4beb754a4512 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 09:05:47 -0700 Subject: [PATCH 05/77] [release/9.0.1xx] Update dependencies from dotnet/arcade (#347) * Update dependencies from https://github.com/dotnet/arcade build 20250311.4 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25077.4 -> To Version 9.0.0-beta.25161.4 * Update dependencies from https://github.com/dotnet/arcade build 20250314.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25077.4 -> To Version 9.0.0-beta.25164.2 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 10 ++++++---- eng/Version.Details.xml | 4 ++-- .../core-templates/steps/generate-sbom.yml | 2 +- eng/common/generate-sbom-prep.ps1 | 20 +++++++++++++------ eng/common/generate-sbom-prep.sh | 17 ++++++++++------ eng/common/templates-official/job/job.yml | 1 + eng/common/tools.ps1 | 4 ++-- eng/common/tools.sh | 4 ++-- global.json | 4 ++-- 9 files changed, 41 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1095f7fa..6e13c4e63 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,20 +10,20 @@ - + + + + - - - @@ -42,6 +42,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 613b55346..24827c002 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - bac7e1caea791275b7c3ccb4cb75fd6a04a26618 + 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index d938b60e1..56a090094 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -38,7 +38,7 @@ steps: PackageName: ${{ parameters.packageName }} BuildDropPath: ${{ parameters.buildDropPath }} PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} + ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) ${{ if ne(parameters.IgnoreDirectories, '') }}: AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' diff --git a/eng/common/generate-sbom-prep.ps1 b/eng/common/generate-sbom-prep.ps1 index 3e5c1c74a..a0c7d792a 100644 --- a/eng/common/generate-sbom-prep.ps1 +++ b/eng/common/generate-sbom-prep.ps1 @@ -4,18 +4,26 @@ Param( . $PSScriptRoot\pipeline-logging-functions.ps1 +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +$ArtifactName = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" +$SafeArtifactName = $ArtifactName -replace '["/:<>\\|?@*"() ]', '_' +$SbomGenerationDir = Join-Path $ManifestDirPath $SafeArtifactName + +Write-Host "Artifact name before : $ArtifactName" +Write-Host "Artifact name after : $SafeArtifactName" + Write-Host "Creating dir $ManifestDirPath" + # create directory for sbom manifest to be placed -if (!(Test-Path -path $ManifestDirPath)) +if (!(Test-Path -path $SbomGenerationDir)) { - New-Item -ItemType Directory -path $ManifestDirPath - Write-Host "Successfully created directory $ManifestDirPath" + New-Item -ItemType Directory -path $SbomGenerationDir + Write-Host "Successfully created directory $SbomGenerationDir" } else{ Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." } Write-Host "Updating artifact name" -$artifact_name = "${env:SYSTEM_STAGENAME}_${env:AGENT_JOBNAME}_SBOM" -replace '["/:<>\\|?@*"() ]', '_' -Write-Host "Artifact name $artifact_name" -Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$artifact_name" +Write-Host "##vso[task.setvariable variable=ARTIFACT_NAME]$SafeArtifactName" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index d5c76dc82..b8ecca72b 100755 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -14,19 +14,24 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . $scriptroot/pipeline-logging-functions.sh + +# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. +artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" +safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" manifest_dir=$1 -if [ ! -d "$manifest_dir" ] ; then - mkdir -p "$manifest_dir" - echo "Sbom directory created." $manifest_dir +# Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly +# with their own overwriting ours. So we create it as a sub directory of the requested manifest path. +sbom_generation_dir="$manifest_dir/$safe_artifact_name" + +if [ ! -d "$sbom_generation_dir" ] ; then + mkdir -p "$sbom_generation_dir" + echo "Sbom directory created." $sbom_generation_dir else Write-PipelineTelemetryError -category 'Build' "Unable to create sbom folder." fi -artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" echo "Artifact name before : "$artifact_name -# replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. -safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" echo "Artifact name after : "$safe_artifact_name export ARTIFACT_NAME=$safe_artifact_name echo "##vso[task.setvariable variable=ARTIFACT_NAME]$safe_artifact_name" diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 605692d2f..817555505 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -16,6 +16,7 @@ jobs: parameters: PackageVersion: ${{ parameters.packageVersion }} BuildDropPath: ${{ parameters.buildDropPath }} + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom publishArtifacts: false # publish artifacts diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a46b6deb7..22b49e09d 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -42,7 +42,7 @@ [bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true } # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1 +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.ps1 [string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' } # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -262,7 +262,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { if (!(Test-Path $installScript)) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit - $uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" + $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" Retry({ Write-Host "GET $uri" diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 1159726a1..01b09b657 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true} use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} # Enable repos to use a particular version of the on-line dotnet-install scripts. -# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh +# default URL: https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. @@ -295,7 +295,7 @@ function with_retries { function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" - local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" if [[ ! -a "$install_script" ]]; then mkdir -p "$root" diff --git a/global.json b/global.json index 39e01afd1..d42d230d7 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.102" + "dotnet": "9.0.104" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From ad8428b6f061211b19a50ad6892930e0ba047ba7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 09:09:02 -0700 Subject: [PATCH 06/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk (#351) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250314.47 Microsoft.NET.Sdk From Version 9.0.104-servicing.25113.30 -> To Version 9.0.105-servicing.25164.47 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.3 -> To Version 9.0.4 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250315.8 Microsoft.NET.Sdk From Version 9.0.104-servicing.25113.30 -> To Version 9.0.105-servicing.25165.8 * Update VersionFeature to 05 in Versions.props --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 12 +++--------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e13c4e63..dd1d44ba4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,14 +14,10 @@ - - - + - - - + @@ -42,9 +38,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24827c002..c8e5509fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - dad5528e5bdf92a05a5a404c5f7939523390b96d + 78be8cdf4f0bfd93018fd7a87f8282a41d041298 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 831d23e56149cd59c40fc00c7feb7c5334bd19c4 + f57e6dc747158ab7ade4e62a75a6750d16b771e8 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui 85f2a06ecd11e4ba5a9e567d86f9d2fb49a2c5ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2750432faabfdcf0d08b9650ff1d0a5e45ca6e59 + 35890ecb8707d46cc25cc7db17ac5a907cf76a2e diff --git a/eng/Versions.props b/eng/Versions.props index 95ac7760f..653e113f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 - 04 + 05 0 false @@ -44,7 +44,7 @@ - 9.0.3 + 9.0.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.3 + 9.0.4 $(MicrosoftNETCoreAppRefPackageVersion) From faee7baf6fa6b9af85a04b8f03891e0e567a4bde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 31 Mar 2025 14:24:35 -0700 Subject: [PATCH 07/77] Update dependencies from https://github.com/dotnet/android build 9.0.50-ci.net9.25174.1+azdo.11257792 (#368) Microsoft.NET.Sdk.Android.Manifest-9.0.100 From Version 35.0.50 -> To Version 35.0.61 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 8 +++++++- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd1d44ba4..06c96dd75 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -15,9 +15,13 @@ + + + + @@ -38,6 +42,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8e5509fb..33a44abde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,9 +10,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime f57e6dc747158ab7ade4e62a75a6750d16b771e8 - + https://github.com/dotnet/android - 1719a35b8a0348a4a8dd0061cfc4dd7fe6612a3c + e7876a4f92d894b40c191a24c2b74f06d4bf4573 https://github.com/xamarin/xamarin-macios diff --git a/eng/Versions.props b/eng/Versions.props index 653e113f6..14ec145ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 9.0.100 - 35.0.50 + 35.0.61 18.2.9180 18.2.9180 18.2.9180 From adcfe82e7c69c5117d54df949a6148e27f1062ff Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 7 Apr 2025 09:50:08 -0700 Subject: [PATCH 08/77] Update IOS versions for April (#377) --- NuGet.config | 3 +++ eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 06c96dd75..a9e97b95f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33a44abde..6be3f43bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,21 +14,21 @@ https://github.com/dotnet/android e7876a4f92d894b40c191a24c2b74f06d4bf4573 - - https://github.com/xamarin/xamarin-macios - 63d5ccc690e8c35e0ea0f608b5d05a664f9b7775 + + https://github.com/dotnet/macios + dd5e708b171daffa6d8f3561aee062425a380670 - - https://github.com/xamarin/xamarin-macios - 63d5ccc690e8c35e0ea0f608b5d05a664f9b7775 + + https://github.com/dotnet/macios + dd5e708b171daffa6d8f3561aee062425a380670 - - https://github.com/xamarin/xamarin-macios - 63d5ccc690e8c35e0ea0f608b5d05a664f9b7775 + + https://github.com/dotnet/macios + dd5e708b171daffa6d8f3561aee062425a380670 - - https://github.com/xamarin/xamarin-macios - 63d5ccc690e8c35e0ea0f608b5d05a664f9b7775 + + https://github.com/dotnet/macios + dd5e708b171daffa6d8f3561aee062425a380670 https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index 14ec145ad..36480db35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 9.0.100 35.0.61 - 18.2.9180 - 18.2.9180 - 18.2.9180 - 15.2.9180 + 18.4.9288 + 18.4.9288 + 18.4.9288 + 15.4.9288 9.0.14 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) From 52b03ebd47186b5e4e5134506783c4a5f27b524f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Apr 2025 18:52:47 +0000 Subject: [PATCH 09/77] [release/9.0.1xx] Update dependencies from dotnet/arcade (#383) [release/9.0.1xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 4 ++-- global.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6be3f43bc..3448acaba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - 5ba9ca776c1d0bb72b2791591e54cf51fc52dfee + aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 diff --git a/global.json b/global.json index d42d230d7..fc53a72d0 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.104" + "dotnet": "9.0.105" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25164.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 46352374ac1f2d23d0031f10a21400eca62dbf83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 22 Apr 2025 09:59:10 -0700 Subject: [PATCH 10/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk (#385) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250415.42 Microsoft.NET.Sdk From Version 9.0.105-servicing.25165.8 -> To Version 9.0.106-servicing.25215.42 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250416.6 Microsoft.NET.Sdk From Version 9.0.105-servicing.25165.8 -> To Version 9.0.106-servicing.25216.6 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250417.23 Microsoft.NET.Sdk From Version 9.0.105-servicing.25165.8 -> To Version 9.0.106-servicing.25217.23 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.4 -> To Version 9.0.5 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250417.34 Microsoft.NET.Sdk From Version 9.0.105-servicing.25165.8 -> To Version 9.0.106-servicing.25217.34 * Update Versions.props for 106 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 17 ++++++----------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index a9e97b95f..f09017540 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,20 @@ - - - - + + - - - - + + @@ -45,9 +41,8 @@ - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3448acaba..6ad989def 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - 78be8cdf4f0bfd93018fd7a87f8282a41d041298 + 78f6f07d38e8755e573039a8aa04e131d3e59b76 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - f57e6dc747158ab7ade4e62a75a6750d16b771e8 + e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui 85f2a06ecd11e4ba5a9e567d86f9d2fb49a2c5ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 35890ecb8707d46cc25cc7db17ac5a907cf76a2e + a693c2bce54a354aa3562a022ad86b0b0e929131 diff --git a/eng/Versions.props b/eng/Versions.props index 36480db35..a649cff89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 - 05 + 06 0 false @@ -44,7 +44,7 @@ - 9.0.4 + 9.0.5 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.4 + 9.0.5 $(MicrosoftNETCoreAppRefPackageVersion) From dbc8a11169ae48292c74090335ce2f3d09c0b3cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 5 May 2025 11:34:31 -0700 Subject: [PATCH 11/77] Update dependencies from https://github.com/dotnet/arcade build 20250425.6 (#391) Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25225.6 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 3 +++ eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/source-build.yml | 2 ++ eng/common/core-templates/job/source-index-stage1.yml | 4 ++-- eng/common/core-templates/steps/source-build.yml | 1 + global.json | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index f09017540..055fa1d69 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,12 +14,14 @@ + + @@ -42,6 +44,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ad989def..702faa329 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c4713c8b6..d47f09d58 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -26,6 +26,8 @@ parameters: # Specifies the build script to invoke to perform the build in the repo. The default # './build.sh' should work for typical Arcade repositories, but this is customizable for # difficult situations. + # buildArguments: '' + # Specifies additional build arguments to pass to the build script. # jobProperties: {} # A list of job properties to inject at the top level, for potential extensibility beyond # container and pool. diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 205fb5b3a..8b833332b 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240522.1 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2915d29bb..37133b55b 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -79,6 +79,7 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ + ${{ parameters.platform.buildArguments }} \ $officialBuildArgs \ $internalRuntimeDownloadArgs \ $internalRestoreArgs \ diff --git a/global.json b/global.json index fc53a72d0..676fcae99 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 060ebed69fc8b4c0f6d96a26abde4d9a19614c1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 May 2025 12:54:59 -0700 Subject: [PATCH 12/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk, dotnet/maui (#387) * Update dependencies from https://github.com/dotnet/maui build 9.0.51+azdo.11431602 Microsoft.NET.Sdk.Maui.Manifest-9.0.100 From Version 9.0.14 -> To Version 9.0.51 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250429.23 Microsoft.NET.Sdk From Version 9.0.106-servicing.25217.34 -> To Version 9.0.106-servicing.25229.23 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 7 +++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 055fa1d69..802568024 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,11 +9,14 @@ + + + @@ -21,6 +24,8 @@ + + @@ -45,6 +50,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 702faa329..cab077fdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,13 +30,13 @@ https://github.com/dotnet/macios dd5e708b171daffa6d8f3561aee062425a380670 - + https://github.com/dotnet/maui - 85f2a06ecd11e4ba5a9e567d86f9d2fb49a2c5ca + dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a693c2bce54a354aa3562a022ad86b0b0e929131 + 8cdf6f0897df9d81b41613fd93eebe93519bf867 diff --git a/eng/Versions.props b/eng/Versions.props index a649cff89..a264c2542 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ 18.4.9288 18.4.9288 15.4.9288 - 9.0.14 + 9.0.51 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) $(MicrosoftNETSdkiOSManifest90100PackageVersion) From 3c827d0d08cc3ea93bba2dc3f75395d062e59bae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 21 May 2025 11:39:47 -0700 Subject: [PATCH 13/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk (#415) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250516.22 Microsoft.NET.Sdk From Version 9.0.106-servicing.25229.23 -> To Version 9.0.107-servicing.25266.22 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.5 -> To Version 9.0.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250516.56 Microsoft.NET.Sdk From Version 9.0.106-servicing.25229.23 -> To Version 9.0.107-servicing.25266.56 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 9.0.5 -> To Version 9.0.6 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250519.8 Microsoft.NET.Sdk From Version 9.0.106-servicing.25229.23 -> To Version 9.0.107-servicing.25269.8 * Update to June release branding --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 18 +++--------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 802568024..ebdf0d57a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,20 +14,12 @@ - - - - - + - - - - - + @@ -48,11 +40,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cab077fdf..0438f733c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - 78f6f07d38e8755e573039a8aa04e131d3e59b76 + e3d8e8ea6df192d864698cdd76984d74135d0d13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e36e4d1a8f8dfb08d7e3a6041459c9791d732c01 + 3875b54e7b10b10606b105340199946d0b877754 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8cdf6f0897df9d81b41613fd93eebe93519bf867 + ef50dc9d27e0c36134ca05979b16e9f942b6b7b4 diff --git a/eng/Versions.props b/eng/Versions.props index a264c2542..e6fa15482 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 - 06 + 07 0 false @@ -44,7 +44,7 @@ - 9.0.5 + 9.0.6 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.5 + 9.0.6 $(MicrosoftNETCoreAppRefPackageVersion) From 306f72f224f18c82c9a8b2c136779461ed152c11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Jun 2025 14:03:09 -0700 Subject: [PATCH 14/77] Update dependencies from https://github.com/dotnet/arcade build 20250602.2 (#423) Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25225.6 -> To Version 9.0.0-beta.25302.2 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 7 ++++++- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/post-build/post-build.yml | 6 ++++++ eng/common/post-build/publish-using-darc.ps1 | 7 ++++++- global.json | 4 ++-- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index ebdf0d57a..76a6f54c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,17 +9,20 @@ - + + + + @@ -40,6 +43,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0438f733c..b1f80931a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 454fd75c7..a8c0bd3b9 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -44,6 +44,11 @@ parameters: displayName: Publish installers and checksums type: boolean default: true + + - name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false - name: SDLValidationParameters type: object @@ -312,5 +317,6 @@ stages: -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true + -RequireDefaultChannels ${{ parameters.requireDefaultChannels }} -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 90b58e32a..a261517ef 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -5,7 +5,8 @@ param( [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net/', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, - [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters + [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, + [Parameter(Mandatory=$false)][string] $RequireDefaultChannels ) try { @@ -33,6 +34,10 @@ try { if ("false" -eq $WaitPublishingFinish) { $optionalParams.Add("--no-wait") | Out-Null } + + if ("true" -eq $RequireDefaultChannels) { + $optionalParams.Add("--default-channels-required") | Out-Null + } & $darc add-build-to-channel ` --id $buildId ` diff --git a/global.json b/global.json index 676fcae99..c6a416b7f 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.105" + "dotnet": "9.0.106" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From bb9c95fa2810d62c97c20254d20e54f31e425bea Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 16 Jun 2025 11:59:21 -0700 Subject: [PATCH 15/77] Update android and ios to the next shipping version (#434) * Update android and ios to the next shipping version * Update branding for the interim release --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 12 ++++++------ 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 76a6f54c2..6b103fe1b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -18,6 +19,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1f80931a..1b4cf1437 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,25 +10,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3875b54e7b10b10606b105340199946d0b877754 - + https://github.com/dotnet/android - e7876a4f92d894b40c191a24c2b74f06d4bf4573 + 9abff7703206541fdb83ffa80fe2c2753ad1997b - + https://github.com/dotnet/macios - dd5e708b171daffa6d8f3561aee062425a380670 + cfa2b952433c21c42ba30ce123510ec5ef9613f1 - + https://github.com/dotnet/macios - dd5e708b171daffa6d8f3561aee062425a380670 + cfa2b952433c21c42ba30ce123510ec5ef9613f1 - + https://github.com/dotnet/macios - dd5e708b171daffa6d8f3561aee062425a380670 + cfa2b952433c21c42ba30ce123510ec5ef9613f1 - + https://github.com/dotnet/macios - dd5e708b171daffa6d8f3561aee062425a380670 + cfa2b952433c21c42ba30ce123510ec5ef9613f1 https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index e6fa15482..a30de16fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 07 - 0 + 1 false servicing @@ -51,11 +51,11 @@ 9.0.100 - 35.0.61 - 18.4.9288 - 18.4.9288 - 18.4.9288 - 15.4.9288 + 35.0.78 + 18.5.9199 + 18.5.9199 + 18.5.9199 + 15.5.9199 9.0.51 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) From 994de88fbbc6847b51a8402a5eef37e701e2d98a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 19 Jun 2025 10:22:06 -0700 Subject: [PATCH 16/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk, dotnet/android, dotnet/maui (#430) * Update dependencies from https://github.com/dotnet/maui build 20250606.4 Microsoft.NET.Sdk.Maui.Manifest-9.0.100 From Version 9.0.51 -> To Version 9.0.71 * Update dependencies from https://github.com/dotnet/android build 9.0.80-ci.net9.25306.1+azdo.11716012 Microsoft.NET.Sdk.Android.Manifest-9.0.100 From Version 35.0.61 -> To Version 35.0.78 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250613.8 Microsoft.NET.Sdk From Version 9.0.107-servicing.25269.8 -> To Version 9.0.107-servicing.25313.8 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.6 -> To Version 9.0.7 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250616.5 Microsoft.NET.Sdk From Version 9.0.107-servicing.25269.8 -> To Version 9.0.108-servicing.25316.5 * Branding for July release * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250617.23 Microsoft.NET.Sdk From Version 9.0.107-servicing.25269.8 -> To Version 9.0.108-servicing.25317.23 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 9.0.6 -> To Version 9.0.7 (parent: Microsoft.NET.Sdk --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 13 ++++--------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 10 +++++----- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6b103fe1b..7e3b53493 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,21 +10,18 @@ + - - - + - - - + @@ -45,9 +42,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b4cf1437..a2d496456 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - e3d8e8ea6df192d864698cdd76984d74135d0d13 + b567cdb6b8b461de79f2a2536a22ca3a67f2f33e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3875b54e7b10b10606b105340199946d0b877754 + 3c298d9f00936d651cc47d221762474e25277672 https://github.com/dotnet/android @@ -30,13 +30,13 @@ https://github.com/dotnet/macios cfa2b952433c21c42ba30ce123510ec5ef9613f1 - + https://github.com/dotnet/maui - dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 + 95e49a2f2735b7e3f15a3af0f868486717dcc41b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ef50dc9d27e0c36134ca05979b16e9f942b6b7b4 + b98bc862bf0857048e087aa3437d2037518fadc5 diff --git a/eng/Versions.props b/eng/Versions.props index a30de16fc..224ac06fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,8 +10,8 @@ 1 - 07 - 1 + 08 + 0 false servicing @@ -44,7 +44,7 @@ - 9.0.6 + 9.0.7 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -56,7 +56,7 @@ 18.5.9199 18.5.9199 15.5.9199 - 9.0.51 + 9.0.71 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) $(MicrosoftNETSdkiOSManifest90100PackageVersion) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.6 + 9.0.7 $(MicrosoftNETCoreAppRefPackageVersion) From 485be900d3ac46dbe107ddaff594272d6c18614d Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 19 Jun 2025 17:44:30 -0700 Subject: [PATCH 17/77] Backported the publish logic for NuGet.org and the flag for allowing non-shipping workloads. --- eng/create-workload-drops.ps1 | 2 +- eng/download-workloads.ps1 | 11 +++- eng/pipelines/official.yml | 63 +++++++++++++++++-- .../templates/jobs/workload-build.yml | 21 ++----- 4 files changed, 74 insertions(+), 23 deletions(-) diff --git a/eng/create-workload-drops.ps1 b/eng/create-workload-drops.ps1 index c98fd02aa..168f0a8df 100644 --- a/eng/create-workload-drops.ps1 +++ b/eng/create-workload-drops.ps1 @@ -71,7 +71,7 @@ Get-ChildItem -Path $workloadDropPath -Directory | ForEach-Object { } } - Write-Host '❗ After upload, your workload drop will be available at:' + Write-Host '⚠︎ After upload, your workload drop will be available at:' Write-Host "https://devdiv.visualstudio.com/_apps/hub/ms-vscs-artifact.build-tasks.drop-hub-group-explorer-hub?name=$vsDropName" } diff --git a/eng/download-workloads.ps1 b/eng/download-workloads.ps1 index eaa2779da..8a2a018e2 100644 --- a/eng/download-workloads.ps1 +++ b/eng/download-workloads.ps1 @@ -12,8 +12,11 @@ # $usePreComponents: # - If $true, includes *pre.components.zip drops and excludes *components.zip drops. # - If $false, excludes *pre.components.zip drops and includes *components.zip drops. +# $includeNonShipping: +# - If $true, includes workloads that are in the 'non-shipping' folder. +# - If $false, excludes workloads that are in the 'non-shipping' folder. -param ([Parameter(Mandatory=$true)] [string] $workloadPath, [SecureString] $gitHubPat, [SecureString] $azDOPat, [string] $workloadListJson = '', [bool] $usePreComponents = $false) +param ([Parameter(Mandatory=$true)] [string] $workloadPath, [SecureString] $gitHubPat, [SecureString] $azDOPat, [string] $workloadListJson = '', [bool] $usePreComponents = $false, [bool] $includeNonShipping = $false) ### Local Build ### # Local build requires the installation of DARC. See: https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#setting-up-your-darc-client @@ -62,6 +65,11 @@ if ($usePreComponents) { $assetFilter = "Workload\.VSDrop\.$workloadFilter.*$componentFilter" Write-Host "assetFilter: $assetFilter" +$nonShippingFlag = '' +if ($includeNonShipping) { + $nonShippingFlag = '--non-shipping' +} + # Runs DARC against each workload build to download the drops (if applicable based on the filter). $versionDetails | ForEach-Object { $darcArguments = @( @@ -78,6 +86,7 @@ $versionDetails | ForEach-Object { '--skip-existing' '--continue-on-error' '--use-azure-credential-for-blobs' + $nonShippingFlag ) & $darc ($darcArguments + $ciArguments) diff --git a/eng/pipelines/official.yml b/eng/pipelines/official.yml index a6cbaf30e..bc7186909 100644 --- a/eng/pipelines/official.yml +++ b/eng/pipelines/official.yml @@ -14,14 +14,18 @@ parameters: displayName: Stabilize package version type: boolean default: false -- name: publishToFeed - displayName: Publish to feed +- name: publishToAzDO + displayName: Publish to AzDO type: boolean default: false -- name: feedForPublishing - displayName: Feed for publishing +- name: azDOPublishFeed + displayName: AzDO publish feed type: string default: public/dotnet9-workloads +- name: publishToNuGet + displayName: Publish to NuGet.org + type: boolean + default: false - name: createVSInsertion displayName: Create VS insertion type: boolean @@ -30,6 +34,10 @@ parameters: displayName: Use Preview Components for VS insertion type: boolean default: false +- name: includeNonShippingWorkloads + displayName: Include non-shipping workloads + type: boolean + default: false - name: vsTopicBranch displayName: 'VS Topic Branch [default: temp/{team}/{target}/yyyy-MM]' type: string @@ -103,11 +111,54 @@ extends: - template: /eng/pipelines/templates/jobs/workload-build.yml@self parameters: stabilizePackageVersion: ${{ parameters.stabilizePackageVersion }} - publishToFeed: ${{ parameters.publishToFeed }} - feedForPublishing: ${{ parameters.feedForPublishing }} createVSInsertion: ${{ parameters.createVSInsertion }} usePreComponentsForVSInsertion: ${{ parameters.usePreComponentsForVSInsertion }} + includeNonShippingWorkloads: ${{ parameters.includeNonShippingWorkloads }} vsTopicBranch: ${{ parameters.vsTopicBranch }} workloadDropNames: ${{ parameters.workloadDropNames }} primaryVsInsertionBranches: ${{ parameters.primaryVsInsertionBranches }} secondaryVsInsertionBranches: ${{ parameters.secondaryVsInsertionBranches }} + - stage: Publish + displayName: Publish + dependsOn: Build + jobs: + - deployment: PublishFeed + displayName: Publish to feed + environment: DotNet-SDK-Workloads + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + templateContext: + type: releaseJob + isProduction: true + strategy: + runOnce: + deploy: + steps: + - task: 1ES.DownloadPipelineArtifact@1 + displayName: 🟣 Download build artifacts + inputs: + artifactName: Artifacts + targetPath: $(Build.SourcesDirectory)/artifacts + # 1ES docs: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs/nuget-packages + # DotNetCoreCLI@2 docs: https://learn.microsoft.com/en-us/azure/devops/pipelines/tasks/reference/dotnet-core-cli-v2 + - ${{ if eq(parameters.publishToAzDO, true) }}: + - task: 1ES.PublishNuget@1 + displayName: 🟣 Publish packages to AzDO + inputs: + useDotNetTask: true + packagesToPush: $(Build.SourcesDirectory)/artifacts/packages/**/*.nupkg + packageParentPath: $(Build.SourcesDirectory)/artifacts + publishVstsFeed: ${{ parameters.feedForPublishing }} + - ${{ if eq(parameters.publishToNuGet, true) }}: + - task: 1ES.PublishNuget@1 + displayName: 🟣 Publish packages to NuGet.org + inputs: + useDotNetTask: false + packagesToPush: $(Build.SourcesDirectory)/artifacts/packages/**/*.nupkg + packageParentPath: $(Build.SourcesDirectory)/artifacts + nuGetFeedType: external + publishVstsFeed: https://api.nuget.org/v3/index.json + # Service connection: https://dev.azure.com/dnceng/internal/_settings/adminservices?resourceId=479fdc43-a27d-4f5f-b2fc-5cf19dce159a + publishFeedCredentials: nuget.org (dotnetframework) diff --git a/eng/pipelines/templates/jobs/workload-build.yml b/eng/pipelines/templates/jobs/workload-build.yml index 2954be136..76dbfa825 100644 --- a/eng/pipelines/templates/jobs/workload-build.yml +++ b/eng/pipelines/templates/jobs/workload-build.yml @@ -20,8 +20,10 @@ jobs: enableSbom: true artifacts: publish: - artifacts: true - logs: true + artifacts: + name: Artifacts + logs: + name: Logs manifests: true jobs: - job: buildRepo @@ -39,13 +41,14 @@ jobs: azureSubscription: DotNetStaging scriptType: pscore scriptPath: $(Build.SourcesDirectory)/eng/download-workloads.ps1 - # Note: The second $ for usePreComponents allows the value to resolve as `$true` or `$false`. + # Note: The second $ for usePreComponents and includeNonShipping allows the value to resolve as `$true` or `$false`. arguments: >- -workloadPath '$(Build.SourcesDirectory)/artifacts/workloads' -gitHubPat (ConvertTo-SecureString -String '$(BotAccount-dotnet-bot-repo-PAT)' -AsPlainText -Force) -azDOPat (ConvertTo-SecureString -String '$(dn-bot-all-drop-rw-code-rw-release-all)' -AsPlainText -Force) -workloadListJson '${{ convertToJson(parameters.workloadDropNames) }}' -usePreComponents:$${{ parameters.usePreComponentsForVSInsertion }} + -includeNonShipping:$${{ parameters.includeNonShippingWorkloads }} # https://github.com/dotnet/arcade/blob/ccae251ef033746eb0213329953f5e3c1687693b/Documentation/CorePackages/Publishing.md#basic-onboarding-scenario-for-new-repositories-to-the-current-publishing-version-v3 - powershell: >- @@ -61,18 +64,6 @@ jobs: /p:StabilizePackageVersion=${{ parameters.stabilizePackageVersion }} displayName: 🟣 Build solution - - ${{ if eq(parameters.publishToFeed, true) }}: - - task: 1ES.PublishNuget@1 - displayName: 🟣 Publish NuGet package - inputs: - useDotNetTask: true - packagesToPush: $(Build.SourcesDirectory)/artifacts/packages/**/*.nupkg - packageParentPath: $(Build.SourcesDirectory)/artifacts/packages - publishVstsFeed: ${{ parameters.feedForPublishing }} - nuGetFeedType: internal - allowPackageConflicts: false - publishPackageMetadata: true - - ${{ if eq(parameters.createVSInsertion, true) }}: # The variables comprised of workloadShortName and workloadType are set during create-workload-drops.ps1 in Microsoft.NET.Workloads.Vsman.csproj. - ${{ each workloadShortName in parameters.workloadDropNames }}: From 824c865c47bce35bc94dcf4375ccf131c4083263 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Jun 2025 11:01:55 -0700 Subject: [PATCH 18/77] [release/9.0.1xx] Update dependencies from dotnet/arcade (#442) * Update dependencies from https://github.com/dotnet/arcade build 20250620.3 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25302.2 -> To Version 9.0.0-beta.25320.3 * Update dependencies from https://github.com/dotnet/arcade build 20250623.2 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25302.2 -> To Version 9.0.0-beta.25323.2 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/job.yml | 4 ++++ eng/common/internal/NuGet.config | 3 +++ global.json | 4 ++-- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7e3b53493..c251daf99 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -16,12 +15,15 @@ + + - + + @@ -42,6 +44,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2d496456..dd19f9085 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 533b40ed3b73fcb6f4509e301db76203bd58f920 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index ba53ebfbd..abe80a2a0 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 19d3d311b..f70261ed6 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -4,4 +4,7 @@ + + + diff --git a/global.json b/global.json index c6a416b7f..6ffdd918f 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.106" + "dotnet": "9.0.107" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25323.2", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 86921d303d6b214e692b34977b8baf69232cfa4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Jun 2025 13:00:48 -0700 Subject: [PATCH 19/77] [release/9.0.1xx] Update dependencies from dotnet/macios (#443) * Update dependencies from https://github.com/dotnet/macios build 20250624.5 Microsoft.NET.Sdk.iOS.Manifest-9.0.100 , Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100 , Microsoft.NET.Sdk.macOS.Manifest-9.0.100 , Microsoft.NET.Sdk.tvOS.Manifest-9.0.100 From Version 18.5.9199 -> To Version 18.5.9207 * Downgrade back to the maui 9.0.51 version --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 6 +++++- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index c251daf99..10e40d96b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,19 +9,22 @@ - + + + + @@ -46,6 +49,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd19f9085..891aff4d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,25 +14,25 @@ https://github.com/dotnet/android 9abff7703206541fdb83ffa80fe2c2753ad1997b - + https://github.com/dotnet/macios - cfa2b952433c21c42ba30ce123510ec5ef9613f1 + 10f1ea39eeb1b40b92112d8b8440699879433e55 - + https://github.com/dotnet/macios - cfa2b952433c21c42ba30ce123510ec5ef9613f1 + 10f1ea39eeb1b40b92112d8b8440699879433e55 - + https://github.com/dotnet/macios - cfa2b952433c21c42ba30ce123510ec5ef9613f1 + 10f1ea39eeb1b40b92112d8b8440699879433e55 - + https://github.com/dotnet/macios - cfa2b952433c21c42ba30ce123510ec5ef9613f1 + 10f1ea39eeb1b40b92112d8b8440699879433e55 - + https://github.com/dotnet/maui - 95e49a2f2735b7e3f15a3af0f868486717dcc41b + dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk diff --git a/eng/Versions.props b/eng/Versions.props index 224ac06fc..e424b3550 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,11 +52,11 @@ 9.0.100 35.0.78 - 18.5.9199 - 18.5.9199 - 18.5.9199 - 15.5.9199 - 9.0.71 + 18.5.9207 + 18.5.9207 + 18.5.9207 + 15.5.9207 + 9.0.51 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) $(MicrosoftNETSdkiOSManifest90100PackageVersion) From 19bb75b4407457650973658d2e5916e2c2be5ba3 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 8 Jul 2025 13:19:57 -0700 Subject: [PATCH 20/77] Update official.yml --- eng/pipelines/official.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/official.yml b/eng/pipelines/official.yml index bc7186909..3438628c1 100644 --- a/eng/pipelines/official.yml +++ b/eng/pipelines/official.yml @@ -150,7 +150,7 @@ extends: useDotNetTask: true packagesToPush: $(Build.SourcesDirectory)/artifacts/packages/**/*.nupkg packageParentPath: $(Build.SourcesDirectory)/artifacts - publishVstsFeed: ${{ parameters.feedForPublishing }} + publishVstsFeed: ${{ parameters.azDOPublishFeed }} - ${{ if eq(parameters.publishToNuGet, true) }}: - task: 1ES.PublishNuget@1 displayName: 🟣 Publish packages to NuGet.org From a2afc6c4454675484371b06d4813606562781af7 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 10 Jul 2025 10:21:43 -0700 Subject: [PATCH 21/77] Run the Publish stage only when it is needed. --- eng/pipelines/official.yml | 87 +++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 43 deletions(-) diff --git a/eng/pipelines/official.yml b/eng/pipelines/official.yml index 3438628c1..89f3db8d1 100644 --- a/eng/pipelines/official.yml +++ b/eng/pipelines/official.yml @@ -118,47 +118,48 @@ extends: workloadDropNames: ${{ parameters.workloadDropNames }} primaryVsInsertionBranches: ${{ parameters.primaryVsInsertionBranches }} secondaryVsInsertionBranches: ${{ parameters.secondaryVsInsertionBranches }} - - stage: Publish - displayName: Publish - dependsOn: Build - jobs: - - deployment: PublishFeed - displayName: Publish to feed - environment: DotNet-SDK-Workloads - pool: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - templateContext: - type: releaseJob - isProduction: true - strategy: - runOnce: - deploy: - steps: - - task: 1ES.DownloadPipelineArtifact@1 - displayName: 🟣 Download build artifacts - inputs: - artifactName: Artifacts - targetPath: $(Build.SourcesDirectory)/artifacts - # 1ES docs: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs/nuget-packages - # DotNetCoreCLI@2 docs: https://learn.microsoft.com/en-us/azure/devops/pipelines/tasks/reference/dotnet-core-cli-v2 - - ${{ if eq(parameters.publishToAzDO, true) }}: - - task: 1ES.PublishNuget@1 - displayName: 🟣 Publish packages to AzDO - inputs: - useDotNetTask: true - packagesToPush: $(Build.SourcesDirectory)/artifacts/packages/**/*.nupkg - packageParentPath: $(Build.SourcesDirectory)/artifacts - publishVstsFeed: ${{ parameters.azDOPublishFeed }} - - ${{ if eq(parameters.publishToNuGet, true) }}: - - task: 1ES.PublishNuget@1 - displayName: 🟣 Publish packages to NuGet.org + - ${{ if or(eq(parameters.publishToAzDO, true), eq(parameters.publishToNuGet, true)) }}: + - stage: Publish + displayName: Publish + dependsOn: Build + jobs: + - deployment: PublishFeed + displayName: Publish to feed + environment: DotNet-SDK-Workloads + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + templateContext: + type: releaseJob + isProduction: true + strategy: + runOnce: + deploy: + steps: + - task: 1ES.DownloadPipelineArtifact@1 + displayName: 🟣 Download build artifacts inputs: - useDotNetTask: false - packagesToPush: $(Build.SourcesDirectory)/artifacts/packages/**/*.nupkg - packageParentPath: $(Build.SourcesDirectory)/artifacts - nuGetFeedType: external - publishVstsFeed: https://api.nuget.org/v3/index.json - # Service connection: https://dev.azure.com/dnceng/internal/_settings/adminservices?resourceId=479fdc43-a27d-4f5f-b2fc-5cf19dce159a - publishFeedCredentials: nuget.org (dotnetframework) + artifactName: Artifacts + targetPath: $(Build.SourcesDirectory)/artifacts + # 1ES docs: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs/nuget-packages + # DotNetCoreCLI@2 docs: https://learn.microsoft.com/en-us/azure/devops/pipelines/tasks/reference/dotnet-core-cli-v2 + - ${{ if eq(parameters.publishToAzDO, true) }}: + - task: 1ES.PublishNuget@1 + displayName: 🟣 Publish packages to AzDO + inputs: + useDotNetTask: true + packagesToPush: $(Build.SourcesDirectory)/artifacts/packages/**/*.nupkg + packageParentPath: $(Build.SourcesDirectory)/artifacts + publishVstsFeed: ${{ parameters.azDOPublishFeed }} + - ${{ if eq(parameters.publishToNuGet, true) }}: + - task: 1ES.PublishNuget@1 + displayName: 🟣 Publish packages to NuGet.org + inputs: + useDotNetTask: false + packagesToPush: $(Build.SourcesDirectory)/artifacts/packages/**/*.nupkg + packageParentPath: $(Build.SourcesDirectory)/artifacts + nuGetFeedType: external + publishVstsFeed: https://api.nuget.org/v3/index.json + # Service connection: https://dev.azure.com/dnceng/internal/_settings/adminservices?resourceId=479fdc43-a27d-4f5f-b2fc-5cf19dce159a + publishFeedCredentials: nuget.org (dotnetframework) \ No newline at end of file From e6040896bd879aa5cc358325240b8ea88c2f5a0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Jul 2025 11:35:14 -0700 Subject: [PATCH 22/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk (#461) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250715.30 Microsoft.NET.Sdk From Version 9.0.108-servicing.25317.23 -> To Version 9.0.109-servicing.25365.30 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.7 -> To Version 9.0.8 (parent: Microsoft.NET.Sdk * Update Versions.props for branding for August --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 20 ++++++-------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 10e40d96b..e57556463 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,20 +13,14 @@ - - - - + + - - - - - - + + @@ -47,10 +41,8 @@ - - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 891aff4d7..7ca28eedc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - b567cdb6b8b461de79f2a2536a22ca3a67f2f33e + 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + b1de385893698d29b537e9fae6edd4c18c2a5d4f https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b98bc862bf0857048e087aa3437d2037518fadc5 + 813d331e95df999aa64281ccd1b2c6fd2eb31826 diff --git a/eng/Versions.props b/eng/Versions.props index e424b3550..dff17fdb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 - 08 + 09 0 false @@ -44,7 +44,7 @@ - 9.0.7 + 9.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.7 + 9.0.8 $(MicrosoftNETCoreAppRefPackageVersion) From dfb729f508c209304e02707549972018716b3cf0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 10:40:49 -0700 Subject: [PATCH 23/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250718.18 (#463) Microsoft.NET.Sdk From Version 9.0.109-servicing.25365.30 -> To Version 9.0.109-servicing.25368.18 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 9.0.8 -> To Version 9.0.8 (parent: Microsoft.NET.Sdk Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 6 ++---- eng/Version.Details.xml | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index e57556463..4a6535990 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,8 +19,7 @@ - - + @@ -41,8 +40,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ca28eedc..664b4ebf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,7 +8,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b1de385893698d29b537e9fae6edd4c18c2a5d4f + aae90fa09086a9be09dac83fa66542232c7269d8 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 813d331e95df999aa64281ccd1b2c6fd2eb31826 + 08d4728191a45fec511546d838af146ecf80943f From 5c0224869a59091c1f05b02a78673e257bbf3a5d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 4 Aug 2025 14:41:23 -0700 Subject: [PATCH 24/77] Prep the 9.0.108.1 workload release for macios (#479) * Prep branding for late July macios workload release * Update to the 9214 macio version released in July --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 12 ++++++------ 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a6535990..dc0ef9ce3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,12 +14,16 @@ + + + + @@ -40,6 +44,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 664b4ebf7..14b8e30b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,21 +14,21 @@ https://github.com/dotnet/android 9abff7703206541fdb83ffa80fe2c2753ad1997b - + https://github.com/dotnet/macios - 10f1ea39eeb1b40b92112d8b8440699879433e55 + 0e1a194f0d0e2c0bdd7f36857c87b89aa7c90f98 - + https://github.com/dotnet/macios - 10f1ea39eeb1b40b92112d8b8440699879433e55 + 0e1a194f0d0e2c0bdd7f36857c87b89aa7c90f98 - + https://github.com/dotnet/macios - 10f1ea39eeb1b40b92112d8b8440699879433e55 + 0e1a194f0d0e2c0bdd7f36857c87b89aa7c90f98 - + https://github.com/dotnet/macios - 10f1ea39eeb1b40b92112d8b8440699879433e55 + 0e1a194f0d0e2c0bdd7f36857c87b89aa7c90f98 https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index dff17fdb7..d2f56de3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,8 +10,8 @@ 1 - 09 - 0 + 08 + 1 false servicing @@ -52,10 +52,10 @@ 9.0.100 35.0.78 - 18.5.9207 - 18.5.9207 - 18.5.9207 - 15.5.9207 + 18.5.9214 + 18.5.9214 + 18.5.9214 + 15.5.9214 9.0.51 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) From 9d2087e1f098c948ffd548f518968c30775338a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Aug 2025 02:02:36 +0000 Subject: [PATCH 25/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250804.7 Microsoft.NET.Sdk From Version 9.0.109-servicing.25368.18 -> To Version 9.0.110-servicing.25404.7 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14b8e30b2..9c72cb071 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08d4728191a45fec511546d838af146ecf80943f + 8ebd21370ac5acf6167a9d44fe538c9b7bef0134 From 775f761abcb33520d7efdea1051b8b8a82fe7d4a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 5 Aug 2025 10:18:44 -0700 Subject: [PATCH 26/77] Revert the runtime/emsdk version as they haven't shipped yet for August (#481) --- NuGet.config | 10 ---------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index dc0ef9ce3..661b116e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,17 +13,10 @@ - - - - - - - @@ -44,9 +37,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14b8e30b2..727993ee2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + b567cdb6b8b461de79f2a2536a22ca3a67f2f33e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 3c298d9f00936d651cc47d221762474e25277672 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08d4728191a45fec511546d838af146ecf80943f + b98bc862bf0857048e087aa3437d2037518fadc5 diff --git a/eng/Versions.props b/eng/Versions.props index d2f56de3f..008508835 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 9.0.8 + 9.0.7 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.8 + 9.0.7 $(MicrosoftNETCoreAppRefPackageVersion) From 7cd7696587ad518e24302d8b4f8b470e8c452066 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 14:02:44 -0700 Subject: [PATCH 27/77] [release/9.0.1xx] Update dependencies from dotnet/android, dotnet/macios, dotnet/maui (#468) * Update dependencies from https://github.com/dotnet/android build 9.0.80-ci.net9.25373.1+azdo.12020304 Microsoft.NET.Sdk.Android.Manifest-9.0.100 From Version 35.0.78 -> To Version 35.0.92 * Update dependencies from https://github.com/dotnet/macios build 20250716.2 Microsoft.NET.Sdk.iOS.Manifest-9.0.100 , Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100 , Microsoft.NET.Sdk.macOS.Manifest-9.0.100 , Microsoft.NET.Sdk.tvOS.Manifest-9.0.100 From Version 18.5.9207 -> To Version 18.5.9214 * Update dependencies from https://github.com/dotnet/maui build 20250730.8 Microsoft.NET.Sdk.Maui.Manifest-9.0.100 From Version 9.0.51 -> To Version 9.0.82 * Update dependencies from https://github.com/dotnet/macios build 20250724.5 Microsoft.NET.Sdk.iOS.Manifest-9.0.100 , Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100 , Microsoft.NET.Sdk.macOS.Manifest-9.0.100 , Microsoft.NET.Sdk.tvOS.Manifest-9.0.100 From Version 18.5.9207 -> To Version 18.5.9215 * Update branding for 9.0.109 and update the runtime versions to match --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 14 ++++++++++++++ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 20 ++++++++++---------- 3 files changed, 42 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 661b116e8..5716b9d33 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,27 @@ + + + + + + + + + + + @@ -37,6 +48,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 727993ee2..16bcc3ea0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + https://github.com/dotnet/emsdk - b567cdb6b8b461de79f2a2536a22ca3a67f2f33e + 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c298d9f00936d651cc47d221762474e25277672 + aae90fa09086a9be09dac83fa66542232c7269d8 - + https://github.com/dotnet/android - 9abff7703206541fdb83ffa80fe2c2753ad1997b + be1cab92326783479054e72990da08008e5be819 - + https://github.com/dotnet/macios - 0e1a194f0d0e2c0bdd7f36857c87b89aa7c90f98 + 807153429630114a7186d246285c3a4a504f23c1 - + https://github.com/dotnet/macios - 0e1a194f0d0e2c0bdd7f36857c87b89aa7c90f98 + 807153429630114a7186d246285c3a4a504f23c1 - + https://github.com/dotnet/macios - 0e1a194f0d0e2c0bdd7f36857c87b89aa7c90f98 + 807153429630114a7186d246285c3a4a504f23c1 - + https://github.com/dotnet/macios - 0e1a194f0d0e2c0bdd7f36857c87b89aa7c90f98 + 807153429630114a7186d246285c3a4a504f23c1 - + https://github.com/dotnet/maui - dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 + beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b98bc862bf0857048e087aa3437d2037518fadc5 + 08d4728191a45fec511546d838af146ecf80943f diff --git a/eng/Versions.props b/eng/Versions.props index 008508835..93a1fb34e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,8 +10,8 @@ 1 - 08 - 1 + 09 + 0 false servicing @@ -44,19 +44,19 @@ - 9.0.7 + 9.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) 9.0.100 - 35.0.78 - 18.5.9214 - 18.5.9214 - 18.5.9214 - 15.5.9214 - 9.0.51 + 35.0.92 + 18.5.9215 + 18.5.9215 + 18.5.9215 + 15.5.9215 + 9.0.82 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) $(MicrosoftNETSdkiOSManifest90100PackageVersion) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.7 + 9.0.8 $(MicrosoftNETCoreAppRefPackageVersion) From 4872aec60548a3d10e5da1f1f530e4694ba32893 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Aug 2025 02:02:25 +0000 Subject: [PATCH 28/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250806.15 Microsoft.NET.Sdk From Version 9.0.109-servicing.25368.18 -> To Version 9.0.110-servicing.25406.15 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c72cb071..47fcd6504 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8ebd21370ac5acf6167a9d44fe538c9b7bef0134 + d598b9805ac1028f5d53125d335fc468d92200a8 From 276cc3ceed02597bfbfe7449994c65cffb05cbc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Aug 2025 02:03:39 +0000 Subject: [PATCH 29/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250807.6 Microsoft.NET.Sdk From Version 9.0.109-servicing.25368.18 -> To Version 9.0.110-servicing.25407.6 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 47fcd6504..fe178a8b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d598b9805ac1028f5d53125d335fc468d92200a8 + 7e80994b48118d3189245d8d65e9520f182f5707 From c74e4701d9463af5c6b1901a7b7f5c9d8b3488f3 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 8 Aug 2025 17:24:14 -0700 Subject: [PATCH 30/77] Aligning repo contents for centralized CI usage. --- .config/CredScanSuppressions.json | 4 + Directory.Build.props | 16 -- Directory.Build.targets | 10 -- {documentation => doc}/release-process.md | 0 eng/Publishing.props | 9 - eng/Signing.props | 17 -- eng/common/SetupNugetSources.ps1 | 4 +- eng/common/SetupNugetSources.sh | 4 +- eng/common/core-templates/job/job.yml | 8 +- eng/common/core-templates/job/onelocbuild.yml | 6 +- .../job/publish-build-assets.yml | 6 +- .../job/source-index-stage1.yml | 2 +- .../core-templates/jobs/codeql-build.yml | 2 +- .../core-templates/post-build/post-build.yml | 8 +- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +- .../core-templates/steps/generate-sbom.yml | 2 +- .../core-templates/steps/publish-logs.yml | 14 +- .../core-templates/steps/source-build.yml | 4 +- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +- eng/create-workload-drops.ps1 | 91 ---------- eng/download-workloads.ps1 | 97 ---------- eng/pipelines/official.yml | 165 ------------------ eng/pipelines/public.yml | 43 ++--- .../templates/jobs/workload-build.yml | 112 ------------ .../templates/steps/workload-insertion.yml | 51 ------ .../GenerateTestWorkloadSets.csproj | 14 -- src/GenerateTestWorkloadSets/Program.cs | 45 ----- .../ReleasedWorkloadVersions.cs | 72 -------- .../SdkFeatureBand.cs | 69 -------- .../WorkloadSetInfo.cs | 129 -------------- .../WorkloadSetVersion.cs | 64 ------- .../Microsoft.NET.Workloads.Vsman.csproj | 23 --- .../Microsoft.NET.Workloads.Vsman.vsmanproj | 19 -- .../Microsoft.NET.Workloads.csproj | 162 ----------------- src/Microsoft.NET.Workloads/README.md | 3 - src/Microsoft.NET.Workloads/workloads.props | 30 ---- workload-versions.sln | 42 ----- 41 files changed, 58 insertions(+), 1313 deletions(-) create mode 100644 .config/CredScanSuppressions.json delete mode 100644 Directory.Build.props delete mode 100644 Directory.Build.targets rename {documentation => doc}/release-process.md (100%) delete mode 100644 eng/Publishing.props delete mode 100644 eng/Signing.props delete mode 100644 eng/create-workload-drops.ps1 delete mode 100644 eng/download-workloads.ps1 delete mode 100644 eng/pipelines/official.yml delete mode 100644 eng/pipelines/templates/jobs/workload-build.yml delete mode 100644 eng/pipelines/templates/steps/workload-insertion.yml delete mode 100644 src/GenerateTestWorkloadSets/GenerateTestWorkloadSets.csproj delete mode 100644 src/GenerateTestWorkloadSets/Program.cs delete mode 100644 src/GenerateTestWorkloadSets/ReleasedWorkloadVersions.cs delete mode 100644 src/GenerateTestWorkloadSets/SdkFeatureBand.cs delete mode 100644 src/GenerateTestWorkloadSets/WorkloadSetInfo.cs delete mode 100644 src/GenerateTestWorkloadSets/WorkloadSetVersion.cs delete mode 100644 src/Microsoft.NET.Workloads.Vsman/Microsoft.NET.Workloads.Vsman.csproj delete mode 100644 src/Microsoft.NET.Workloads.Vsman/Microsoft.NET.Workloads.Vsman.vsmanproj delete mode 100644 src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj delete mode 100644 src/Microsoft.NET.Workloads/README.md delete mode 100644 src/Microsoft.NET.Workloads/workloads.props delete mode 100644 workload-versions.sln diff --git a/.config/CredScanSuppressions.json b/.config/CredScanSuppressions.json new file mode 100644 index 000000000..0e52eb402 --- /dev/null +++ b/.config/CredScanSuppressions.json @@ -0,0 +1,4 @@ +{ + "tool": "Credential Scanner", + "suppressions": [] +} diff --git a/Directory.Build.props b/Directory.Build.props deleted file mode 100644 index e747638d0..000000000 --- a/Directory.Build.props +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - net8.0 - $(CopyrightNetFoundation) - MIT - false - Latest - true - - true - - - \ No newline at end of file diff --git a/Directory.Build.targets b/Directory.Build.targets deleted file mode 100644 index 817af988c..000000000 --- a/Directory.Build.targets +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - $(WorkloadsVersion)-$(VersionSuffix) - - - \ No newline at end of file diff --git a/documentation/release-process.md b/doc/release-process.md similarity index 100% rename from documentation/release-process.md rename to doc/release-process.md diff --git a/eng/Publishing.props b/eng/Publishing.props deleted file mode 100644 index 08c01668b..000000000 --- a/eng/Publishing.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - 3 - - - \ No newline at end of file diff --git a/eng/Signing.props b/eng/Signing.props deleted file mode 100644 index 4cd7aa30f..000000000 --- a/eng/Signing.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - MicrosoftDotNet500 - - - - - - - - - - - diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71e..792b60b49 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b0..facb415ca 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0..5ad083cd3 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -164,7 +164,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -187,7 +187,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -198,7 +198,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -242,7 +242,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 00feec8eb..edefa789d 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -115,7 +115,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' + pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' publishLocation: Container artifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e31..86aa7a0b8 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -93,7 +93,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net @@ -113,7 +113,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -142,7 +142,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 8b833332b..662b9fcce 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -66,7 +66,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index f2144252c..4571a7864 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -25,7 +25,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a8c0bd3b9..2ee8bbfff 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -149,7 +149,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -206,7 +206,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -256,7 +256,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -311,7 +311,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980d..a7abd58c4 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bff..4085512b6 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 56a090094..7f5b84c4c 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 80788c523..0623ac6e1 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -42,7 +42,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 37133b55b..730f7ab2b 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -97,7 +97,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,5 +126,5 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded..4bf4cf41b 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 817555505..81ea7a261 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a..f1311bbb1 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index d1aeb92fc..5bdd3dd85 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -75,7 +75,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/eng/create-workload-drops.ps1 b/eng/create-workload-drops.ps1 deleted file mode 100644 index 168f0a8df..000000000 --- a/eng/create-workload-drops.ps1 +++ /dev/null @@ -1,91 +0,0 @@ -# Using the downloaded workloads, this creates the VS drops to upload for VS insertion. -# It builds the Microsoft.NET.Workloads.Vsman.vsmanproj per workload ZIP, which creates the appropriate VSMAN file. - -# $workloadPath: The path to the directory containing the workload ZIPs, usually the output path used by DARC in the download-workloads.ps1 script. -# - Example Value: "$(RepoRoot)artifacts\workloads" -# $msBuildToolsPath: The path to the MSBuild tools directory, generally $(MSBuildToolsPath) in MSBuild. -# - Example Value: 'C:\Program Files\Microsoft Visual Studio\2022\Preview\MSBuild\Current\Bin' - -param ([Parameter(Mandatory=$true)] [string] $workloadPath, [Parameter(Mandatory=$true)] [string] $msBuildToolsPath) - -# Extracts the workload drop zips. -$workloads = Get-ChildItem $workloadPath -Include 'Workload.VSDrop.*.zip' -Recurse -$workloadDropPath = (New-Item "$workloadPath\drops" -Type Container -Force).FullName -$null = $workloads | ForEach-Object { Expand-Archive -Path $_.FullName -DestinationPath "$workloadDropPath\$([IO.Path]::GetFileNameWithoutExtension($_.Name))" -Force } - -# Extracts the workload drop metadata from the drop name and builds the .vsmanproj project. -# - full: The full drop name, excluding the 'Workload.VSDrop.' prefix. -# - short: The short name of the drop. Only contains the first word after 'Workload.VSDrop.'. -# - type: Either 'pre.components', 'components', or 'packs'. -$dropInfoRegex = '^Workload\.VSDrop\.(?(?\w*)\..*?(?(pre\.)?components$|packs$))' -$primaryVSComponentJsonValues = '' -$secondaryVSComponentJsonValues = '' -Get-ChildItem -Path $workloadDropPath -Directory | ForEach-Object { - $null = $_.Name -match $dropInfoRegex - $assemblyName = "$($Matches.full)" - $dropDir = "$($_.FullName)\" - - # Hash the files within the drop folder to create a unique identifier that represents this workload drop. - # Example: 1E3EA4FE202394037253F57436A6EAD5DE1359792B618B9072014A98563A30FB - # See: https://learn.microsoft.com/powershell/module/microsoft.powershell.utility/get-filehash#example-4-compute-the-hash-of-a-string - $contentStream = [System.IO.MemoryStream]::new() - $writer = [System.IO.StreamWriter]::new($contentStream) - $dropFiles = Get-ChildItem -Path $dropDir | Sort-Object - # Note: We're using ASCII because when testing between PS 5.1 and PS 7.5, this would result in the same hash. Other encodings arrived at different hashes. - $null = $dropFiles | Get-Content -Encoding ASCII -Raw | ForEach-Object { $writer.Write($_) } - $writer.Flush() - $contentStream.Position = 0 - $dropHash = (Get-FileHash -InputStream $contentStream).Hash - $writer.Close() - - $vsDropName = "Products/dotnet/workloads/$assemblyName/$dropHash" - # Reads the first line out of the .metadata file in the workload's output folder and sets it to the workload version. - $workloadVersion = Get-Content "$dropDir.metadata" -First 1 - # This requires building via MSBuild.exe as there are .NET Framework dependencies necessary for building the .vsmanproj. - # Additionally, even using the MSBuild task won't work as '/restore' must be used for it to restore properly when building the .vsmanproj. - & "$msBuildToolsPath\MSBuild.exe" Microsoft.NET.Workloads.Vsman.vsmanproj /restore /t:Build ` - /p:AssemblyName=$assemblyName ` - /p:VstsDropNames=$vsDropName ` - /p:VsixOutputPath=$dropDir ` - /p:WorkloadVersion=$workloadVersion - - # While in CI, set the variables necessary for uploading the VS drop. - if ($env:TF_BUILD) { - $shortName = "$($Matches.short)" - # Remove the '.' from 'pre.components' - $dropType = $Matches.type.Replace('.', '') - $dropUrl = "https://vsdrop.microsoft.com/file/v1/$vsDropName;$assemblyName.vsman" - - Write-Host "##vso[task.setvariable variable=$($shortName)_$($dropType)_name]$vsDropName" - Write-Host "##vso[task.setvariable variable=$($shortName)_$($dropType)_dir]$dropDir" - Write-Host "##vso[task.setvariable variable=$($shortName)_$($dropType)_url]$dropUrl" - - # Each vsman file is comma-separated. First .vsman is destination and the second is source. - $vsComponentValue = "$assemblyName.vsman{$workloadVersion}=$dropUrl," - # All VS components are added to the primary VS component JSON string. - $primaryVSComponentJsonValues += $vsComponentValue - - # Secondary VS components do not include (pre)components drop types. - if ($dropType -ne 'components' -and $dropType -ne 'precomponents') { - $secondaryVSComponentJsonValues += $vsComponentValue - } - } - - Write-Host '⚠︎ After upload, your workload drop will be available at:' - Write-Host "https://devdiv.visualstudio.com/_apps/hub/ms-vscs-artifact.build-tasks.drop-hub-group-explorer-hub?name=$vsDropName" -} - -# Clean up intermediate build files in the workload drop folders. -$null = Get-ChildItem -Path $workloadDropPath -Include *.json, *.vsmand, files.txt -Recurse | Remove-Item - -# Write the primary and secondary component strings for the vsman files to a variable for the pipeline to use for the VS insertion step. -if ($primaryVSComponentJsonValues) { - # Remove the trailing comma. - $primaryVSComponentJsonValues = $primaryVSComponentJsonValues -replace '.$' - Write-Host "##vso[task.setvariable variable=PrimaryVSComponentJsonValues]$primaryVSComponentJsonValues" -} -if ($secondaryVSComponentJsonValues) { - # Remove the trailing comma. - $secondaryVSComponentJsonValues = $secondaryVSComponentJsonValues -replace '.$' - Write-Host "##vso[task.setvariable variable=SecondaryVSComponentJsonValues]$secondaryVSComponentJsonValues" -} \ No newline at end of file diff --git a/eng/download-workloads.ps1 b/eng/download-workloads.ps1 deleted file mode 100644 index 8a2a018e2..000000000 --- a/eng/download-workloads.ps1 +++ /dev/null @@ -1,97 +0,0 @@ -# This downloads the workloads using DARC. -# In CI, we need to pass PATs to this, so it runs in Azure Pipelines only (not through MSBuild). -# For local builds, some preconfiguration is necessary. Check the README.md for details. - -# $workloadPath: The path to the directory as output for the workload ZIPs. This is --output-dir in the DARC command. -# - Example Value: "$(RepoRoot)artifacts\workloads" -# $gitHubPat: The GitHub PAT to use for DARC (CI build only). See workload-build.yml for converting the PAT to SecureString. -# $azDOPat: The Azure DevOps PAT to use for DARC (CI build only). See workload-build.yml for converting the PAT to SecureString. -# $workloadListJson: The JSON string of the list of workload drop names to download. If not provided, all workloads found in Version.Details.xml will be downloaded. -# - See the workloadDropNames parameter in official.yml for the list generally passed to this script. -# - Example Value: '{["emsdk","mono"]}' -# $usePreComponents: -# - If $true, includes *pre.components.zip drops and excludes *components.zip drops. -# - If $false, excludes *pre.components.zip drops and includes *components.zip drops. -# $includeNonShipping: -# - If $true, includes workloads that are in the 'non-shipping' folder. -# - If $false, excludes workloads that are in the 'non-shipping' folder. - -param ([Parameter(Mandatory=$true)] [string] $workloadPath, [SecureString] $gitHubPat, [SecureString] $azDOPat, [string] $workloadListJson = '', [bool] $usePreComponents = $false, [bool] $includeNonShipping = $false) - -### Local Build ### -# Local build requires the installation of DARC. See: https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#setting-up-your-darc-client -$darc = 'darc' -$ciArguments = @() -$ci = $gitHubPat -and $azDOPat - -### CI Build ### -if ($ci) { - # Darc access copied from: eng/common/post-build/publish-using-darc.ps1 - $disableConfigureToolsetImport = $true - . $PSScriptRoot\common\tools.ps1 - - $darc = Get-Darc - $gitHubPatPlain = ConvertFrom-SecureString -SecureString $gitHubPat -AsPlainText - $azDOPatPlain = ConvertFrom-SecureString -SecureString $azDOPat -AsPlainText - $ciArguments = @( - '--ci' - '--github-pat' - $gitHubPatPlain - '--azdev-pat' - $azDOPatPlain - ) -} - -# Reads the Version.Details.xml file to get the workload builds. -$versionDetailsPath = (Get-Item "$PSScriptRoot\Version.Details.xml").FullName -$versionDetailsXml = [Xml.XmlDocument](Get-Content $versionDetailsPath) -$versionDetails = $versionDetailsXml.Dependencies.ProductDependencies.Dependency | Select-Object -Property Uri, Sha -Unique - -# Construct the asset filter to only download the required workload drops. -$workloadFilter = '' -if ($workloadListJson) { - $workloadList = ConvertFrom-Json -InputObject $workloadListJson - if ($workloadList.Count -ne 0) { - $workloadFilter = "($($workloadList | Join-String -Separator '|'))" - } -} -# Note: The $ at the end of these filters are required for the positive/negative lookbehinds to function. -# Exclude pre.components.zip. -$componentFilter = '(?- - eng/common/build.ps1 - -restore -build -pack -ci -msbuildEngine vs - -configuration $(_BuildConfig) - /p:DotNetSignType=$(_SignType) - /p:TeamName=$(_TeamName) - displayName: 🟣 Build solution \ No newline at end of file +- template: /eng/pipelines/templates/stages/workload-public-build.yml@eng \ No newline at end of file diff --git a/eng/pipelines/templates/jobs/workload-build.yml b/eng/pipelines/templates/jobs/workload-build.yml deleted file mode 100644 index 76dbfa825..000000000 --- a/eng/pipelines/templates/jobs/workload-build.yml +++ /dev/null @@ -1,112 +0,0 @@ -parameters: - # These types match the types handled in create-workload-drops.ps1. There is a RegEx in that script that parses the workload type out of the workload path. - # If this list needs to be updated, the RegEx in the script also needs to be updated. - # The hardcoded list here is necessary as these types need to be available during compilation of the pipeline. - # The workload types become separate variables in the create-workload-drops.ps1 and this list is looped over to create multiple drop tasks. - workloadDropTypes: - - components - - packs - - precomponents - -jobs: -# Note: jobs.yml automatically includes the Publish Assets job for pushing the artifacts to DARC. -- template: /eng/common/templates-official/jobs/jobs.yml - parameters: - enableMicrobuild: true - enablePublishBuildAssets: true - enableTelemetry: true - enablePublishUsingPipelines: true - publishAssetsImmediately: true - enableSbom: true - artifacts: - publish: - artifacts: - name: Artifacts - logs: - name: Logs - manifests: true - jobs: - - job: buildRepo - displayName: Build Repo - timeoutInMinutes: 120 - pool: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - steps: - - ${{ if eq(parameters.createVSInsertion, true) }}: - - task: AzureCLI@2 - displayName: 🟣 Download workloads for VS insertion - inputs: - azureSubscription: DotNetStaging - scriptType: pscore - scriptPath: $(Build.SourcesDirectory)/eng/download-workloads.ps1 - # Note: The second $ for usePreComponents and includeNonShipping allows the value to resolve as `$true` or `$false`. - arguments: >- - -workloadPath '$(Build.SourcesDirectory)/artifacts/workloads' - -gitHubPat (ConvertTo-SecureString -String '$(BotAccount-dotnet-bot-repo-PAT)' -AsPlainText -Force) - -azDOPat (ConvertTo-SecureString -String '$(dn-bot-all-drop-rw-code-rw-release-all)' -AsPlainText -Force) - -workloadListJson '${{ convertToJson(parameters.workloadDropNames) }}' - -usePreComponents:$${{ parameters.usePreComponentsForVSInsertion }} - -includeNonShipping:$${{ parameters.includeNonShippingWorkloads }} - - # https://github.com/dotnet/arcade/blob/ccae251ef033746eb0213329953f5e3c1687693b/Documentation/CorePackages/Publishing.md#basic-onboarding-scenario-for-new-repositories-to-the-current-publishing-version-v3 - - powershell: >- - eng/common/build.ps1 - -restore -build -sign -pack -publish -ci -msbuildEngine vs - -configuration $(_BuildConfig) - /p:CreateVSInsertion=${{ parameters.createVSInsertion }} - /p:WorkloadDirectory=$(Build.SourcesDirectory)/artifacts/workloads - /p:DotNetSignType=$(_SignType) - /p:TeamName=$(_TeamName) - /p:DotNetPublishUsingPipelines=true - /p:OfficialBuildId=$(Build.BuildNumber) - /p:StabilizePackageVersion=${{ parameters.stabilizePackageVersion }} - displayName: 🟣 Build solution - - - ${{ if eq(parameters.createVSInsertion, true) }}: - # The variables comprised of workloadShortName and workloadType are set during create-workload-drops.ps1 in Microsoft.NET.Workloads.Vsman.csproj. - - ${{ each workloadShortName in parameters.workloadDropNames }}: - - ${{ each workloadType in parameters.workloadDropTypes }}: - # Only create the drop if the workload drop directory exists. - # Sets the PublishWorkloadDrop variable. See: https://stackoverflow.com/a/60630739/294804 - - pwsh: | - # If the drop folder doesn't exist (not downloaded via DARC), the drop cannot be published. - if (-not (Test-Path -Path '$(${{ workloadShortName }}_${{ workloadType }}_dir)')) { - Write-Host "##vso[task.setvariable variable=PublishWorkloadDrop]False" - Write-Host 'Drop "${{ workloadShortName }}_${{ workloadType }}" was not downloaded via DARC. Skipping VS drop publish...' - return - } - Write-Host "PublishWorkloadDrop: True" - Write-Host "##vso[task.setvariable variable=PublishWorkloadDrop]True" - displayName: 🟣 Check if ${{ workloadShortName }}_${{ workloadType }} needs published - - # Docs: https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs/microbuild-vsts-drop - # YAML reference (original task): https://dev.azure.com/devdiv/Engineering/_git/MicroBuild?path=/src/Tasks/UploadDrop/task.json - - task: 1ES.MicroBuildVstsDrop@1 - displayName: '🟣 Publish VS insertion drop: ${{ workloadShortName }}_${{ workloadType }}' - inputs: - dropFolder: $(${{ workloadShortName }}_${{ workloadType }}_dir) - dropName: $(${{ workloadShortName }}_${{ workloadType }}_name) - # See: https://dev.azure.com/devdiv/DevDiv/_wiki/wikis/DevDiv.wiki/35351/Retain-Drops - dropRetentionDays: 183 - accessToken: $(dn-bot-devdiv-drop-rw-code-rw) - skipUploadIfExists: true - condition: eq(variables['PublishWorkloadDrop'], 'True') - - - ${{ each primaryInsertionBranch in parameters.primaryVsInsertionBranches }}: - # One PR is created per branch defined at the top of this file in the primaryVsInsertionBranches parameter. - - template: /eng/pipelines/templates/steps/workload-insertion.yml@self - parameters: - targetBranch: ${{ primaryInsertionBranch }} - topicBranch: ${{ parameters.vsTopicBranch }} - # PrimaryVSComponentJsonValues variable is set during create-workload-drops.ps1 in Microsoft.NET.Workloads.Vsman.csproj. - componentJsonValues: $(PrimaryVSComponentJsonValues) - - ${{ each secondaryInsertionBranch in parameters.secondaryVsInsertionBranches }}: - # One PR is created per branch defined at the top of this file in the secondaryVsInsertionBranches parameter. - - template: /eng/pipelines/templates/steps/workload-insertion.yml@self - parameters: - targetBranch: ${{ secondaryInsertionBranch }} - topicBranch: ${{ parameters.vsTopicBranch }} - # SecondaryVSComponentJsonValues variable is set during create-workload-drops.ps1 in Microsoft.NET.Workloads.Vsman.csproj. - componentJsonValues: $(SecondaryVSComponentJsonValues) \ No newline at end of file diff --git a/eng/pipelines/templates/steps/workload-insertion.yml b/eng/pipelines/templates/steps/workload-insertion.yml deleted file mode 100644 index 4876a777a..000000000 --- a/eng/pipelines/templates/steps/workload-insertion.yml +++ /dev/null @@ -1,51 +0,0 @@ -parameters: - targetBranch: main - topicBranch: '' - componentJsonValues: '' - -steps: -# This allows setting the InsertionTopicBranch variable dynamically. -# |default| represents normal operation, set to: temp/{team}/{target}/yyyy-MM -# |temp| is only for pipeline testing, set to: temp/{team}/{target}/BuildNumber-JobAttempt -- pwsh: | - $topicBranch = '${{ parameters.topicBranch }}' - if ($topicBranch -eq '|default|') { - # Starting with 'temp' allows this branch to be cleaned up automatically by the VS repo branch policies. - $topicBranch = "temp/$(_TeamName)/${{ parameters.targetBranch }}/$((Get-Date).ToString('yyyy-MM'))" - } - # Loosely based on: - # https://devdiv.visualstudio.com/Engineering/_git/MicroBuild?path=/src/Tasks/InsertVsPayload/plugin.ps1&version=GCf10314b240d5f3d0899e80eb2feb5dc33b5f8c20&line=276&lineEnd=280&lineStartColumn=1&lineEndColumn=1&lineStyle=plain&_a=contents - if ($topicBranch -eq '|temp|') { - $topicBranch = 'temp/$(_TeamName)/${{ parameters.targetBranch }}/$(Build.BuildNumber)-$(System.JobAttempt)' - } - Write-Host "InsertionTopicBranch: $topicBranch" - Write-Host "##vso[task.setvariable variable=InsertionTopicBranch]$topicBranch" - displayName: 🟣 Set InsertionTopicBranch variable -# Creates VS insertion PRs using the VS drops containing the workloads and vsman files. -# Documentation: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/635/Overview?anchor=**build-pipeline** -# YAML reference: https://dev.azure.com/devdiv/Engineering/_git/MicroBuild?path=/src/Tasks/InsertVsPayload/task.json -- task: MicroBuildInsertVsPayload@5 - displayName: '🟣 Create VS insertion: ${{ parameters.targetBranch }}' - inputs: - # Connection: https://dnceng.visualstudio.com/internal/_settings/adminservices?resourceId=5708f1c1-8fb7-4722-a643-020cf89ee26f - # Docs: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/40477/Insert-with-a-WIF-Service-Connection - ConnectedServiceName: MicroBuildInsertionVS - TargetBranch: ${{ parameters.targetBranch }} - InsertionTopicBranch: $(InsertionTopicBranch) - TeamName: $(_TeamName) - TeamEmail: dotnetdevexcli@microsoft.com - InsertionPayloadName: 'DotNet-SDK-Workloads ($(Build.SourceBranchName):$(Build.BuildNumber))' - ComponentJsonValues: ${{ parameters.componentJsonValues }} - AllowTopicBranchUpdate: true - # This is the name of our DevDiv alias. - InsertionReviewers: Dotnet Core SDK and CLI - InsertionBuildPolicies: Request Perf DDRITs - # Documentation: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/631/Copy-Commit-Details-to-PR - AddCommitsToPR: true - # Documentation: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/634/Link-Work-Items-to-PR - LinkWorkItemsToPR: false - # Documentation: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/638/Set-AutoComplete-on-an-Insertion - InsertAutoComplete: true - env: - # This is required. See: https://devdiv.visualstudio.com/DevDiv/_wiki/wikis/DevDiv.wiki/40477/Insert-with-a-WIF-Service-Connection?anchor=steps-to-use-a-wif-service-connection-in-the-insert-vs-task - SYSTEM_ACCESSTOKEN: $(System.AccessToken) \ No newline at end of file diff --git a/src/GenerateTestWorkloadSets/GenerateTestWorkloadSets.csproj b/src/GenerateTestWorkloadSets/GenerateTestWorkloadSets.csproj deleted file mode 100644 index 246bc2d99..000000000 --- a/src/GenerateTestWorkloadSets/GenerateTestWorkloadSets.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - Exe - net9.0 - enable - annotations - - - - - - - diff --git a/src/GenerateTestWorkloadSets/Program.cs b/src/GenerateTestWorkloadSets/Program.cs deleted file mode 100644 index 9d394baff..000000000 --- a/src/GenerateTestWorkloadSets/Program.cs +++ /dev/null @@ -1,45 +0,0 @@ -// See https://aka.ms/new-console-template for more information -using GenerateTestWorkloadSets; -using System.Text; - -List workloadSetsToCreate = [ - new WorkloadSetInfo("9.0.100", ReleasedWorkloadVersions.Rollback9_0_100_preview7_24414_1), - new WorkloadSetInfo("9.0.101-servicing.preview.1", ReleasedWorkloadVersions.Rollback9_0_100_preview7_and_rc1), - new WorkloadSetInfo("9.0.101", ReleasedWorkloadVersions.Rollback9_0_100_rc1_24453_3) - ]; - -StringBuilder buildScript = new StringBuilder(); - -foreach (var workloadSetInfo in workloadSetsToCreate) -{ - ProcessWorkloadSet(workloadSetInfo, buildScript, Environment.CurrentDirectory); -} - -buildScript.AppendLine("@echo Done"); - -buildScript.AppendLine(); -buildScript.AppendLine(":End"); - - -var buildScriptPath = Path.GetFullPath("buildWorkloads.bat"); - -File.WriteAllText(buildScriptPath, buildScript.ToString()); - -Console.WriteLine("Build script path: " + buildScriptPath); - - -void ProcessWorkloadSet(WorkloadSetInfo workloadSetInfo, StringBuilder buildScript, string outputPath) -{ - string workloadsPropsOutput = Path.Combine(outputPath, $"workloads-{workloadSetInfo.WorkloadSetVersion}.props"); - File.WriteAllText(workloadsPropsOutput, workloadSetInfo.ToWorkloadsProps()); - - List buildArgs = [ - ..WorkloadSetProperties.CreateFromWorkloadSetVersion(workloadSetInfo.WorkloadSetVersion).CreateCommandLineArgs(), - $"/p:WorkloadsProps={workloadsPropsOutput}", - ]; - - buildScript.AppendLine("@echo Building workload set " + workloadSetInfo.WorkloadSetVersion); - buildScript.AppendLine("call build -bl " + string.Join(' ', buildArgs)); - buildScript.AppendLine("IF ERRORLEVEL 1 GOTO END"); - buildScript.AppendLine(); -} \ No newline at end of file diff --git a/src/GenerateTestWorkloadSets/ReleasedWorkloadVersions.cs b/src/GenerateTestWorkloadSets/ReleasedWorkloadVersions.cs deleted file mode 100644 index 846073835..000000000 --- a/src/GenerateTestWorkloadSets/ReleasedWorkloadVersions.cs +++ /dev/null @@ -1,72 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace GenerateTestWorkloadSets -{ - internal class ReleasedWorkloadVersions - { - public static string Rollback9_0_100_preview7_24414_1 = """ - { - "Microsoft.NET.Workload.Emscripten.Current": "9.0.0-preview.7.24373.5/9.0.100-preview.7", - "Microsoft.NET.Workload.Emscripten.net6": "9.0.0-preview.7.24373.5/9.0.100-preview.7", - "Microsoft.NET.Workload.Emscripten.net7": "9.0.0-preview.7.24373.5/9.0.100-preview.7", - "Microsoft.NET.Workload.Emscripten.net8": "9.0.0-preview.7.24373.5/9.0.100-preview.7", - "Microsoft.NET.Sdk.Android": "35.0.0-preview.7.41/9.0.100-preview.7", - "Microsoft.NET.Sdk.iOS": "17.5.9231-net9-p7/9.0.100-preview.7", - "Microsoft.NET.Sdk.MacCatalyst": "17.5.9231-net9-p7/9.0.100-preview.7", - "Microsoft.NET.Sdk.macOS": "14.5.9231-net9-p7/9.0.100-preview.7", - "Microsoft.NET.Sdk.Maui": "9.0.0-preview.7.24407.4/9.0.100-preview.7", - "Microsoft.NET.Sdk.tvOS": "17.5.9231-net9-p7/9.0.100-preview.7", - "Microsoft.NET.Workload.Mono.ToolChain.Current": "9.0.0-preview.7.24405.7/9.0.100-preview.7", - "Microsoft.NET.Workload.Mono.ToolChain.net6": "9.0.0-preview.7.24405.7/9.0.100-preview.7", - "Microsoft.NET.Workload.Mono.ToolChain.net7": "9.0.0-preview.7.24405.7/9.0.100-preview.7", - "Microsoft.NET.Workload.Mono.ToolChain.net8": "9.0.0-preview.7.24405.7/9.0.100-preview.7", - "Microsoft.NET.Sdk.Aspire": "8.1.0/8.0.100" - } - """; - - // A combination of preview 7 and rc1 manifest versions - public static string Rollback9_0_100_preview7_and_rc1 = """ - { - "Microsoft.NET.Workload.Emscripten.Current": "9.0.0-preview.7.24373.5/9.0.100-preview.7", - "Microsoft.NET.Workload.Emscripten.net6": "9.0.0-preview.7.24373.5/9.0.100-preview.7", - "Microsoft.NET.Workload.Emscripten.net7": "9.0.0-preview.7.24373.5/9.0.100-preview.7", - "Microsoft.NET.Workload.Emscripten.net8": "9.0.0-preview.7.24373.5/9.0.100-preview.7", - "Microsoft.NET.Sdk.Android": "35.0.0-preview.7.41/9.0.100-preview.7", - "Microsoft.NET.Sdk.iOS": "17.5.9231-net9-p7/9.0.100-preview.7", - "Microsoft.NET.Sdk.MacCatalyst": "17.5.9231-net9-p7/9.0.100-preview.7", - "Microsoft.NET.Sdk.macOS": "14.5.9231-net9-p7/9.0.100-preview.7", - "Microsoft.NET.Sdk.Maui": "9.0.0-preview.7.24407.4/9.0.100-preview.7", - "Microsoft.NET.Sdk.tvOS": "17.5.9231-net9-p7/9.0.100-preview.7", - "Microsoft.NET.Workload.Mono.ToolChain.Current": "9.0.0-preview.7.24405.7/9.0.100-preview.7", - "Microsoft.NET.Workload.Mono.ToolChain.net6": "9.0.0-preview.7.24405.7/9.0.100-preview.7", - "Microsoft.NET.Workload.Mono.ToolChain.net7": "9.0.0-preview.7.24405.7/9.0.100-preview.7", - "Microsoft.NET.Workload.Mono.ToolChain.net8": "9.0.0-preview.7.24405.7/9.0.100-preview.7", - "Microsoft.NET.Sdk.Aspire": "8.2.0/8.0.100" - } - """; - - public static string Rollback9_0_100_rc1_24453_3 = """ - { - "Microsoft.NET.Workload.Emscripten.Current": "9.0.0-rc.1.24430.3/9.0.100-rc.1", - "Microsoft.NET.Workload.Emscripten.net6": "9.0.0-rc.1.24430.3/9.0.100-rc.1", - "Microsoft.NET.Workload.Emscripten.net7": "9.0.0-rc.1.24430.3/9.0.100-rc.1", - "Microsoft.NET.Workload.Emscripten.net8": "9.0.0-rc.1.24430.3/9.0.100-rc.1", - "Microsoft.NET.Sdk.Android": "35.0.0-rc.1.80/9.0.100-rc.1", - "Microsoft.NET.Sdk.iOS": "17.5.9270-net9-rc1/9.0.100-rc.1", - "Microsoft.NET.Sdk.MacCatalyst": "17.5.9270-net9-rc1/9.0.100-rc.1", - "Microsoft.NET.Sdk.macOS": "14.5.9270-net9-rc1/9.0.100-rc.1", - "Microsoft.NET.Sdk.Maui": "9.0.0-rc.1.24453.9/9.0.100-rc.1", - "Microsoft.NET.Sdk.tvOS": "17.5.9270-net9-rc1/9.0.100-rc.1", - "Microsoft.NET.Workload.Mono.ToolChain.Current": "9.0.0-rc.1.24431.7/9.0.100-rc.1", - "Microsoft.NET.Workload.Mono.ToolChain.net6": "9.0.0-rc.1.24431.7/9.0.100-rc.1", - "Microsoft.NET.Workload.Mono.ToolChain.net7": "9.0.0-rc.1.24431.7/9.0.100-rc.1", - "Microsoft.NET.Workload.Mono.ToolChain.net8": "9.0.0-rc.1.24431.7/9.0.100-rc.1", - "Microsoft.NET.Sdk.Aspire": "8.2.0/8.0.100" - } - """; - } -} diff --git a/src/GenerateTestWorkloadSets/SdkFeatureBand.cs b/src/GenerateTestWorkloadSets/SdkFeatureBand.cs deleted file mode 100644 index 336f5d0f1..000000000 --- a/src/GenerateTestWorkloadSets/SdkFeatureBand.cs +++ /dev/null @@ -1,69 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using Microsoft.Deployment.DotNet.Releases; - -namespace Microsoft.NET.Sdk.WorkloadManifestReader -{ - public struct SdkFeatureBand : IEquatable, IComparable - { - private ReleaseVersion _featureBand; - - public SdkFeatureBand(string? version) : this(new ReleaseVersion(version) ?? throw new ArgumentNullException(nameof(version))) { } - - public SdkFeatureBand(ReleaseVersion version) - { - var fullVersion = version ?? throw new ArgumentNullException(nameof(version)); - if (string.IsNullOrEmpty(version.Prerelease) || version.Prerelease.Contains("dev") || version.Prerelease.Contains("ci") || version.Prerelease.Contains("rtm")) - { - _featureBand = new ReleaseVersion(fullVersion.Major, fullVersion.Minor, fullVersion.SdkFeatureBand); - } - else - { - // Treat preview versions as their own feature bands - var prereleaseComponents = fullVersion.Prerelease.Split('.'); - var formattedPrerelease = prereleaseComponents.Length > 1 ? - $"{prereleaseComponents[0]}.{prereleaseComponents[1]}" - : prereleaseComponents[0]; - _featureBand = new ReleaseVersion(fullVersion.Major, fullVersion.Minor, fullVersion.SdkFeatureBand, formattedPrerelease); - } - } - - public int Major => _featureBand.Major; - public int Minor => _featureBand.Minor; - - public bool Equals(SdkFeatureBand other) - { - return _featureBand.Equals(other._featureBand); - } - - public int CompareTo(SdkFeatureBand other) - { - return _featureBand.CompareTo(other._featureBand); - } - - public override bool Equals(object? obj) - { - return obj is SdkFeatureBand featureBand && Equals(featureBand); - } - - public override int GetHashCode() - { - return _featureBand.GetHashCode(); - } - - public override string ToString() - { - return _featureBand.ToString(); - } - - public string ToStringWithoutPrerelease() - { - return new ReleaseVersion(_featureBand.Major, _featureBand.Minor, _featureBand.SdkFeatureBand).ToString(); - } - - public static bool operator >(SdkFeatureBand a, SdkFeatureBand b) => a.CompareTo(b) > 0; - - public static bool operator <(SdkFeatureBand a, SdkFeatureBand b) => a.CompareTo(b) < 0; - } -} diff --git a/src/GenerateTestWorkloadSets/WorkloadSetInfo.cs b/src/GenerateTestWorkloadSets/WorkloadSetInfo.cs deleted file mode 100644 index 5928db347..000000000 --- a/src/GenerateTestWorkloadSets/WorkloadSetInfo.cs +++ /dev/null @@ -1,129 +0,0 @@ -using Microsoft.DotNet.Workloads.Workload; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.Json; -using System.Threading.Tasks; - -namespace GenerateTestWorkloadSets -{ - internal class WorkloadSetInfo - { - - public string WorkloadSetVersion { get; set; } - - - public List Manifests { get; set; } = new(); - - public WorkloadSetInfo() - { - - } - - public WorkloadSetInfo(string workloadSetVersion, string rollbackJson) - { - WorkloadSetVersion = workloadSetVersion; - LoadManifests(rollbackJson); - } - - public void LoadManifests(string rollbackJson) - { - Manifests.Clear(); - - var jsonDictionary = JsonSerializer.Deserialize>(rollbackJson); - - foreach (var kvp in jsonDictionary) - { - string name = kvp.Key; - var valueParts = kvp.Value.Split('/'); - string version = valueParts[0]; - string featureBand = valueParts[1]; - - Manifests.Add(new WorkloadManifestInfo(name, featureBand, version)); - } - } - - public string ToWorkloadsProps() - { - StringBuilder sb = new StringBuilder(); - - sb.AppendLine(""); - sb.AppendLine(" "); - foreach (var manifest in Manifests) - { - sb.AppendLine($""" """); - } - sb.AppendLine(" "); - sb.AppendLine(""); - - return sb.ToString(); - } - } - - internal class WorkloadSetProperties - { - public string WorkloadSetVersion { get; set; } - public string VersionMajor { get; set; } - public string VersionMinor { get; set; } - public string VersionSdkMinor { get; set; } - public string VersionFeature { get; set; } - public string VersionPatch { get; set; } - public string SdkFeatureBand { get; set; } - - public string Version { get; set; } - - public static WorkloadSetProperties CreateFromWorkloadSetVersion(string workloadSetVersion) - { - WorkloadSetProperties ret = new WorkloadSetProperties(); - ret.WorkloadSetVersion = workloadSetVersion; - - string[] sections = workloadSetVersion.Split(new char[] { '-', '+' }, 2); - string versionCore = sections[0]; - string? preReleaseOrBuild = sections.Length > 1 ? sections[1] : null; - - string[] coreComponents = versionCore.Split('.'); - string major = coreComponents[0]; - string minor = coreComponents[1]; - string patch = coreComponents[2]; - - ret.VersionMajor = major; - ret.VersionMinor = minor; - ret.VersionSdkMinor = (int.Parse(patch) / 100).ToString(); - ret.VersionFeature = (int.Parse(patch) % 100).ToString("d2"); - - if (coreComponents.Length == 3) - { - ret.VersionPatch = "0"; - } - else - { - ret.VersionPatch = coreComponents[3]; - } - - ret.SdkFeatureBand = Microsoft.DotNet.Workloads.Workload.WorkloadSetVersion.GetFeatureBand(workloadSetVersion).ToString(); - ret.Version = Microsoft.DotNet.Workloads.Workload.WorkloadSetVersion.ToWorkloadSetPackageVersion(workloadSetVersion, out _); - - return ret; - } - - public string[] CreateCommandLineArgs() - { - return - [ - $"/p:VersionMajor={VersionMajor}", - $"/p:VersionMinor={VersionMinor}", - $"/p:VersionSdkMinor={VersionSdkMinor}", - $"/p:VersionFeature={VersionFeature}", - $"/p:VersionPatch={VersionPatch}", - $"/p:Version={Version}", - $"/p:SdkFeatureBand={SdkFeatureBand}", - $"/p:WorkloadsVersion={WorkloadSetVersion}", - ]; - } - - } - - internal record WorkloadManifestInfo(string Name, string FeatureBand, string Version); - -} diff --git a/src/GenerateTestWorkloadSets/WorkloadSetVersion.cs b/src/GenerateTestWorkloadSets/WorkloadSetVersion.cs deleted file mode 100644 index 2057b0620..000000000 --- a/src/GenerateTestWorkloadSets/WorkloadSetVersion.cs +++ /dev/null @@ -1,64 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using Microsoft.Deployment.DotNet.Releases; -using Microsoft.NET.Sdk.WorkloadManifestReader; - -namespace Microsoft.DotNet.Workloads.Workload -{ - static class WorkloadSetVersion - { - public static string ToWorkloadSetPackageVersion(string workloadSetVersion, out SdkFeatureBand sdkFeatureBand) - { - string[] sections = workloadSetVersion.Split(new char[] { '-', '+' }, 2); - string versionCore = sections[0]; - string? preReleaseOrBuild = sections.Length > 1 ? sections[1] : null; - - string[] coreComponents = versionCore.Split('.'); - string major = coreComponents[0]; - string minor = coreComponents[1]; - string patch = coreComponents[2]; - - string packageVersion = $"{major}.{patch}."; - if (coreComponents.Length == 3) - { - // No workload set patch version - packageVersion += "0"; - - // Use preview specifier (if any) from workload set version as part of SDK feature band - sdkFeatureBand = new SdkFeatureBand(workloadSetVersion); - } - else - { - // Workload set version has workload patch version (ie 4 components) - packageVersion += coreComponents[3]; - - // Don't include any preview specifiers in SDK feature band - sdkFeatureBand = new SdkFeatureBand($"{major}.{minor}.{patch}"); - } - - if (preReleaseOrBuild != null) - { - // Figure out if we split on a '-' or '+' - char separator = workloadSetVersion[sections[0].Length]; - packageVersion += separator + preReleaseOrBuild; - } - - return packageVersion; - } - - public static SdkFeatureBand GetFeatureBand(string workloadSetVersion) - { - ToWorkloadSetPackageVersion(workloadSetVersion, out SdkFeatureBand sdkFeatureBand); - return sdkFeatureBand; - } - - public static string FromWorkloadSetPackageVersion(SdkFeatureBand sdkFeatureBand, string packageVersion) - { - var releaseVersion = new ReleaseVersion(packageVersion); - var patch = releaseVersion.Patch > 0 ? $".{releaseVersion.Patch}" : string.Empty; - var release = string.IsNullOrWhiteSpace(releaseVersion.Prerelease) ? string.Empty : $"-{releaseVersion.Prerelease}"; - return $"{sdkFeatureBand.Major}.{sdkFeatureBand.Minor}.{releaseVersion.Minor}{patch}{release}"; - } - } -} diff --git a/src/Microsoft.NET.Workloads.Vsman/Microsoft.NET.Workloads.Vsman.csproj b/src/Microsoft.NET.Workloads.Vsman/Microsoft.NET.Workloads.Vsman.csproj deleted file mode 100644 index b10244922..000000000 --- a/src/Microsoft.NET.Workloads.Vsman/Microsoft.NET.Workloads.Vsman.csproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - - $(SdkTargetFramework) - - - - - - - $(ArtifactsDir)workloads\ - - - - - - - - - - - \ No newline at end of file diff --git a/src/Microsoft.NET.Workloads.Vsman/Microsoft.NET.Workloads.Vsman.vsmanproj b/src/Microsoft.NET.Workloads.Vsman/Microsoft.NET.Workloads.Vsman.vsmanproj deleted file mode 100644 index b137e463a..000000000 --- a/src/Microsoft.NET.Workloads.Vsman/Microsoft.NET.Workloads.Vsman.vsmanproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - $(SdkTargetFramework) - - - - - - - - - - - $(WorkloadVersion) - - - - \ No newline at end of file diff --git a/src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj b/src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj deleted file mode 100644 index 73227f5d4..000000000 --- a/src/Microsoft.NET.Workloads/Microsoft.NET.Workloads.csproj +++ /dev/null @@ -1,162 +0,0 @@ - - - - - $(SdkTargetFramework) - - true - - - true - - - true - $(MSBuildProjectName).$(SDKFeatureBand) - - - README.md - $(IntermediateOutputPath)README.md - - - LGHT1105 - - - - - - - - - - - - - $(PkgMicrosoft_Signed_Wix)\tools - $(PkgMicrosoft_VisualStudioEng_MicroBuild_Plugins_SwixBuild) - $(SwixPluginPath)\build\Microsoft.VisualStudioEng.MicroBuild.Plugins.SwixBuild.targets - $(ArtifactsObjDir)workloads/ - $(ArtifactsBinDir)workloads/ - $(WorkloadIntermediateOutputPath)VS/ - - - - - - $(ArtifactsObjDir)/LightCommandPackages - - $(ArtifactsNonShippingPackagesDir) - - - - - - - - - - workloads.props - - - - - - - - - @(WorkloadManifest->'%20%20"%(Identity)": "%(Version)/%(FeatureBand)"', ',;') - - - - - - - 5 - - 1996-04-01 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_WixObj Include="$(_WixObjDir)\**\*.wixobj" /> - - - - - - - - diff --git a/src/Microsoft.NET.Workloads/README.md b/src/Microsoft.NET.Workloads/README.md deleted file mode 100644 index a2bba031b..000000000 --- a/src/Microsoft.NET.Workloads/README.md +++ /dev/null @@ -1,3 +0,0 @@ -## .NET SDK Workload Versions manifest - -This package contains .NET SDK Workloads version {SDKWVersion}. This package is not meant to be directly referenced but instead used with the .NET SDK CLI. \ No newline at end of file diff --git a/src/Microsoft.NET.Workloads/workloads.props b/src/Microsoft.NET.Workloads/workloads.props deleted file mode 100644 index 06bcf762d..000000000 --- a/src/Microsoft.NET.Workloads/workloads.props +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/workload-versions.sln b/workload-versions.sln deleted file mode 100644 index cd44f22f3..000000000 --- a/workload-versions.sln +++ /dev/null @@ -1,42 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.7.33920.267 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.NET.Workloads", "src\Microsoft.NET.Workloads\Microsoft.NET.Workloads.csproj", "{7EDB5924-188D-472F-B95B-C5BF6461DB41}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateTestWorkloadSets", "src\GenerateTestWorkloadSets\GenerateTestWorkloadSets.csproj", "{55BC9CC1-37A9-4472-B1FE-6B4B94DAA363}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{BF919689-7AF6-4B39-B6C8-0D5ADFE3D484}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.NET.Workloads.Vsman", "src\Microsoft.NET.Workloads.Vsman\Microsoft.NET.Workloads.Vsman.csproj", "{083601A3-E571-454B-809C-7DCA8D535EFF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7EDB5924-188D-472F-B95B-C5BF6461DB41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EDB5924-188D-472F-B95B-C5BF6461DB41}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EDB5924-188D-472F-B95B-C5BF6461DB41}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EDB5924-188D-472F-B95B-C5BF6461DB41}.Release|Any CPU.Build.0 = Release|Any CPU - {55BC9CC1-37A9-4472-B1FE-6B4B94DAA363}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55BC9CC1-37A9-4472-B1FE-6B4B94DAA363}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55BC9CC1-37A9-4472-B1FE-6B4B94DAA363}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55BC9CC1-37A9-4472-B1FE-6B4B94DAA363}.Release|Any CPU.Build.0 = Release|Any CPU - {083601A3-E571-454B-809C-7DCA8D535EFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {083601A3-E571-454B-809C-7DCA8D535EFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {083601A3-E571-454B-809C-7DCA8D535EFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {083601A3-E571-454B-809C-7DCA8D535EFF}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {DAEFAB38-2A02-457B-A3D1-3575DF493CE1} - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {083601A3-E571-454B-809C-7DCA8D535EFF} = {BF919689-7AF6-4B39-B6C8-0D5ADFE3D484} - EndGlobalSection -EndGlobal From 13fab994fe08124f6c673843b0152123f1da9012 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 8 Aug 2025 17:30:52 -0700 Subject: [PATCH 31/77] These are required by the Arcade version on this branch. --- eng/Publishing.props | 9 +++++++++ eng/Signing.props | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 eng/Publishing.props create mode 100644 eng/Signing.props diff --git a/eng/Publishing.props b/eng/Publishing.props new file mode 100644 index 000000000..08c01668b --- /dev/null +++ b/eng/Publishing.props @@ -0,0 +1,9 @@ + + + + + + 3 + + + \ No newline at end of file diff --git a/eng/Signing.props b/eng/Signing.props new file mode 100644 index 000000000..4cd7aa30f --- /dev/null +++ b/eng/Signing.props @@ -0,0 +1,17 @@ + + + + + + MicrosoftDotNet500 + + + + + + + + + + + From 799345048791835e01527311b2086250a313e864 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 8 Aug 2025 18:04:47 -0700 Subject: [PATCH 32/77] Allow for passing repositoryAlias. --- eng/common/core-templates/job/publish-build-assets.yml | 4 +++- eng/common/core-templates/jobs/jobs.yml | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 86aa7a0b8..b103b7ee1 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: is1ESPipeline: '' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -72,7 +74,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index ea69be434..3129670b3 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -117,3 +118,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} From 3e147f963362c93c3828999f12194c45573bfc45 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Aug 2025 02:02:13 +0000 Subject: [PATCH 33/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250808.1 Microsoft.NET.Sdk From Version 9.0.109-servicing.25368.18 -> To Version 9.0.110-servicing.25408.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe178a8b3..af788d384 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7e80994b48118d3189245d8d65e9520f182f5707 + 4d0a24af9be7723c6b06de876b95c24163d11553 From ee0fa06cbbf499db14bcbf8c96fbda5d012ad949 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Aug 2025 15:58:24 -0700 Subject: [PATCH 34/77] Update dependencies from https://github.com/dotnet/arcade build 20250807.2 (#489) Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25323.2 -> To Version 9.0.0-beta.25407.2 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 14 -------------- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/job.yml | 10 ++++++---- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5716b9d33..661b116e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,27 +7,16 @@ - - - - - - - - - - - @@ -48,9 +37,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16bcc3ea0..589e75435 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - 533b40ed3b73fcb6f4509e301db76203bd58f920 + e29823691315ed6b3acff20d5bdf3b0be7628283 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index abe80a2a0..8947ea3f0 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,7 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false @@ -134,10 +135,11 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 22b49e09d..9b3ad8840 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -416,7 +416,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index 6ffdd918f..bf177ac46 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.107" + "dotnet": "9.0.109" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25323.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 3808a548c5f5bed662d6c1f348d6eee4916979dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Aug 2025 02:01:54 +0000 Subject: [PATCH 35/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250810.5 Microsoft.NET.Sdk From Version 9.0.109-servicing.25368.18 -> To Version 9.0.110-servicing.25410.5 --- NuGet.config | 10 ---------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index dc0ef9ce3..661b116e8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,17 +13,10 @@ - - - - - - - @@ -44,9 +37,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af788d384..daae9b525 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4d0a24af9be7723c6b06de876b95c24163d11553 + 08212c61679069173cc97f714d13cd26da6302e9 From 3caaa8bf6a520349046a112bf78fea24afaf84b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Aug 2025 02:02:55 +0000 Subject: [PATCH 36/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250812.1 Microsoft.NET.Sdk From Version 9.0.109-servicing.25368.18 -> To Version 9.0.110-servicing.25412.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index daae9b525..cac983a45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 08212c61679069173cc97f714d13cd26da6302e9 + 1493710f8720d1beb18a1ff2594b55e1ec74ded9 From ec00a4d7915ab06196a38b3682b0d82827b05055 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Aug 2025 02:03:11 +0000 Subject: [PATCH 37/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250813.36 Microsoft.NET.Sdk From Version 9.0.109-servicing.25368.18 -> To Version 9.0.110-servicing.25413.36 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 9.0.8 -> To Version 9.0.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 661b116e8..246c37e13 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + @@ -37,6 +38,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cac983a45..0b0067bad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,9 +6,9 @@ 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - aae90fa09086a9be09dac83fa66542232c7269d8 + 5d8f001fa53f28ffefffe88addadfdac91deff78 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1493710f8720d1beb18a1ff2594b55e1ec74ded9 + 559445385ae1df3c5d74a3c27c19185cffd7ec8f diff --git a/eng/Versions.props b/eng/Versions.props index d2f56de3f..9e1d08e99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.8 + 9.0.9 $(MicrosoftNETCoreAppRefPackageVersion) From 0a6e9e373661ddeb7235ff5aba2421e08ea52cd5 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 14 Aug 2025 15:09:07 -0700 Subject: [PATCH 38/77] Added local build logic and required gitignore contents. --- .gitignore | 16 +++++++++++++++- build.cmd | 4 ++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 25bf790b2..37d221b4e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,4 +41,18 @@ cmake/ .dotnet.payload # MSBuild Logs -**/MSBuild_Logs/MSBuild_pid-*.failure.txt \ No newline at end of file +**/MSBuild_Logs/MSBuild_pid-*.failure.txt + +############################################################################### +# Eng branch specific files +############################################################################### +eng/ +!eng/common/ +!eng/pipelines/public.yml +!eng/Version.Details.xml +!eng/Version.Details.json +src/ +tools/ +Directory.Build.props +Directory.Build.targets +workload-versions.sln \ No newline at end of file diff --git a/build.cmd b/build.cmd index fe43bbf96..3898c8b0f 100644 --- a/build.cmd +++ b/build.cmd @@ -1,3 +1,7 @@ @echo off +for /f %%i in ('git config --get remote.origin.url') do set REPO_URL=%%i +git clone -b eng %REPO_URL% eng-branch +robocopy "eng-branch" "." /E /XO /XD ".git" ".config" /XF ".gitignore" "build.cmd" "public.yml" /NJH /NJS /NP /NFL /NDL +rmdir /s /q "eng-branch" powershell -NoLogo -NoProfile -ExecutionPolicy ByPass -Command "& """%~dp0eng\common\build.ps1""" -restore -build -msbuildEngine vs %*" exit /b %ErrorLevel% From 336c8aad91d08711934b4d5a8bdb6f9148af44d6 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 14 Aug 2025 15:40:31 -0700 Subject: [PATCH 39/77] Incorrect Version.props filename. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 37d221b4e..ec48ab555 100644 --- a/.gitignore +++ b/.gitignore @@ -50,7 +50,7 @@ eng/ !eng/common/ !eng/pipelines/public.yml !eng/Version.Details.xml -!eng/Version.Details.json +!eng/Versions.props src/ tools/ Directory.Build.props From 664ac0fbd7eb9ae7ee82f3c1ede76bbc6f550d22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Aug 2025 02:02:52 +0000 Subject: [PATCH 40/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250814.7 Microsoft.NET.Sdk From Version 9.0.109-servicing.25368.18 -> To Version 9.0.110-servicing.25414.7 --- NuGet.config | 2 ++ eng/Version.Details.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index 246c37e13..70697c130 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + @@ -38,6 +39,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b0067bad..2fd22acf5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui dd13512d027bd88f1ecfe7ed92fcf96e7c2e48f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 559445385ae1df3c5d74a3c27c19185cffd7ec8f + 21412491a8bb4cf7f99d846c90e0a1c1ade5eb7e From 1b0095a744bfdfc6f5a82a175a2d1c43f737592e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Aug 2025 21:21:15 +0000 Subject: [PATCH 41/77] Update dependencies from https://github.com/dotnet/arcade build 20250815.3 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25407.2 -> To Version 9.0.0-beta.25415.3 --- eng/Version.Details.xml | 4 ++-- eng/common/SetupNugetSources.ps1 | 4 ++-- eng/common/SetupNugetSources.sh | 4 ++-- eng/common/core-templates/job/job.yml | 8 ++++---- eng/common/core-templates/job/onelocbuild.yml | 6 +++--- .../core-templates/job/publish-build-assets.yml | 10 ++++++---- .../core-templates/job/source-index-stage1.yml | 2 +- eng/common/core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 ++ .../core-templates/post-build/post-build.yml | 8 ++++---- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 ++++++------ eng/common/core-templates/steps/generate-sbom.yml | 2 +- eng/common/core-templates/steps/publish-logs.yml | 14 +++++++------- eng/common/core-templates/steps/source-build.yml | 4 ++-- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../templates-official/variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 ++-- global.json | 2 +- 20 files changed, 50 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 589e75435..b6ad11377 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - e29823691315ed6b3acff20d5bdf3b0be7628283 + d87d66c43d0660e5c8e84e667c5c8a8140bce888 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71e..792b60b49 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b0..facb415ca 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 8947ea3f0..8da43d3b5 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -166,7 +166,7 @@ jobs: inputs: languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} continueOnError: true @@ -189,7 +189,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -200,7 +200,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -244,7 +244,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 00feec8eb..edefa789d 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -115,7 +115,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish LocProject.json - pathToPublish: '$(Build.SourcesDirectory)/eng/Localize/' + pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' publishLocation: Container artifactName: Loc condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e31..b103b7ee1 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: is1ESPipeline: '' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -72,7 +74,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -93,7 +95,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net @@ -113,7 +115,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -142,7 +144,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 8b833332b..662b9fcce 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -66,7 +66,7 @@ jobs: - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index f2144252c..4571a7864 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -25,7 +25,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index ea69be434..3129670b3 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -117,3 +118,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a8c0bd3b9..2ee8bbfff 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -149,7 +149,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -206,7 +206,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -256,7 +256,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -311,7 +311,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980d..a7abd58c4 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bff..4085512b6 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 56a090094..7f5b84c4c 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 80788c523..0623ac6e1 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -42,7 +42,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 37133b55b..730f7ab2b 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -97,7 +97,7 @@ steps: - task: CopyFiles@2 displayName: Prepare BuildLogs staging directory inputs: - SourceFolder: '$(Build.SourcesDirectory)' + SourceFolder: '$(System.DefaultWorkingDirectory)' Contents: | **/*.log **/*.binlog @@ -126,5 +126,5 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(Build.SourcesDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded..4bf4cf41b 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 817555505..81ea7a261 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a..f1311bbb1 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index d1aeb92fc..5bdd3dd85 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -75,7 +75,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index bf177ac46..f0b15fcfa 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25407.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 84511a2721a8b9404231eda840f7928de14cb5ca Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 15 Aug 2025 18:03:42 -0700 Subject: [PATCH 42/77] Update service connection comment. --- eng/pipelines/public.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/public.yml b/eng/pipelines/public.yml index 69f67bc25..f15c76f3d 100644 --- a/eng/pipelines/public.yml +++ b/eng/pipelines/public.yml @@ -14,7 +14,7 @@ resources: type: github name: dotnet/workload-versions ref: refs/heads/eng - # https://dev.azure.com/dnceng-public/public/_settings/adminservices?resourceId=690f39b4-7746-42c2-be89-281bd7c78b9e + # Service connection: https://dev.azure.com/dnceng-public/public/_settings/adminservices?resourceId=690f39b4-7746-42c2-be89-281bd7c78b9e endpoint: public variables: From c68f564627eab6742a598e0081b3b050d89265be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Aug 2025 09:44:57 -0700 Subject: [PATCH 43/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk (#498) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250815.6 Microsoft.NET.Sdk From Version 9.0.110-servicing.25414.7 -> To Version 9.0.110-servicing.25415.6 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250815.26 Microsoft.NET.Sdk From Version 9.0.110-servicing.25414.7 -> To Version 9.0.110-servicing.25415.26 Dependency coherency updates Microsoft.NETCore.App.Ref From Version 9.0.9 -> To Version 9.0.9 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250817.5 Microsoft.NET.Sdk From Version 9.0.110-servicing.25414.7 -> To Version 9.0.110-servicing.25417.5 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250818.13 Microsoft.NET.Sdk From Version 9.0.110-servicing.25414.7 -> To Version 9.0.110-servicing.25418.13 * Update branding for 9.0.110 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Marc Paine --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 70697c130..57e0fe709 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,8 +17,8 @@ - - + + @@ -39,8 +39,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9df359177..8cad1bdcf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,7 +8,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5d8f001fa53f28ffefffe88addadfdac91deff78 + 9a939063580582345c2b6f843687faf4538f32fb https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 21412491a8bb4cf7f99d846c90e0a1c1ade5eb7e + 9771b7af43092b60133fa357667db6fd19009683 diff --git a/eng/Versions.props b/eng/Versions.props index d5514011f..0503b332f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 - 09 + 10 0 false From 07948e030d967deea458d02dc98cf5ac1d355c92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 19:15:02 -0700 Subject: [PATCH 44/77] [release/9.0.1xx] Update dependencies from dotnet/android, dotnet/macios (#504) * Update dependencies from https://github.com/dotnet/android build 9.0.80-ci.net9.25418.1+azdo.12205071 Microsoft.NET.Sdk.Android.Manifest-9.0.100 From Version 35.0.92 -> To Version 35.0.101 * Update dependencies from https://github.com/dotnet/macios build 20250819.11 Microsoft.NET.Sdk.iOS.Manifest-9.0.100 , Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100 , Microsoft.NET.Sdk.macOS.Manifest-9.0.100 , Microsoft.NET.Sdk.tvOS.Manifest-9.0.100 From Version 18.5.9215 -> To Version 18.5.9219 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 ++++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 57e0fe709..1acf10fcf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,8 @@ + + @@ -15,6 +17,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8cad1bdcf..ccbc7cfed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,25 +10,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 9a939063580582345c2b6f843687faf4538f32fb - + https://github.com/dotnet/android - be1cab92326783479054e72990da08008e5be819 + a618557d1fa38074e0256317fb17c1baee245a79 - + https://github.com/dotnet/macios - 807153429630114a7186d246285c3a4a504f23c1 + 60f5c7b1b6e359df6fefe197b5736a29a6be1001 - + https://github.com/dotnet/macios - 807153429630114a7186d246285c3a4a504f23c1 + 60f5c7b1b6e359df6fefe197b5736a29a6be1001 - + https://github.com/dotnet/macios - 807153429630114a7186d246285c3a4a504f23c1 + 60f5c7b1b6e359df6fefe197b5736a29a6be1001 - + https://github.com/dotnet/macios - 807153429630114a7186d246285c3a4a504f23c1 + 60f5c7b1b6e359df6fefe197b5736a29a6be1001 https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index 0503b332f..2633c480c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,11 +51,11 @@ 9.0.100 - 35.0.92 - 18.5.9215 - 18.5.9215 - 18.5.9215 - 15.5.9215 + 35.0.101 + 18.5.9219 + 18.5.9219 + 18.5.9219 + 15.5.9219 9.0.82 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) From 03f608cc6b86a789fb809056d18830baea81c2c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Aug 2025 11:34:34 -0700 Subject: [PATCH 45/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk (#508) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250819.11 Microsoft.NET.Sdk From Version 9.0.110-servicing.25418.13 -> To Version 9.0.110-servicing.25419.11 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.8 -> To Version 9.0.9 (parent: Microsoft.NET.Sdk * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250821.11 Microsoft.NET.Sdk From Version 9.0.110-servicing.25418.13 -> To Version 9.0.110-servicing.25421.11 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 7 +++---- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1acf10fcf..bd027c68b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,14 +15,14 @@ + - - + @@ -43,8 +43,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccbc7cfed..dd0be9a46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - 0bcc3e67026ea44a16fb018a50e4e134c06ab3d6 + dc8e3478c4aa5f6a103329333c2bdbcd07a07741 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9a939063580582345c2b6f843687faf4538f32fb + 893c2ebbd49952ca49e93298148af2d95a61a0a4 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9771b7af43092b60133fa357667db6fd19009683 + cecf5898ba9ff76c284742ca948dd6b8467a50ec diff --git a/eng/Versions.props b/eng/Versions.props index 2633c480c..3dcddc5cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 9.0.8 + 9.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From fb614286d589db513bf06a5270908f76c4bc95c2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Aug 2025 19:53:25 +0000 Subject: [PATCH 46/77] Update dependencies from https://github.com/dotnet/arcade build 20250828.3 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25428.3 --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/source-build.yml | 4 ++++ eng/common/core-templates/jobs/source-build.yml | 5 +++++ eng/common/core-templates/steps/source-build.yml | 9 ++++++++- global.json | 2 +- 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd027c68b..35c55d8bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,10 @@ + + + + @@ -23,6 +27,10 @@ + + + + @@ -43,6 +51,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd0be9a46..f2bd8957c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d47f09d58..5baedac1e 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -33,6 +33,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -93,3 +96,4 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} platform: ${{ parameters.platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index a10ccfbee..0b408a67b 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -47,6 +50,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -55,4 +59,5 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 730f7ab2b..0718e4ba9 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -11,6 +11,10 @@ parameters: # for details. The entire object is described in the 'job' template for simplicity, even though # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: false steps: @@ -126,5 +130,8 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}: + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }} disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/global.json b/global.json index f0b15fcfa..7e1fbca19 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From c191c8eea85896fa02c16a65029b39117b62f229 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 5 Sep 2025 16:43:17 -0700 Subject: [PATCH 47/77] Forgot the Publishing.props and Signing.props unignore in the .gitignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ec48ab555..62e02185d 100644 --- a/.gitignore +++ b/.gitignore @@ -49,6 +49,8 @@ cmake/ eng/ !eng/common/ !eng/pipelines/public.yml +!eng/Publishing.props +!eng/Signing.props !eng/Version.Details.xml !eng/Versions.props src/ From 8ab229947740ecf9bca778aac2ba4a259021c3d4 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 5 Sep 2025 17:34:45 -0700 Subject: [PATCH 48/77] Add eng to PR triggers. --- eng/pipelines/public.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/pipelines/public.yml b/eng/pipelines/public.yml index f15c76f3d..d3cde1f95 100644 --- a/eng/pipelines/public.yml +++ b/eng/pipelines/public.yml @@ -5,6 +5,7 @@ pr: include: - main - release/* + - eng trigger: none From f6be730731528ac66d9ac54dbca350250646e75b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Sep 2025 02:03:29 +0000 Subject: [PATCH 49/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250908.9 Microsoft.NET.Sdk From Version 9.0.110-servicing.25421.11 -> To Version 9.0.111-servicing.25458.9 --- NuGet.config | 12 ++++++++++++ eng/Version.Details.xml | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd027c68b..35c55d8bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,10 @@ + + + + @@ -23,6 +27,10 @@ + + + + @@ -43,6 +51,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd0be9a46..eb854e7c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cecf5898ba9ff76c284742ca948dd6b8467a50ec + 3251e74d0b7b693d02e192bce4f148ba45689c5f From 43f296bfbfae73e8fa397e6fb5daba5c147cd5df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Sep 2025 16:30:24 +0000 Subject: [PATCH 50/77] Update dependencies from https://github.com/dotnet/macios build 20250904.14 Microsoft.NET.Sdk.iOS.Manifest-9.0.100 , Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100 , Microsoft.NET.Sdk.macOS.Manifest-9.0.100 , Microsoft.NET.Sdk.tvOS.Manifest-9.0.100 From Version 18.5.9219 -> To Version 18.5.9227 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd027c68b..1a62c7529 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,13 +16,21 @@ + + + + - - + + + + + + @@ -43,6 +51,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd0be9a46..b2cd3f7e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,21 +14,21 @@ https://github.com/dotnet/android a618557d1fa38074e0256317fb17c1baee245a79 - + https://github.com/dotnet/macios - 60f5c7b1b6e359df6fefe197b5736a29a6be1001 + 4681bf928d70aa79cff2c33ad324b3be9c62b66d - + https://github.com/dotnet/macios - 60f5c7b1b6e359df6fefe197b5736a29a6be1001 + 4681bf928d70aa79cff2c33ad324b3be9c62b66d - + https://github.com/dotnet/macios - 60f5c7b1b6e359df6fefe197b5736a29a6be1001 + 4681bf928d70aa79cff2c33ad324b3be9c62b66d - + https://github.com/dotnet/macios - 60f5c7b1b6e359df6fefe197b5736a29a6be1001 + 4681bf928d70aa79cff2c33ad324b3be9c62b66d https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index 3dcddc5cf..b717a7739 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 9.0.100 35.0.101 - 18.5.9219 - 18.5.9219 - 18.5.9219 - 15.5.9219 + 18.5.9227 + 18.5.9227 + 18.5.9227 + 15.5.9227 9.0.82 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) From b2a7031a4d535104a0e489132d7a396ec5812bab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Sep 2025 02:03:16 +0000 Subject: [PATCH 51/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250909.2 Microsoft.NET.Sdk From Version 9.0.110-servicing.25421.11 -> To Version 9.0.111-servicing.25459.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb854e7c5..bf7f86143 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3251e74d0b7b693d02e192bce4f148ba45689c5f + 2dc13278f285a5408d6c79165421cd8e708a8bee From 867e3c183f800ae7dcf92f50c6d59862e006ef61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Sep 2025 18:07:20 +0000 Subject: [PATCH 52/77] Update dependencies from https://github.com/dotnet/arcade build 20250910.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25460.1 --- eng/Version.Details.xml | 4 ++-- global.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2bd8957c..44581e0ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 diff --git a/global.json b/global.json index 7e1fbca19..04b98e316 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.109" + "dotnet": "9.0.110" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From d97515a89c3af15c45b1ce3c070aade1e1b07c8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Sep 2025 20:54:11 +0000 Subject: [PATCH 53/77] Update dependencies from https://github.com/dotnet/android build 9.0.80-ci.net9.25461.1+azdo.12369439 Microsoft.NET.Sdk.Android.Manifest-9.0.100 From Version 35.0.101 -> To Version 35.0.105 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a62c7529..9055561bb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2cd3f7e4..b506e52ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,9 +10,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 893c2ebbd49952ca49e93298148af2d95a61a0a4 - + https://github.com/dotnet/android - a618557d1fa38074e0256317fb17c1baee245a79 + 1dcfb6f8779c33b6f768c996495cb90ecd729329 https://github.com/dotnet/macios diff --git a/eng/Versions.props b/eng/Versions.props index b717a7739..6f9862b98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ 9.0.100 - 35.0.101 + 35.0.105 18.5.9227 18.5.9227 18.5.9227 From 077e244439b633d4ec8a353089be2b5c7c017391 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Sep 2025 23:15:15 +0000 Subject: [PATCH 54/77] Update dependencies from https://github.com/dotnet/arcade build 20250912.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25462.4 --- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/publish-build-assets.yml | 9 ++++++++- eng/common/core-templates/jobs/jobs.yml | 2 ++ global.json | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44581e0ea..67243292b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b103b7ee1..a58c8a418 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -34,6 +34,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -56,6 +58,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -100,7 +107,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 3129670b3..bf33cdc2c 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -44,6 +44,7 @@ parameters: artifacts: {} is1ESPipeline: '' repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -119,3 +120,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index 04b98e316..b21494e83 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 13b270f12a24cc471f254c035a01a3f6269260e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Sep 2025 02:05:19 +0000 Subject: [PATCH 55/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250912.6 On relative base path root Microsoft.NET.Sdk From Version 9.0.110-servicing.25421.11 -> To Version 9.0.111-servicing.25462.6 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf7f86143..0f090bd36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2dc13278f285a5408d6c79165421cd8e708a8bee + 88fd9261734dba67779ec2919f9516d1c449f72b From 716d3708948bf0e705c7de4261dbac12e5e7625b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Sep 2025 02:03:10 +0000 Subject: [PATCH 56/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250915.20 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25462.6 -> To Version 9.0.111-servicing.25465.20 --- NuGet.config | 15 --------------- eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9055561bb..2beec0566 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,22 +15,12 @@ - - - - - - - - - - @@ -51,11 +41,6 @@ - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77308c54d..c3cd7b599 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88fd9261734dba67779ec2919f9516d1c449f72b + 076e5c3f3a20b8f9a10441d1edcef84e0889a7d4 From 43cd85587bf94976fa6f0753e1215d7364f77c0e Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 16 Sep 2025 18:18:54 -0700 Subject: [PATCH 57/77] Allow loading a Version.Overrides.props at the bottom of Versions.props. --- eng/Versions.props | 1 + 1 file changed, 1 insertion(+) diff --git a/eng/Versions.props b/eng/Versions.props index 6f9862b98..4264a7ced 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -76,4 +76,5 @@ 8.2.2 $(MicrosoftNETSdkAspireManifest80100PackageVersion) + From ba23c1f8d09ae2e91ce74a1006cb515a6c5b7915 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Sep 2025 02:02:33 +0000 Subject: [PATCH 58/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250916.10 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25465.20 -> To Version 9.0.111-servicing.25466.10 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3cd7b599..e6bee0ef6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 076e5c3f3a20b8f9a10441d1edcef84e0889a7d4 + ce6ead69a115bf1d4db4670acc51664ae49e2882 From a26ab2e2ca7c8ae16be3f5cf8c41d7214a391000 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Sep 2025 02:03:32 +0000 Subject: [PATCH 59/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250917.12 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25466.10 -> To Version 9.0.111-servicing.25467.12 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.9 -> To Version 9.0.10 (parent: Microsoft.NET.Sdk) --- NuGet.config | 3 +++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2beec0566..035126fc6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,12 +15,14 @@ + + @@ -41,6 +43,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6bee0ef6..427b3f7d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - dc8e3478c4aa5f6a103329333c2bdbcd07a07741 + 2ab31537e6b375f8563a1d67936236797a56e3fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 893c2ebbd49952ca49e93298148af2d95a61a0a4 + b3173376176f145ed904d9f18f24c062756ada9d https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ce6ead69a115bf1d4db4670acc51664ae49e2882 + bde330698f4223db2fa6e11d8d1408cdbb6ad832 diff --git a/eng/Versions.props b/eng/Versions.props index 4264a7ced..f1033fd8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 9.0.9 + 9.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.9 + 9.0.10 $(MicrosoftNETCoreAppRefPackageVersion) From 4fa233482cd6b884d46aa8224542a50a65761019 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Sep 2025 10:46:47 +0000 Subject: [PATCH 60/77] Update dependencies from https://github.com/dotnet/arcade build 20250915.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25462.4 -> To Version 9.0.0-beta.25465.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e6bee0ef6..95f3e18d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 diff --git a/global.json b/global.json index b21494e83..e19f98625 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 8bc19692eff5f43d90380e01b197b2622146a051 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Sep 2025 02:03:39 +0000 Subject: [PATCH 61/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250919.29 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25467.12 -> To Version 9.0.111-servicing.25469.29 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.10 -> To Version 9.0.10 (parent: Microsoft.NET.Sdk) --- NuGet.config | 6 +++--- eng/Version.Details.xml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 035126fc6..d3cb71b01 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,14 +15,14 @@ - + - + @@ -43,7 +43,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 491c71f3e..de8701056 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,12 +3,12 @@ https://github.com/dotnet/emsdk - 2ab31537e6b375f8563a1d67936236797a56e3fa + 4f9fa221e638502a58fee696621c1bba2072b23c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b3173376176f145ed904d9f18f24c062756ada9d + 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui beb35b1703cd0d204d0057039aaa3e19f49a2fef - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bde330698f4223db2fa6e11d8d1408cdbb6ad832 + 39ec3214d827194da6d82fd712e40fc5b16eec3e From f2a407c09d05e2e225bcf2dfa5d28fb0381a09ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Sep 2025 20:58:18 +0000 Subject: [PATCH 62/77] Update dependencies from https://github.com/dotnet/arcade build 20250923.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25465.2 -> To Version 9.0.0-beta.25473.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de8701056..e606bcd68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 diff --git a/global.json b/global.json index e19f98625..b2220d4b1 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 931aab913e8b5f32217fc71ee16c3596941ae393 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Sep 2025 21:49:30 +0000 Subject: [PATCH 63/77] Update dependencies from https://github.com/dotnet/maui build 20250924.5 On relative base path root Microsoft.NET.Sdk.Maui.Manifest-9.0.100 From Version 9.0.82 -> To Version 9.0.111 --- NuGet.config | 2 ++ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3cb71b01..1c6526dca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,6 +11,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e606bcd68..55100878a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,9 +30,9 @@ https://github.com/dotnet/macios 4681bf928d70aa79cff2c33ad324b3be9c62b66d - + https://github.com/dotnet/maui - beb35b1703cd0d204d0057039aaa3e19f49a2fef + 5531aa96fe88f40f612b4772fee56dceefc37932 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk diff --git a/eng/Versions.props b/eng/Versions.props index f1033fd8f..2ad03f27f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,7 @@ 18.5.9227 18.5.9227 15.5.9227 - 9.0.82 + 9.0.111 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) $(MicrosoftNETSdkiOSManifest90100PackageVersion) From ca1266b6f73591463208ef8b80fb2b96f025f277 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Sep 2025 22:05:13 +0000 Subject: [PATCH 64/77] Update dependencies from https://github.com/dotnet/macios build 20250923.4 On relative base path root Microsoft.NET.Sdk.iOS.Manifest-9.0.100 , Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100 , Microsoft.NET.Sdk.tvOS.Manifest-9.0.100 From Version 18.5.9227 -> To Version 26.0.9752 Microsoft.NET.Sdk.macOS.Manifest-9.0.100 From Version 15.5.9227 -> To Version 26.0.9752 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1c6526dca..987d4f4f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,8 +20,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55100878a..7833a43a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,21 +14,21 @@ https://github.com/dotnet/android 1dcfb6f8779c33b6f768c996495cb90ecd729329 - + https://github.com/dotnet/macios - 4681bf928d70aa79cff2c33ad324b3be9c62b66d + 177f4311930b32eecc1e462a71ebbe34b7e01a0b - + https://github.com/dotnet/macios - 4681bf928d70aa79cff2c33ad324b3be9c62b66d + 177f4311930b32eecc1e462a71ebbe34b7e01a0b - + https://github.com/dotnet/macios - 4681bf928d70aa79cff2c33ad324b3be9c62b66d + 177f4311930b32eecc1e462a71ebbe34b7e01a0b - + https://github.com/dotnet/macios - 4681bf928d70aa79cff2c33ad324b3be9c62b66d + 177f4311930b32eecc1e462a71ebbe34b7e01a0b https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index 2ad03f27f..2cd5da7ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 9.0.100 35.0.105 - 18.5.9227 - 18.5.9227 - 18.5.9227 - 15.5.9227 + 26.0.9752 + 26.0.9752 + 26.0.9752 + 26.0.9752 9.0.111 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) From dae95db93dd9dc70ba404115e4a0bd900f1582a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Sep 2025 15:33:17 +0000 Subject: [PATCH 65/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250924.16 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25469.29 -> To Version 9.0.111-servicing.25474.16 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.10 -> To Version 9.0.10 (parent: Microsoft.NET.Sdk) --- NuGet.config | 6 +++--- eng/Version.Details.xml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 987d4f4f6..b801d89ed 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,14 +17,14 @@ - + - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7833a43a6..82d9bcef7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,12 +3,12 @@ https://github.com/dotnet/emsdk - 4f9fa221e638502a58fee696621c1bba2072b23c + f70927a13648c24660c79ff19a6eb2aac100f0ab https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 79ba1eaf1e263cc7ddeb796d34653a2f344b1e5a + 2eb909782582e764afe6f6ed6f961b8baa5d455e https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui 5531aa96fe88f40f612b4772fee56dceefc37932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 39ec3214d827194da6d82fd712e40fc5b16eec3e + 369fd4a2964c18dbb55e8c096f92de68a015ea05 From 7fe1cda45a4085ba22da686d8c3cf722c170f218 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 25 Sep 2025 10:25:10 -0700 Subject: [PATCH 66/77] Branding for October release (#556) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2cd5da7ed..ad63f14bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 - 10 + 11 0 false From d747a26b416e09519aedf4b9294e329f9d758252 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 20:38:40 +0000 Subject: [PATCH 67/77] Update dependencies from https://github.com/dotnet/arcade build 20250925.3 (#567) [release/9.0.1xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82d9bcef7..d9e5fc8e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c diff --git a/global.json b/global.json index b2220d4b1..47f2745bd 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25475.3", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 84b6e1c755a3476c003475c3fa213b1359a86b11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Sep 2025 16:10:15 +0000 Subject: [PATCH 68/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250925.21 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25474.16 -> To Version 9.0.111-servicing.25475.21 Dependency coherency updates On relative base path root Microsoft.NETCore.App.Ref From Version 9.0.10 -> To Version 9.0.10 (parent: Microsoft.NET.Sdk) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index b801d89ed..9dee13859 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9e5fc8e5..955630e6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,7 +8,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2eb909782582e764afe6f6ed6f961b8baa5d455e + e1f19886fe3354963a4a790c896b3f99689fd7a5 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui 5531aa96fe88f40f612b4772fee56dceefc37932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 369fd4a2964c18dbb55e8c096f92de68a015ea05 + 9c374e8914ba4d89abaf693ffdfd5911a7d1549b From c8aeb54d65b3eaad859672df4c4f80560621afba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Sep 2025 16:35:44 +0000 Subject: [PATCH 69/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20250926.5 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25474.16 -> To Version 9.0.111-servicing.25476.5 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 955630e6b..fcec9a12e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -34,9 +34,9 @@ https://github.com/dotnet/maui 5531aa96fe88f40f612b4772fee56dceefc37932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9c374e8914ba4d89abaf693ffdfd5911a7d1549b + 2cd4c42f8f3fc3b4c4c23f60921ee0d034afb882 From 323dd05cc0ce5e0820e169374d5254bd5aaa509e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 11:43:47 -0700 Subject: [PATCH 70/77] Update dependencies from https://github.com/dotnet/arcade build 20251003.3 (#588) On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25475.3 -> To Version 9.0.0-beta.25503.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/common/post-build/nuget-verification.ps1 | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcec9a12e..e2696ed11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - 6404baed798af89accd98219614e6c90c153cd8c + f8c9a6d12e5a3b281661924da22d7de1cc6ab27d diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index a365194a9..ac5c69ffc 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -30,7 +30,7 @@ [CmdletBinding(PositionalBinding = $false)] param( [string]$NuGetExePath, - [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", [string]$DownloadPath, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$args diff --git a/global.json b/global.json index 47f2745bd..9085d1fdf 100644 --- a/global.json +++ b/global.json @@ -4,7 +4,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25475.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25503.3", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 3a377d5da43d90b20bdb31c6ee2a0d088d46d3df Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Fri, 17 Oct 2025 12:01:55 -0700 Subject: [PATCH 71/77] Update branding to 9.0.112 (#595) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ad63f14bc..d7f0a6407 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 1 - 11 + 12 0 false From 5484c316acb02bb974d0ab1d67aaf8a33df730ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 Oct 2025 19:07:38 +0000 Subject: [PATCH 72/77] Update dependencies from https://github.com/dotnet/arcade build 20251015.2 (#605) [release/9.0.1xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 4 ++-- global.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2696ed11..a881e88df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,9 +40,9 @@ - + https://github.com/dotnet/arcade - f8c9a6d12e5a3b281661924da22d7de1cc6ab27d + 6666973b629b24e259162dba03486c23af464bab diff --git a/global.json b/global.json index 9085d1fdf..61115d92b 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.110" + "dotnet": "9.0.111" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25503.3", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25515.2", "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23552.3", "Microsoft.VisualStudio.Internal.MicroBuild.Vsman": "2.0.174" } From 491b777c21d6366f6c848c7388e282946772c2d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Oct 2025 13:16:53 -0700 Subject: [PATCH 73/77] [release/9.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk (#598) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251007.17 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25476.5 -> To Version 9.0.112-servicing.25507.17 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251009.15 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25476.5 -> To Version 9.0.112-servicing.25509.15 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251010.15 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25476.5 -> To Version 9.0.112-servicing.25510.15 Dependency coherency updates On relative base path root Microsoft.NETCore.App.Ref From Version 9.0.10 -> To Version 9.0.11 (parent: Microsoft.NET.Sdk) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251011.4 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25476.5 -> To Version 9.0.112-servicing.25511.4 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251014.20 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25476.5 -> To Version 9.0.112-servicing.25514.20 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.10 -> To Version 9.0.11 (parent: Microsoft.NET.Sdk) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251015.16 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25476.5 -> To Version 9.0.112-servicing.25515.16 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251017.5 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25476.5 -> To Version 9.0.112-servicing.25517.5 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251017.20 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25476.5 -> To Version 9.0.112-servicing.25517.20 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251019.15 On relative base path root Microsoft.NET.Sdk From Version 9.0.111-servicing.25476.5 -> To Version 9.0.112-servicing.25519.15 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 12 +++--------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9dee13859..1431c91f6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,18 @@ - - - - - + - - - + @@ -45,7 +39,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a881e88df..ee4143271 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/emsdk - f70927a13648c24660c79ff19a6eb2aac100f0ab + 45d453fc255d05e4358671ad3ba8ddea7e978773 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e1f19886fe3354963a4a790c896b3f99689fd7a5 + c0548208279209f56e32771afc90bb5d20dca41c https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui 5531aa96fe88f40f612b4772fee56dceefc37932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cd4c42f8f3fc3b4c4c23f60921ee0d034afb882 + 8db8fe3e8b5ee54f4f8e67ba89c91f35081df4de diff --git a/eng/Versions.props b/eng/Versions.props index d7f0a6407..ea0b3f9af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 9.0.10 + 9.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) @@ -65,7 +65,7 @@ $(MicrosoftNETSdktvOSManifest90100PackageVersion) - 9.0.10 + 9.0.11 $(MicrosoftNETCoreAppRefPackageVersion) From 1e95f80ad92de8266d942ee88132e7db20cd8139 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Oct 2025 10:20:51 -0700 Subject: [PATCH 74/77] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20251021.12 (#614) On relative base path root Microsoft.NET.Sdk From Version 9.0.112-servicing.25519.15 -> To Version 9.0.112-servicing.25521.12 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100,Microsoft.NETCore.App.Ref From Version 9.0.11 -> To Version 9.0.11 (parent: Microsoft.NET.Sdk) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 6 +++--- eng/Version.Details.xml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1431c91f6..0f6b700d9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,12 +13,12 @@ - + - + @@ -39,7 +39,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee4143271..fa9ad2c03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,12 +3,12 @@ https://github.com/dotnet/emsdk - 45d453fc255d05e4358671ad3ba8ddea7e978773 + b65413ac057eb0a54c51b76b1855bc377c2132c3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c0548208279209f56e32771afc90bb5d20dca41c + fa7cdded37981a97cec9a3e233c4a6af58a91c57 https://github.com/dotnet/android @@ -34,9 +34,9 @@ https://github.com/dotnet/maui 5531aa96fe88f40f612b4772fee56dceefc37932 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8db8fe3e8b5ee54f4f8e67ba89c91f35081df4de + 49aa03442a648a5064a4440f16109db773a9f9b5 From 3407d9b0b00d969cf88643912202a7d81c59591b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Oct 2025 21:17:03 +0000 Subject: [PATCH 75/77] Update dependencies from https://github.com/dotnet/macios build 20251021.3 (#617) On relative base path root Microsoft.NET.Sdk.iOS.Manifest-9.0.100 , Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100 , Microsoft.NET.Sdk.macOS.Manifest-9.0.100 , Microsoft.NET.Sdk.tvOS.Manifest-9.0.100 From Version 26.0.9752 -> To Version 26.0.9760 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0f6b700d9..66ee80c32 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa9ad2c03..7e4d32411 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,21 +14,21 @@ https://github.com/dotnet/android 1dcfb6f8779c33b6f768c996495cb90ecd729329 - + https://github.com/dotnet/macios - 177f4311930b32eecc1e462a71ebbe34b7e01a0b + aecad730d65897ac6dc1a26d51d91ad657b24abe - + https://github.com/dotnet/macios - 177f4311930b32eecc1e462a71ebbe34b7e01a0b + aecad730d65897ac6dc1a26d51d91ad657b24abe - + https://github.com/dotnet/macios - 177f4311930b32eecc1e462a71ebbe34b7e01a0b + aecad730d65897ac6dc1a26d51d91ad657b24abe - + https://github.com/dotnet/macios - 177f4311930b32eecc1e462a71ebbe34b7e01a0b + aecad730d65897ac6dc1a26d51d91ad657b24abe https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index ea0b3f9af..e9eaef993 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 9.0.100 35.0.105 - 26.0.9752 - 26.0.9752 - 26.0.9752 - 26.0.9752 + 26.0.9760 + 26.0.9760 + 26.0.9760 + 26.0.9760 9.0.111 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) From 640d0e516912f3f50d52dddfe51eb16c87cd17d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Oct 2025 09:54:47 -0700 Subject: [PATCH 76/77] Update dependencies from https://github.com/dotnet/macios build 20251023.11 (#625) On relative base path root Microsoft.NET.Sdk.iOS.Manifest-9.0.100 , Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100 , Microsoft.NET.Sdk.macOS.Manifest-9.0.100 , Microsoft.NET.Sdk.tvOS.Manifest-9.0.100 From Version 26.0.9760 -> To Version 26.0.9765 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 66ee80c32..e16e66855 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e4d32411..42913d15f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,21 +14,21 @@ https://github.com/dotnet/android 1dcfb6f8779c33b6f768c996495cb90ecd729329 - + https://github.com/dotnet/macios - aecad730d65897ac6dc1a26d51d91ad657b24abe + 33af3994a7bcf51fdd870a0248c33aeb6c321232 - + https://github.com/dotnet/macios - aecad730d65897ac6dc1a26d51d91ad657b24abe + 33af3994a7bcf51fdd870a0248c33aeb6c321232 - + https://github.com/dotnet/macios - aecad730d65897ac6dc1a26d51d91ad657b24abe + 33af3994a7bcf51fdd870a0248c33aeb6c321232 - + https://github.com/dotnet/macios - aecad730d65897ac6dc1a26d51d91ad657b24abe + 33af3994a7bcf51fdd870a0248c33aeb6c321232 https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index e9eaef993..8b558a127 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 9.0.100 35.0.105 - 26.0.9760 - 26.0.9760 - 26.0.9760 - 26.0.9760 + 26.0.9765 + 26.0.9765 + 26.0.9765 + 26.0.9765 9.0.111 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion) From 2be6823f7c66b9267fb2ace9f77748ed29ce0a1a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Oct 2025 01:08:58 +0000 Subject: [PATCH 77/77] Update dependencies from https://github.com/dotnet/macios build 20251027.6 On relative base path root Microsoft.NET.Sdk.iOS.Manifest-9.0.100 , Microsoft.NET.Sdk.MacCatalyst.Manifest-9.0.100 , Microsoft.NET.Sdk.macOS.Manifest-9.0.100 , Microsoft.NET.Sdk.tvOS.Manifest-9.0.100 From Version 26.0.9765 -> To Version 26.0.9766 --- NuGet.config | 2 +- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index e16e66855..205a37fab 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42913d15f..07c2ed56b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,21 +14,21 @@ https://github.com/dotnet/android 1dcfb6f8779c33b6f768c996495cb90ecd729329 - + https://github.com/dotnet/macios - 33af3994a7bcf51fdd870a0248c33aeb6c321232 + e5afbf5332820488c4a2d26dad02df88c0110136 - + https://github.com/dotnet/macios - 33af3994a7bcf51fdd870a0248c33aeb6c321232 + e5afbf5332820488c4a2d26dad02df88c0110136 - + https://github.com/dotnet/macios - 33af3994a7bcf51fdd870a0248c33aeb6c321232 + e5afbf5332820488c4a2d26dad02df88c0110136 - + https://github.com/dotnet/macios - 33af3994a7bcf51fdd870a0248c33aeb6c321232 + e5afbf5332820488c4a2d26dad02df88c0110136 https://github.com/dotnet/maui diff --git a/eng/Versions.props b/eng/Versions.props index 8b558a127..1a71e3cad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -52,10 +52,10 @@ 9.0.100 35.0.105 - 26.0.9765 - 26.0.9765 - 26.0.9765 - 26.0.9765 + 26.0.9766 + 26.0.9766 + 26.0.9766 + 26.0.9766 9.0.111 $(MicrosoftNETSdkMauiManifest90100PackageVersion) $(MicrosoftNETSdkAndroidManifest90100PackageVersion)