move android workload to explicit opt-in

dragonfruitnetwork · Jan 13, 2023 · 0be6b23 · 0be6b23
1 parent 54da2fd
commit 0be6b23
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/codequality.yaml b/.github/workflows/codequality.yaml
@@ -29,9 +29,7 @@ jobs:
           dotnet-version: "6.0.x"
 
       - name: Restore Tools
-        run: |
-          sudo dotnet workload restore
-          dotnet tool restore
+        run: dotnet tool restore
 
       - name: Restore Packages
         run: dotnet restore

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -23,14 +23,14 @@ jobs:
           dotnet restore
 
       - name: Build
-        run: dotnet build -c Release -v normal -p:Version=${{ github.ref_name }}
+        run: dotnet build -c Release -v normal -p:EnableAndroid=true -p:Version=${{ github.ref_name }}
 
       - name: Pack (Beta)
-        run: dotnet pack -c Release --include-symbols --no-build -v normal -o . -p:PackageVersion=${{ github.ref_name }}-beta
+        run: dotnet pack -c Release --include-symbols --no-build -v normal -o . -p:EnableAndroid=true -p:PackageVersion=${{ github.ref_name }}-beta
         if: "github.event.release.prerelease"
 
       - name: Pack (Stable)
-        run: dotnet pack -c Release --include-symbols --no-build -v normal -o . -p:PackageVersion=${{ github.ref_name }}
+        run: dotnet pack -c Release --include-symbols --no-build -v normal -o . -p:EnableAndroid=true -p:PackageVersion=${{ github.ref_name }}
         if: "!github.event.release.prerelease"
 
       - name: Publish

diff --git a/src/DragonFruit.Data.csproj b/src/DragonFruit.Data.csproj
@@ -3,7 +3,7 @@
     <Import Project="$(SolutionDir)res\DragonFruit.Data.props" />
 
     <PropertyGroup>
-        <TargetFrameworks>$(TargetFrameworks);net6.0-android</TargetFrameworks>
+        <TargetFrameworks Condition="'$(EnableAndroid)' == 'true'">$(TargetFrameworks);net6.0-android</TargetFrameworks>
 
         <PackageId>DragonFruit.Data</PackageId>
         <Description>A web requests framework for .NET that powers the DragonFruit APIs</Description>