diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5664bc34d..d45e9fe0f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,46 +6,16 @@ on: pull_request: branches: [ "master" ] -jobs: - buildx86: - name: Build x86 - runs-on: windows-latest - steps: - - name: Checkout code - uses: actions/checkout@v3 - - - name: Install .NET - uses: actions/setup-dotnet@v3 - with: - dotnet-version: '6.0' - - - name: Build the solution - run: | - dotnet restore - dotnet test --filter TestCategory!=OriginalIO - dotnet publish -c Release -a x86 --property:PublishDir=build - - - name: Package the build - run: | - cd TRRandomizerView/build - dir - Compress-Archive -Path (Get-ChildItem -Exclude *.pdb) -DestinationPath TRRando-x86.zip - - - name: Upload the package - uses: actions/upload-artifact@v3 - with: - name: TRRando-x86 - path: TRRandomizerView/build/TRRando-x86.zip - +jobs: buildx64: name: Build x64 runs-on: windows-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Install .NET - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: dotnet-version: '6.0' @@ -62,7 +32,7 @@ jobs: Compress-Archive -Path (Get-ChildItem -Exclude *.pdb) -DestinationPath TRRando-x64.zip - name: Upload the package - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: TRRando-x64 path: TRRandomizerView/build/TRRando-x64.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index c91908620..c364bcb49 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## [Unreleased](https://github.com/LostArtefacts/TR-Rando/compare/V1.9.2...master) - xxxx-xx-xx - fixed dark pickup sprites in TR2R OG graphics (#760) - fixed gun pickup sprites not showing properly in TR2R Floating Islands and Dragon's Lair OG graphics (#760) +- removed support for 32-bit (#759) ## [V1.9.2](https://github.com/LostArtefacts/TR-Rando/compare/V1.9.1...V1.9.2) - 2024-08-20 - added support for level sequence randomization in TR1R and TR2R (#756) diff --git a/Resources/Using/release.png b/Resources/Using/release.png index 6cb4865f1..f04ead265 100644 Binary files a/Resources/Using/release.png and b/Resources/Using/release.png differ diff --git a/TRDataControlTests/TRDataControlTests.csproj b/TRDataControlTests/TRDataControlTests.csproj index 83b56c0fe..391b87def 100644 --- a/TRDataControlTests/TRDataControlTests.csproj +++ b/TRDataControlTests/TRDataControlTests.csproj @@ -10,9 +10,9 @@ Copyright © Tomb Raider Community 2024 - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TRImageControl/TRImageControl.csproj b/TRImageControl/TRImageControl.csproj index 3e7612194..6a280ecb0 100644 --- a/TRImageControl/TRImageControl.csproj +++ b/TRImageControl/TRImageControl.csproj @@ -12,7 +12,7 @@ - + diff --git a/TRImageControlTests/TRImageControlTests.csproj b/TRImageControlTests/TRImageControlTests.csproj index 494d1209a..c9dcc8935 100644 --- a/TRImageControlTests/TRImageControlTests.csproj +++ b/TRImageControlTests/TRImageControlTests.csproj @@ -10,9 +10,9 @@ Copyright © Tomb Raider Community 2024 - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/TRLevelControlTests/TRLevelControlTests.csproj b/TRLevelControlTests/TRLevelControlTests.csproj index ff43dd5f6..09fd23ebe 100644 --- a/TRLevelControlTests/TRLevelControlTests.csproj +++ b/TRLevelControlTests/TRLevelControlTests.csproj @@ -15,9 +15,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/USING.md b/USING.md index 849df9d57..eebd8d537 100644 --- a/USING.md +++ b/USING.md @@ -60,7 +60,7 @@ Note too that some files are shared so if you randomize TR1R, you may for exampl ## Installing the Randomizer Setting up the randomizer itself is straight-forward. -1. Download the latest release from https://github.com/LostArtefacts/TR-Rando/releases/latest. Make sure to download the `TRRando` zip file and not the source code. Choose the x64 or x86 version, depending on your system. +1. Download the latest release from https://github.com/LostArtefacts/TR-Rando/releases/latest. Make sure to download the `TRRando-x64.zip` file and not the source code. ![Release example](Resources/Using/release.png) @@ -129,10 +129,9 @@ You may see the following error message when you try to launch the randomizer - ![.NET Core missing](Resources/Using/netcore.png) -If however the randomizer doesn't launch, but you don't see the above error, you can install the runtime manually. Use one of the following links depending on your system. +If however the randomizer doesn't launch, but you don't see the above error, you can install the runtime manually using the link below. -- x64: https://aka.ms/dotnet/6.0/windowsdesktop-runtime-win-x64.exe -- x86: https://aka.ms/dotnet/6.0/windowsdesktop-runtime-win-x86.exe +- https://aka.ms/dotnet/6.0/windowsdesktop-runtime-win-x64.exe ### General issues If you encounter error messages during randomization, the most likely cause is unclean data files. In this case, you should follow these steps.