From ecef97fb3b94ce495b49f89804bf1e9444a2b50e Mon Sep 17 00:00:00 2001
From: Austin <azlanaviv@gmail.com>
Date: Sun, 11 Oct 2026 18:16:09 +0530
Subject: [PATCH] Fix Android SDK setup in CI and suppress netcoreapp3.1 TFM
 warning

- Update android-actions/setup-android to v4.0.4 in build.yml and sdl2.yml to avoid deprecated tools package failure

- Add SuppressTfmSupportBuildWarnings to build/props/common.props to suppress System.Runtime.CompilerServices.Unsafe warning on netcoreapp3.1

- Add RollForward Major to Silk.NET.NUKE.csproj so NUKE can execute on .NET 8+ environments
---
 .github/workflows/build.yml     | 2 +-
 .github/workflows/sdl2.yml      | 2 +-
 build/nuke/Silk.NET.NUKE.csproj | 1 +
 build/props/common.props        | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e326351877..acb6edf375 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
         java-version: 21
         distribution: "temurin"
     - name: Setup Android Environment
-      uses: android-actions/setup-android@v2
+      uses: android-actions/setup-android@v4.0.4
       env:
         ANDROID_SDK_ROOT: /Users/runner/Library/Android/sdk
     - name: Install Android Platforms
diff --git a/.github/workflows/sdl2.yml b/.github/workflows/sdl2.yml
index 683120813d..9c65f93ed3 100644
--- a/.github/workflows/sdl2.yml
+++ b/.github/workflows/sdl2.yml
@@ -68,7 +68,7 @@ jobs:
         run: |
           echo "cur_path=$env:PATH\n" >> $env:GITHUB_OUTPUT
       - name: Setup Android Environment
-        uses: android-actions/setup-android@v3
+        uses: android-actions/setup-android@v4.0.4
         if: runner.os == 'Windows'
         env:
           PATH: "${{ env.DOTNET_ROOT }};${{ env.DOTNET_ROOT }}\\tools;${{ steps.set_path.outputs.cur_path }}"
diff --git a/build/nuke/Silk.NET.NUKE.csproj b/build/nuke/Silk.NET.NUKE.csproj
index f44a75e1a9..b324c8947c 100644
--- a/build/nuke/Silk.NET.NUKE.csproj
+++ b/build/nuke/Silk.NET.NUKE.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net7.0</TargetFramework>
+    <RollForward>Major</RollForward>
     <RootNamespace></RootNamespace>
     <NoWarn>CS0649;CS0169</NoWarn>
     <NukeRootDirectory>..\..</NukeRootDirectory>
diff --git a/build/props/common.props b/build/props/common.props
index 6f3b00a2e3..12b83690d2 100644
--- a/build/props/common.props
+++ b/build/props/common.props
@@ -8,6 +8,7 @@
     </PropertyGroup>
     <!-- Core properties -->
     <PropertyGroup>
+        <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <LangVersion>preview</LangVersion>
         <Authors>.NET Foundation and Contributors</Authors>