Revert "tweak build to try and get android to succeed"

This reverts commit d802ed5.
ericsink · Feb 5, 2024 · 610163c · 610163c
1 parent 43a3f90
commit 610163c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -29,10 +29,10 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
-    - name: Setup .NET
+    - name: Setup .NET 6
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 6.0.x
         include-prerelease: true
     - name: Install workload ios
       run: dotnet workload install ios

diff --git a/version_stamp/version_stamp.cs b/version_stamp/version_stamp.cs
@@ -113,7 +113,7 @@ private static void gen_directory_build_props(string root, string nupkgs_dir_nam
             f.WriteElementString("tfm_net6_ios", "net6.0-ios14.2");
             f.WriteElementString("tfm_net6_tvos", "net6.0-tvos10"); // TODO seems wrong
             f.WriteElementString("tfm_net6_maccatalyst", "net6.0-ios14.0");
-            f.WriteElementString("tfm_net6_android", "net7.0-android"); // TODO seems wrong
+            f.WriteElementString("tfm_net6_android", "net6.0-android"); // TODO seems wrong
 
             f.WriteComment("The NoNFloatUsing below is a workaround for xamarin/xamarin-macios/#14434");
             f.WriteElementString("NoNFloatUsing", "true");