diff options
| author | Mary-nyan <mary@mary.zone> | 2023-01-07 11:24:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-07 12:24:21 +0100 |
| commit | b9f2a96595b2721836d2b73e005640f9c3bfaf23 (patch) | |
| tree | a9855004726f816f9da3891afead757cb8ccf235 | |
| parent | cbaa845f5d51fe61a46d1a57950aa76a0a976d3e (diff) | |
ava: Fix regression caused by #4013 (#4222)1.1.517
Avalonia seems to not like when the artifact doesns't match the root namespace...
Address that by moving the binary to "Ryujinx" like we do on macOS build.
| -rw-r--r-- | .github/workflows/build.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 4 | ||||
| -rw-r--r-- | Ryujinx.Ava/Ryujinx.Ava.csproj | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac19f717..4586902c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,6 +69,12 @@ jobs: - name: Publish Ryujinx.Ava run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish_ava -p:Version="${{ env.RYUJINX_BASE_VERSION }}" -p:DebugType=embedded -p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" -p:ExtraDefineConstants=DISABLE_UPDATER Ryujinx.Ava --self-contained true if: github.event_name == 'pull_request' + - name: Rename Avalonia (Windows) + run: mv ./publish_ava/Ryujinx.Ava.exe ./publish_ava/Ryujinx.exe + if: runner.os == 'Windows' && github.event_name == 'pull_request' + - name: Rename Avalonia (Unix) + run: mv ./publish_ava/Ryujinx.Ava ./publish_ava/Ryujinx + if: runner.os != 'Windows' && github.event_name == 'pull_request' - name: Upload Ryujinx artifact uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3a4b4e20..29f0c5cf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,11 +46,13 @@ jobs: shell: bash - name: Create output dir run: "mkdir release_output" + - name: Publish Windows run: | dotnet publish -c Release -r win10-x64 -o ./publish_windows/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx --self-contained true dotnet publish -c Release -r win10-x64 -o ./publish_windows_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Headless.SDL2 --self-contained true dotnet publish -c Release -r win10-x64 -o ./publish_windows_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Ava --self-contained true + mv ./publish_windows_ava/publish/Ryujinx.Ava.exe ./publish_windows_ava/publish/Ryujinx.exe - name: Packing Windows builds run: | pushd publish_windows @@ -71,7 +73,7 @@ jobs: dotnet publish -c Release -r linux-x64 -o ./publish_linux/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx --self-contained true dotnet publish -c Release -r linux-x64 -o ./publish_linux_sdl2_headless/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Headless.SDL2 --self-contained true dotnet publish -c Release -r linux-x64 -o ./publish_linux_ava/publish -p:Version="${{ steps.version_info.outputs.build_version }}" -p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" -p:DebugType=embedded Ryujinx.Ava --self-contained true - + mv ./publish_linux_ava/publish/Ryujinx.Ava ./publish_linux_ava/publish/Ryujinx - name: Packing Linux builds run: | pushd publish_linux diff --git a/Ryujinx.Ava/Ryujinx.Ava.csproj b/Ryujinx.Ava/Ryujinx.Ava.csproj index e63360d4..5c001c67 100644 --- a/Ryujinx.Ava/Ryujinx.Ava.csproj +++ b/Ryujinx.Ava/Ryujinx.Ava.csproj @@ -4,7 +4,6 @@ <RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers> <OutputType>Exe</OutputType> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> - <AssemblyName>Ryujinx</AssemblyName> <Version>1.0.0-dirty</Version> <DefineConstants Condition=" '$(ExtraDefineConstants)' != '' ">$(DefineConstants);$(ExtraDefineConstants)</DefineConstants> <RootNamespace>Ryujinx.Ava</RootNamespace> |