From e74aa762f6276ce49e715250d744c7c0afd051e7 Mon Sep 17 00:00:00 2001
From: Parker Bibus <parkerbibus@microsoft.com>
Date: Wed, 19 Feb 2025 16:30:26 -0800
Subject: [PATCH] Update the folder used for the runtime HelloAndroid app and
 update the perfBDN app dotnet-install.sh version retrieval.

---
 eng/pipelines/performance/templates/build-perf-bdn-app.yml   | 5 ++---
 .../performance/templates/build-perf-sample-apps.yml         | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/eng/pipelines/performance/templates/build-perf-bdn-app.yml b/eng/pipelines/performance/templates/build-perf-bdn-app.yml
index d008ca63bb980e..65f80896066ec0 100644
--- a/eng/pipelines/performance/templates/build-perf-bdn-app.yml
+++ b/eng/pipelines/performance/templates/build-perf-bdn-app.yml
@@ -85,9 +85,8 @@ steps:
   - script: |
       echo '{ }' > ./global.json
       curl -o NuGet.config 'https://raw.githubusercontent.com/dotnet/maui/${{parameters.framework}}/NuGet.config'
-      curl -o dotnet-install.sh 'https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh'
-      curl -Lo performance-version-details.xml 'https://raw.githubusercontent.com/dotnet/performance/${{parameters.perfBranch}}/eng/Version.Details.xml'
-      version=$(sed -nr 's/[[:space:]]*<Dependency Name="Microsoft.NET.Sdk" Version="(.*)"[[:space:]].*/\1/p' ./performance-version-details.xml)
+      curl -o dotnet-install.sh 'https://builds.dotnet.microsoft.com/dotnet/scripts/v1/dotnet-install.sh'
+      version=$(sed -nr 's/[[:space:]]*<Dependency Name="Microsoft.NET.Sdk" Version="([^"]*)"[[:space:]]?.*/\1/p' ./performance/eng/Version.Details.xml)
       echo dotnet-version: $version
       chmod -R a+rx .
       ./dotnet-install.sh --version $version --install-dir .
diff --git a/eng/pipelines/performance/templates/build-perf-sample-apps.yml b/eng/pipelines/performance/templates/build-perf-sample-apps.yml
index b1855727e127fd..0f8aee1c229962 100644
--- a/eng/pipelines/performance/templates/build-perf-sample-apps.yml
+++ b/eng/pipelines/performance/templates/build-perf-sample-apps.yml
@@ -26,7 +26,7 @@ steps:
       displayName: Build HelloAndroid sample app
     - template: /eng/pipelines/common/upload-artifact-step.yml
       parameters:
-        rootFolder: $(Build.SourcesDirectory)/artifacts/bin/AndroidSampleApp/arm64/Release/android-arm64/publish/apk/bin/HelloAndroid.apk
+        rootFolder: $(Build.SourcesDirectory)/artifacts/bin/AndroidSampleApp/arm64/Release/android-arm64/Bundle/bin/HelloAndroid.apk
         includeRootFolder: true
         displayName: Android Mono Artifacts
         artifactName: AndroidMonoarm64