Cleanup

rbfx · Jan 23, 2024 · b77ee2a · b77ee2a
1 parent f5915e5
commit b77ee2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/.github/workflows/build-master.yml b/.github/workflows/build-master.yml
@@ -154,19 +154,12 @@ jobs:
     - name: 'Print Java version'
       run: javac -version
 
-    # - name: 'Switch to Java 11'
-    #   run: |
-    #     javac -version
-    #     sudo update-java-alternatives --list
-    #     sudo update-java-alternatives --set /usr/lib/jvm/temurin-11-jdk-amd64
-    #     javac -version
-
     - name: Install Android SDK and Platforms
       run: $ANDROID_HOME/cmdline-tools/bin/sdkmanager "platform-tools" "platforms;android-33" --sdk_root=$ANDROID_HOME
 
     - name: Dotnet Publish
       working-directory: ./RbfxTemplate.Android
-      run: dotnet publish -f net7.0-android33 -c Release --no-restore -p:AndroidVersionCode=${{ needs.set_version.outputs.ANDROID_VERSION }} -p:AndroidSdkDirectory=$ANDROID_HOME -p:Version=${{ needs.set_version.outputs.BUILD_VERSION }}
+      run: dotnet publish -f net7.0-android -c Release --no-restore -p:AndroidVersionCode=${{ needs.set_version.outputs.ANDROID_VERSION }} -p:AndroidSdkDirectory=$ANDROID_HOME -p:Version=${{ needs.set_version.outputs.BUILD_VERSION }}
 
     - name: Release
       uses: softprops/action-gh-release@v1

diff --git a/RbfxTemplate.Android/RbfxTemplate.Android.csproj b/RbfxTemplate.Android/RbfxTemplate.Android.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0-android33</TargetFramework>
+    <TargetFramework>net7.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <OutputType>Exe</OutputType>
     <Nullable>enable</Nullable>