From 8bdb326e3757a277484401256e82dbdc0c8128bf Mon Sep 17 00:00:00 2001
From: Gerald Versluis <gerald.versluis@microsoft.com>
Date: Wed, 27 Nov 2024 09:27:12 +0100
Subject: [PATCH] Fix build and some minor improvements

---
 .github/workflows/build-all.yml                        | 10 +++++++---
 .github/workflows/build-pr.yml                         | 10 +++++++---
 .../Platforms/Android/AndroidManifest.xml              |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml
index 7eb1ce736..64e68beb2 100644
--- a/.github/workflows/build-all.yml
+++ b/.github/workflows/build-all.yml
@@ -23,10 +23,9 @@ jobs:
 
     - name: Install .NET MAUI Workload
       run: dotnet workload install maui
-      # if: runner.os == 'macOS' # reenable when .NET 8 is default on hosted runners
 
     - name: Select Xcode Version
-      run: sudo xcode-select -s /Applications/Xcode_16.1.app
+      run: sudo xcode-select -s /Applications/Xcode_16.0.app
       if: runner.os == 'macOS'
 
     - name: Find and build all C# projects
@@ -75,7 +74,12 @@ jobs:
 
                 $proj_dir = [System.IO.Path]::GetDirectoryName($csproj)
                 Write-Output "Cleaning up bin & obj in $proj_dir"
-                Get-ChildItem -Path $proj_dir -Directory -Recurse -Include bin,obj | Remove-Item -Recurse -Force
+                
+                try {
+                  Get-ChildItem -Path $proj_dir -Directory -Recurse -Include bin,obj | Remove-Item -Recurse -Force
+                } catch {
+                  Write-Output "::warning:: Failed to clean up bin & obj in $proj_dir"  
+                }
 
                 Write-Output "::endgroup::"
             }
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index b0b9b0fb4..ae208ff41 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -27,10 +27,9 @@ jobs:
 
     - name: Install .NET MAUI Workload
       run: dotnet workload install maui
-      # if: runner.os == 'macOS' # reenable when .NET 8 is default on hosted runners
 
     - name: Select Xcode Version
-      run: sudo xcode-select -s /Applications/Xcode_16.1.app
+      run: sudo xcode-select -s /Applications/Xcode_16.0.app
       if: runner.os == 'macOS'
 
     - name: Find and build changed projects
@@ -112,7 +111,12 @@ jobs:
 
                   $proj_dir = [System.IO.Path]::GetDirectoryName($projectToBuild)
                   Write-Output "Cleaning up bin & obj in $proj_dir"
-                  Get-ChildItem -Path $proj_dir -Directory -Recurse -Include bin,obj | Remove-Item -Recurse -Force
+
+                  try {
+                    Get-ChildItem -Path $proj_dir -Directory -Recurse -Include bin,obj | Remove-Item -Recurse -Force
+                  } catch {
+                    Write-Output "::warning:: Failed to clean up bin & obj in $proj_dir"  
+                  }
 
                   Write-Output "::endgroup::"
                 }
diff --git a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Platforms/Android/AndroidManifest.xml b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Platforms/Android/AndroidManifest.xml
index 48b9e6aa4..68d8df73b 100644
--- a/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Platforms/Android/AndroidManifest.xml
+++ b/9.0/Apps/WeatherTwentyOne/src/WeatherTwentyOne/Platforms/Android/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="35" />
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
\ No newline at end of file