Remvoe x64 dotnet usage

dellis1972 · Sep 13, 2024 · 74f55f3 · 74f55f3
1 parent aae2674
commit 74f55f3
Showing 1 changed file with 2 additions and 35 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -56,49 +56,29 @@ jobs:
         run: wget -qO- https://monogame.net/downloads/net8_mgfxc_wine_setup.sh | bash
         if: runner.os != 'Windows'
 
-      - name: Download dotnet-install.sh
-        run: |
-          wget https://dot.net/v1/dotnet-install.sh
-          chmod u+x dotnet-install.sh
-          ls -la
-        working-directory: ${{github.workspace}}
-        if: runner.os != 'Windows'
-
-      - name: Install x64 dotnet
-        run: ${{github.workspace}}/dotnet-install.sh --architecture x64 --install-dir ${{github.workspace}}/dotnet64 --version latest
-        working-directory: ${{github.workspace}}
-        if: runner.os != 'Windows'
-
       - name: Install required workloads
         run:   |
               if [ "$RUNNER_OS" == "Linux" ]; then
                     dotnet workload install android
-                    ${{github.workspace}}/dotnet64/dotnet workload install android
               elif [ "$RUNNER_OS" == "Windows" ]; then
                     dotnet.exe workload install android ios macos
               else
                     dotnet workload install android
-                    ${{github.workspace}}/dotnet64/dotnet workload install android ios macos
               fi
         shell: bash
 
-      - name: Build
-        run: ${{github.workspace}}/dotnet64/dotnet run --project build/Build.csproj -- --target=Default
-        if: runner.os != 'Windows'
-
       - name: Build
         run: dotnet run --project build/Build.csproj -- --target=Default
-        if: runner.os == 'Windows'
 
       - name: Test
-        run: ${{github.workspace}}/dotnet64/dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 1m -c Release
+        run: dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 1m -c Release
         env:
           DOTNET_ROOT: ${{github.workspace}}/dotnet64
           MGFXC_WINE_PATH: /home/runner/.winemonogame
         if: runner.os == 'Linux'
 
       - name: Test
-        run: ${{github.workspace}}/dotnet64/dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 1m -c Release
+        run: dotnet test Tools/MonoGame.Tools.Tests/MonoGame.Tools.Tests.csproj --blame-hang-timeout 1m -c Release
         env:
           DOTNET_ROOT: ${{github.workspace}}/dotnet64
           MGFXC_WINE_PATH: /Users/runner/.winemonogame
@@ -219,16 +199,3 @@ jobs:
         env:
           WINEPREFIX: /Users/runner/.winemonogame
         if: runner.os == 'macOS'
-
-      - name: Download dotnet-install.sh
-        run: |
-          wget https://dot.net/v1/dotnet-install.sh
-          chmod u+x dotnet-install.sh
-          ls -la
-        working-directory: ${{github.workspace}}
-        if: runner.os != 'Windows'
-
-      - name: Install ${{runner.abi}} dotnet
-        run: ${{github.workspace}}/dotnet-install.sh --architecture ${{runner.abi}} --install-dir ${{github.workspace}}/dotnet64 --version latest
-        working-directory: ${{github.workspace}}
-        if: runner.os != 'Windows'