From 6656876d9587bcadb5b181d326a1f7b76f599e4b Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 28 Nov 2024 16:00:40 +0000 Subject: [PATCH 1/4] Can we bump this sdk --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index fc79498cb541..0a81f45e81c6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100" + "dotnet": "9.0.102-servicing.24577.25" }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", From 9dba3fbbc6847a845338c034d5a925e89d1ff288 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Thu, 28 Nov 2024 16:08:12 +0000 Subject: [PATCH 2/4] Enable source index fix variables Update azure-pipelines-internal.yml Update NuGet.config try pass this one Update NuGet.config enable source index Update build-test-pack.yml Update build-test-pack.yml try enable source index try this again no warn and bin log try fix binlog --- NuGet.config | 7 +++++-- eng/pipelines/azure-pipelines-internal.yml | 16 ++++++++++------ eng/pipelines/azure-pipelines-public.yml | 9 +++------ eng/pipelines/common/build-test-pack.yml | 4 ++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index eb49f1b33673..e72b7b6588db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,8 +13,11 @@ - - - + + + + + diff --git a/eng/pipelines/azure-pipelines-internal.yml b/eng/pipelines/azure-pipelines-internal.yml index 55e20da20bbd..61d0e90cd297 100644 --- a/eng/pipelines/azure-pipelines-internal.yml +++ b/eng/pipelines/azure-pipelines-internal.yml @@ -81,12 +81,12 @@ variables: parameters: - name: pushMauiPackagesToMaestro + type: boolean default: true - - name: provisionatorChannel - displayName: 'Provisionator channel' - type: string - default: 'latest' # Support for launching a build against a Provisionator PR (e.g., pr/[github-account-name]/[pr-number]) as a means to test in-progress Provisionator changes + - name: enableSourceIndex + type: boolean + default: true - name: VM_IMAGE_HOST type: object @@ -107,6 +107,7 @@ parameters: artifactsPath: '$(Build.ArtifactStagingDirectory)' - name: Skip1ESComplianceTasks + type: boolean default: false resources: @@ -151,9 +152,12 @@ extends: enablePublishBuildAssets: true enableTelemetry: true enableSourceBuild: false - enableSourceIndex: false + enableSourceIndex: ${{ parameters.enableSourceIndex }} + sourceIndexParams: + sourceIndexBuildCommand: build.cmd -restore -build -ci -warnAsError 0 /bl:$(Build.Arcade.LogsPath)sourceIndexBuild.binlog /p:OfficialBuildId=$(_BuildOfficalId) /p:_SkipUpdateBuildNumber=true + binlogPath: $(Build.Arcade.LogsPath)sourceIndexBuild.binlog publishAssetsImmediately: true - # Publish build logs + # Publish build logs enablePublishBuildArtifacts: true # Publish test logs enablePublishTestResults: true diff --git a/eng/pipelines/azure-pipelines-public.yml b/eng/pipelines/azure-pipelines-public.yml index 8925b4efea0e..ee3fdb16a3cd 100644 --- a/eng/pipelines/azure-pipelines-public.yml +++ b/eng/pipelines/azure-pipelines-public.yml @@ -80,12 +80,8 @@ variables: parameters: - name: pushMauiPackagesToMaestro - default: true - - - name: provisionatorChannel - displayName: 'Provisionator channel' - type: string - default: 'latest' + type: boolean + default: true - name: VM_IMAGE_HOST type: object @@ -106,6 +102,7 @@ parameters: artifactsPath: '$(Build.ArtifactStagingDirectory)' - name: Skip1ESComplianceTasks + type: boolean default: true stages: diff --git a/eng/pipelines/common/build-test-pack.yml b/eng/pipelines/common/build-test-pack.yml index f0cee6a16873..6b4bb027099d 100644 --- a/eng/pipelines/common/build-test-pack.yml +++ b/eng/pipelines/common/build-test-pack.yml @@ -127,11 +127,11 @@ steps: - ${{ if and(eq(parameters.isWindows, 'true'), ne(parameters.runAsPublic, 'true') ) }}: - script: ${{ parameters.buildScript }} - -pack + -restore -pack -sign $(_SignArgs) -publish $(_PublishArgs) -configuration $(_BuildConfig) - /bl:${{ parameters.repoLogPath }}/pack.binlog + /bl:${{ parameters.repoLogPath }}pack.binlog $(_OfficialBuildIdArgs) displayName: Pack, Sign & Publish From 23ba119a9afc7729ff0fb03c11ba21c9428a5033 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 16 Dec 2024 14:32:39 +0000 Subject: [PATCH 3/4] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 0a81f45e81c6..f66d6a8f80e7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.102-servicing.24577.25" + "dotnet": "9.0.101" }, "msbuild-sdks": { "MSBuild.Sdk.Extras": "3.0.44", From 4ab0609a1133a07c2aa8b9cc55fb7d4107496c16 Mon Sep 17 00:00:00 2001 From: Rui Marinho Date: Mon, 16 Dec 2024 18:59:05 +0000 Subject: [PATCH 4/4] Update NuGet.config --- NuGet.config | 2 -- 1 file changed, 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index e72b7b6588db..b2aa1f54a073 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,8 +15,6 @@ - -