From 220e67755ae6323a01011b83070dff6f84b02519 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Tue, 8 Mar 2022 17:57:38 -0600 Subject: [PATCH] Partial revert of Maui Install Fix #65904 (#66221) * Prep for test build run. * Replace the rollback file in the install call as the emscription line has been added to the downloaded json. * Revert "Prep for test build run." This reverts commit 2d7cca803e1cb6b79f83583b4dfa9846be3cf95e. * Fix comment detailing Install Maui Workload setup. --- eng/pipelines/coreclr/templates/build-perf-maui-apps.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml index 3b526c0..998c01e 100644 --- a/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml +++ b/eng/pipelines/coreclr/templates/build-perf-maui-apps.yml @@ -110,19 +110,14 @@ steps: # overwriteExistingFiles: true # cleanDestinationFolder: false - # Get the current maui nuget config so all things can be found, and add the Emscription version to the rollback file - # Add emscription line using sed based on https://stackoverflow.com/questions/6739258/how-do-i-add-a-line-of-text-to-the-middle-of-a-file-using-bash. - # This is a workaround as the current + # Get the current maui nuget config so all things can be found and darc based package sources are kept up to date. - script: | curl -o NuGet.config 'https://raw.githubusercontent.com/dotnet/maui/main/NuGet.config' - curl -o rollback.json 'https://maui.blob.core.windows.net/metadata/rollbacks/main.json' - sed -n 'H;${x;s/^\n//;s/ "microsoft.net.sdk.android".*$/ "microsoft.net.workload.emscripten": "6.0.2",\n&/;p;}' rollback.json > updated_rollback.json - cat updated_rollback.json curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh' chmod -R a+rx . ./dotnet-install.sh --channel 6.0.2xx --quality daily --install-dir . ./dotnet --info - ./dotnet workload install maui --from-rollback-file ./updated_rollback.json --configfile NuGet.config + ./dotnet workload install maui --from-rollback-file https://aka.ms/dotnet/maui/main.json --configfile NuGet.config displayName: Install MAUI workload workingDirectory: $(Build.SourcesDirectory) -- 2.7.4