From e5a19ca2ecd8bda40f5c6f3f7b7938b8c31c8a4c Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Fri, 13 Jun 2025 11:01:56 -0500
Subject: [PATCH] Restore CI, to be able to release latest packages

Context: https://discord.com/channels/732297728826277939/732297837953679412/1383008897266352260

To get CI working and producing `net8.0-android;net10.0-android` packages:

* Revert dd6bdd27

* Run `--target=build-android-libraries-net10-net8` again
---
 build/ci/build-and-test.yml | 100 ++++++++++++++++++------------------
 global.json                 |   8 ++-
 2 files changed, 57 insertions(+), 51 deletions(-)

diff --git a/build/ci/build-and-test.yml b/build/ci/build-and-test.yml
index b561aac1a..46d684d57 100644
--- a/build/ci/build-and-test.yml
+++ b/build/ci/build-and-test.yml
@@ -7,59 +7,59 @@ parameters:
   - Square
 
 steps:
-  - pwsh: |
-      dotnet cake build.cake `
-        --target=ci-build `
-        --configuration="$(configuration)" `
-        --verbosity="$(verbosity)"
-    displayName: 'Build packages'
-    env:
-      JavaSdkDirectory: $(JAVA_HOME)
-      RepositoryCommit: $(Build.SourceVersion)
-      RepositoryBranch: $(Build.SourceBranchName)
-      RepositoryUrl: $(Build.Repository.Uri)
-      RepositoryType: "git"
+  # - pwsh: |
+  #     dotnet cake build.cake `
+  #       --target=ci-build `
+  #       --configuration="$(configuration)" `
+  #       --verbosity="$(verbosity)"
+  #   displayName: 'Build packages'
+  #   env:
+  #     JavaSdkDirectory: $(JAVA_HOME)
+  #     RepositoryCommit: $(Build.SourceVersion)
+  #     RepositoryBranch: $(Build.SourceBranchName)
+  #     RepositoryUrl: $(Build.Repository.Uri)
+  #     RepositoryType: "git"
 
-  - pwsh: |
-      dotnet cake validation.cake `
-        --namespaces="${{ join(',', parameters.validPackagePrefixes) }}" `
-        --verbosity="$(verbosity)"
-    displayName: 'Run NuGet package validation'
+  # - pwsh: |
+  #     dotnet cake validation.cake `
+  #       --namespaces="${{ join(',', parameters.validPackagePrefixes) }}" `
+  #       --verbosity="$(verbosity)"
+  #   displayName: 'Run NuGet package validation'
     
-  - pwsh: |
-      dotnet cake nuget-diff.cake `
-        --artifacts="${{ parameters.artifactsPath }}" `
-        --output="${{ parameters.artifactsPath }}/api-diff" `
-        --cache="$(Agent.TempDirectory)/api-diff" `
-        --verbosity="$(verbosity)"
-    displayName: 'Generate API diff'
+  # - pwsh: |
+  #     dotnet cake nuget-diff.cake `
+  #       --artifacts="${{ parameters.artifactsPath }}" `
+  #       --output="${{ parameters.artifactsPath }}/api-diff" `
+  #       --cache="$(Agent.TempDirectory)/api-diff" `
+  #       --verbosity="$(verbosity)"
+  #   displayName: 'Generate API diff'
 
-  - pwsh: dotnet cake utilities.cake -t=verify-namespace-file
-    displayName: Verify published namespaces
+  # - pwsh: dotnet cake utilities.cake -t=verify-namespace-file
+  #   displayName: Verify published namespaces
 
-  - pwsh: |
-      dotnet cake build.cake `
-        --target=ci-samples `
-        --configuration="$(configuration)" `
-        --verbosity="$(verbosity)"
-    displayName: 'Build samples'
-    condition: ne(variables['skipSamplesTests'], 'true')
-    env:
-      JavaSdkDirectory: $(JAVA_HOME)
-      RepositoryCommit: $(Build.SourceVersion)
-      RepositoryBranch: $(Build.SourceBranchName)
-      RepositoryUrl: $(Build.Repository.Uri)
-      RepositoryType: "git"
+  # - pwsh: |
+  #     dotnet cake build.cake `
+  #       --target=ci-samples `
+  #       --configuration="$(configuration)" `
+  #       --verbosity="$(verbosity)"
+  #   displayName: 'Build samples'
+  #   condition: ne(variables['skipSamplesTests'], 'true')
+  #   env:
+  #     JavaSdkDirectory: $(JAVA_HOME)
+  #     RepositoryCommit: $(Build.SourceVersion)
+  #     RepositoryBranch: $(Build.SourceBranchName)
+  #     RepositoryUrl: $(Build.Repository.Uri)
+  #     RepositoryType: "git"
     
-  - task: DotNetCoreCLI@2
-    displayName: Run unit tests
-    condition: ne(variables['skipUnitTests'], 'true')
-    inputs:
-      command: test
-      projects: util/**/*.Tests.csproj
-      arguments: '-c $(configuration)'
+  # - task: DotNetCoreCLI@2
+  #   displayName: Run unit tests
+  #   condition: ne(variables['skipUnitTests'], 'true')
+  #   inputs:
+  #     command: test
+  #     projects: util/**/*.Tests.csproj
+  #     arguments: '-c $(configuration)'
 
-#  - pwsh: |
-#      dotnet cake build.cake `
-#        --target=build-android-libraries-net10-net8
-#    displayName: 'Build build-android-libraries-net10-net8'
+  - pwsh: |
+      dotnet cake build.cake `
+        --target=build-android-libraries-net10-net8
+    displayName: 'Build build-android-libraries-net10-net8'
diff --git a/global.json b/global.json
index d6ae882fb..0d8cf64bd 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,11 @@
 {
-    "msbuild-sdks": {
+    "sdk": 
+    {
+        "version": "8.0.408",
+        "rollForward": "patch"
+    },
+    "msbuild-sdks": 
+    {
         "MSBuild.Sdk.Extras": "3.0.44",
         "Microsoft.Build.Traversal": "4.1.82",
         "Microsoft.Build.NoTargets": "3.7.56",