Yes

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 839e54f42995702f012f6ad4e794514e52f0e80d..d252d4ea0d0ec19198833af31fec55db27254e9b 100644 (file)
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -22,21 +22,21 @@ jobs:
           dotnet-version: 5.0.100-rc.1.20452.10
       - name: Install dependencies
         run: dotnet restore ./src
-      - name: Build Impostor.Client
-        run: msbuild ./src/Impostor.Client/Impostor.Client.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None
+      # - name: Build Impostor.Client
+      #   run: msbuild ./src/Impostor.Client/Impostor.Client.csproj /p:Configuration=Release /p:DebugSymbols=false /p:DebugType=None
       - name: Build Impostor.Server
-        run: dotnet build --no-restore -c Release -f netcoreapp3.1 ./src/Impostor.Server/Impostor.Server.csproj
+        run: dotnet build --no-restore -c Release -f net5.0 ./src/Impostor.Server/Impostor.Server.csproj
       - name: Test
-        run: dotnet test --no-restore -v normal -f netcoreapp3.1 ./src
-      - name: Zip Impostor.Client
-        shell: bash
-        run: |
-          cd ./src/Impostor.Client/bin/Release/net452/win-x64
-          7z a -r $GITHUB_WORKSPACE/build/win-x64-client.zip *
-          cd $GITHUB_WORKSPACE
+        run: dotnet test --no-restore -v normal -f net5.0 ./src
+      # - name: Zip Impostor.Client
+      #   shell: bash
+      #   run: |
+      #     cd ./src/Impostor.Client/bin/Release/net452/win-x64
+      #     7z a -r $GITHUB_WORKSPACE/build/win-x64-client.zip *
+      #     cd $GITHUB_WORKSPACE
       - 
         name: Publish Impostor.Server (win-x64)
-        run: dotnet publish -c release -o ./build/win-x64 -f netcoreapp3.1 -r win-x64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
+        run: dotnet publish -c release -o ./build/win-x64 -f net5.0 -r win-x64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
       - name: Zip Impostor.Server (win-x64)
         shell: bash
         run: |
@@ -45,7 +45,7 @@ jobs:
           cd $GITHUB_WORKSPACE
       - 
         name: Publish Impostor.Server (linux-x64)
-        run: dotnet publish -c release -o ./build/linux-x64 -f netcoreapp3.1 -r linux-x64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
+        run: dotnet publish -c release -o ./build/linux-x64 -f net5.0 -r linux-x64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
       - name: Zip Impostor.Server (linux-x64)
         shell: bash
         run: |
@@ -54,7 +54,7 @@ jobs:
           cd $GITHUB_WORKSPACE
       - 
         name: Publish Impostor.Server (linux-arm)
-        run: dotnet publish -c release -o ./build/linux-arm -f netcoreapp3.1 -r linux-arm --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
+        run: dotnet publish -c release -o ./build/linux-arm -f net5.0 -r linux-arm --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
       - name: Zip Impostor.Server (linux-arm)
         shell: bash
         run: |
@@ -63,7 +63,7 @@ jobs:
           cd $GITHUB_WORKSPACE
       - 
         name: Publish Impostor.Server (linux-arm64)
-        run: dotnet publish -c release -o ./build/linux-arm64 -f netcoreapp3.1 -r linux-arm64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
+        run: dotnet publish -c release -o ./build/linux-arm64 -f net5.0 -r linux-arm64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
       - name: Zip Impostor.Server (linux-arm64)
         shell: bash
         run: |
@@ -72,7 +72,7 @@ jobs:
           cd $GITHUB_WORKSPACE
       - 
         name: Publish Impostor.Server (osx-x64)
-        run: dotnet publish -c release -o ./build/osx-x64 -f netcoreapp3.1 -r osx-x64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
+        run: dotnet publish -c release -o ./build/osx-x64 -f net5.0 -r osx-x64 --self-contained --no-restore ./src/Impostor.Server/Impostor.Server.csproj /p:PublishSingleFile=true
       - name: Zip Impostor.Server (osx-x64)
         shell: bash
         run: |
@@ -94,16 +94,16 @@ jobs:
             - Second Change
           draft: true
           prerelease: false
-      - 
-        name: Upload Release Asset (win-x64) Client
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./build/win-x64-client.zip
-          asset_name: Impostor-Client-win-x64.zip
-          asset_content_type: application/zip
+      # - 
+      #   name: Upload Release Asset (win-x64) Client
+      #   uses: actions/upload-release-asset@v1
+      #   env:
+      #     GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      #   with:
+      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
+      #     asset_path: ./build/win-x64-client.zip
+      #     asset_name: Impostor-Client-win-x64.zip
+      #     asset_content_type: application/zip
       - 
         name: Upload Release Asset (win-x64) Server
         uses: actions/upload-release-asset@v1

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b129c9d05ca5ebe832cbfcdbdf04d37b76d69ea7..e19b915cfebd7d1a863a406f7dbb9a1aae99575b 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,6 +21,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+        with:
+          submodules: true
       - name: Setup MSBuild.exe
         uses: microsoft/setup-msbuild@v1.0.1
       - name: Setup .NET Core