diff --git a/.github/workflows/dotnet-core-desktop.yml b/.github/workflows/dotnet-core-desktop.yml index d1846fdb..c84a938c 100644 --- a/.github/workflows/dotnet-core-desktop.yml +++ b/.github/workflows/dotnet-core-desktop.yml @@ -1,81 +1,79 @@ # gynt: This is based on the .NET Core Desktop starter action - name: UCP Build on: workflow_dispatch: push: - branches: [ master, GUI-Update ] + branches: [master, GUI-Update] pull_request: - branches: [ master, GUI-Update ] + branches: [master, GUI-Update] types: [assigned, opened, edited, ready_for_review, reopened, synchronize] jobs: - build: - strategy: matrix: configuration: [Debug, Release] nuget: [latest] - runs-on: windows-latest # For a list of available runner types, refer to - # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on + runs-on: + windows-latest # For a list of available runner types, refer to + # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on env: OutputPath: ..\Output${{ matrix.configuration }} - Solution_Name: UnofficialCrusaderPatch.sln # Replace with your solution name, i.e. MyWpfApp.sln. + Solution_Name: UnofficialCrusaderPatch.sln # Replace with your solution name, i.e. MyWpfApp.sln. steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Checkout submodules - run: git submodule update --init --recursive --depth 1 + - name: Checkout + uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Checkout submodules + run: git submodule update --init --recursive --depth 1 + + # Install the .NET Core workload + - name: Install .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: "5.0.x" - # Install the .NET Core workload - - name: Install .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.x' - - # Restore NuGet packages - - name: Setup NuGet.exe - uses: nuget/setup-nuget@v1 - with: - nuget-version: ${{ matrix.nuget }} - - name: Restore NuGet packages - run: nuget restore $env:Solution_Name + # Restore NuGet packages + - name: Setup NuGet.exe + uses: nuget/setup-nuget@v1 + with: + nuget-version: ${{ matrix.nuget }} + - name: Restore NuGet packages + run: nuget restore $env:Solution_Name - # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - - name: Setup MSBuild.exe - uses: microsoft/setup-msbuild@v1.0.2 + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild + - name: Setup MSBuild.exe + uses: microsoft/setup-msbuild@v1.1 - # Execute all unit tests in the solution - # - name: Execute unit tests - # run: dotnet test + # Execute all unit tests in the solution + # - name: Execute unit tests + # run: dotnet test - # Restore the application to populate the obj folder with RuntimeIdentifiers - - name: Build the application - run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration /p:OutputPath=$env:OutputPath - env: - Configuration: ${{ matrix.configuration }} + # Restore the application to populate the obj folder with RuntimeIdentifiers + - name: Build the application + run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration /p:OutputPath=$env:OutputPath + env: + Configuration: ${{ matrix.configuration }} - - name: Upload build artifacts - uses: actions/upload-artifact@v2 - with: - name: UCP-latest-release - path: | - OutputRelease/*.dll - OutputRelease/*.exe - OutputRelease/resources + - name: Upload build artifacts + uses: actions/upload-artifact@v2 + with: + name: UCP-latest-release + path: | + OutputRelease/*.dll + OutputRelease/*.exe + OutputRelease/resources - - name: Upload build artifacts - uses: actions/upload-artifact@v2 - with: - name: UCP-latest-debug - path: | - OutputDebug + - name: Upload build artifacts + uses: actions/upload-artifact@v2 + with: + name: UCP-latest-debug + path: | + OutputDebug diff --git a/AICUpdater/AICUpdater.csproj b/AICUpdater/AICUpdater.csproj index d8416560..1a04f652 100644 --- a/AICUpdater/AICUpdater.csproj +++ b/AICUpdater/AICUpdater.csproj @@ -8,9 +8,10 @@ Exe AICUpdater AICUpdater - v4.6.1 + v4.7.2 512 true + AnyCPU diff --git a/AICUpdater/App.config b/AICUpdater/App.config index 731f6de6..ecdcf8a5 100644 --- a/AICUpdater/App.config +++ b/AICUpdater/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/CodeBlox/App.config b/CodeBlox/App.config index 731f6de6..ecdcf8a5 100644 --- a/CodeBlox/App.config +++ b/CodeBlox/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/CodeBlox/CodeBlox.csproj b/CodeBlox/CodeBlox.csproj index 8dd5e9fa..ddae41f8 100644 --- a/CodeBlox/CodeBlox.csproj +++ b/CodeBlox/CodeBlox.csproj @@ -8,9 +8,10 @@ Exe CodeBlox CodeBlox - v4.6.1 + v4.7.2 512 true + AnyCPU diff --git a/IDAParser/App.config b/IDAParser/App.config index 731f6de6..ecdcf8a5 100644 --- a/IDAParser/App.config +++ b/IDAParser/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/IDAParser/IDAParser.csproj b/IDAParser/IDAParser.csproj index 1e5c1870..e93415c2 100644 --- a/IDAParser/IDAParser.csproj +++ b/IDAParser/IDAParser.csproj @@ -8,9 +8,10 @@ Exe IDAParser IDAParser - v4.6.1 + v4.7.2 512 true + AnyCPU diff --git a/UnofficialCrusaderPatch/App.config b/UnofficialCrusaderPatch/App.config index 74ade9db..ecdcf8a5 100644 --- a/UnofficialCrusaderPatch/App.config +++ b/UnofficialCrusaderPatch/App.config @@ -1,6 +1,6 @@ - + diff --git a/UnofficialCrusaderPatch/UnofficialCrusaderPatch.csproj b/UnofficialCrusaderPatch/UnofficialCrusaderPatch.csproj index b98485a7..c0772230 100644 --- a/UnofficialCrusaderPatch/UnofficialCrusaderPatch.csproj +++ b/UnofficialCrusaderPatch/UnofficialCrusaderPatch.csproj @@ -8,7 +8,7 @@ Library UCP UnofficialCrusaderPatch - v4.0 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -46,10 +46,12 @@ x86 bin\Debug\ + false x86 bin\Release\ + false OnBuildSuccess diff --git a/UnofficialCrusaderPatchConsole/App.config b/UnofficialCrusaderPatchConsole/App.config index 731f6de6..ecdcf8a5 100644 --- a/UnofficialCrusaderPatchConsole/App.config +++ b/UnofficialCrusaderPatchConsole/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/UnofficialCrusaderPatchConsole/UnofficialCrusaderPatchConsole.csproj b/UnofficialCrusaderPatchConsole/UnofficialCrusaderPatchConsole.csproj index 473dcc90..74d2598f 100644 --- a/UnofficialCrusaderPatchConsole/UnofficialCrusaderPatchConsole.csproj +++ b/UnofficialCrusaderPatchConsole/UnofficialCrusaderPatchConsole.csproj @@ -8,10 +8,11 @@ Exe UnofficialCrusaderPatchConsole UnofficialCrusaderPatchCLI - v4.6.1 + v4.7.2 512 true true + AnyCPU diff --git a/UnofficialCrusaderPatchGUI/App.config b/UnofficialCrusaderPatchGUI/App.config index 74ade9db..ecdcf8a5 100644 --- a/UnofficialCrusaderPatchGUI/App.config +++ b/UnofficialCrusaderPatchGUI/App.config @@ -1,6 +1,6 @@ - + diff --git a/UnofficialCrusaderPatchGUI/UnofficialCrusaderPatchGUI.csproj b/UnofficialCrusaderPatchGUI/UnofficialCrusaderPatchGUI.csproj index 6d3c6107..67741ae5 100644 --- a/UnofficialCrusaderPatchGUI/UnofficialCrusaderPatchGUI.csproj +++ b/UnofficialCrusaderPatchGUI/UnofficialCrusaderPatchGUI.csproj @@ -8,7 +8,7 @@ WinExe UCP UnofficialCrusaderPatchGUI - v4.6.1 + v4.7.2 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -29,6 +29,7 @@ false false true + AnyCPU