From a4d7a3560f3484cb1840620ed8ce89edf79b365c Mon Sep 17 00:00:00 2001 From: CatmanFan Date: Sat, 28 Dec 2024 21:27:22 +0100 Subject: [PATCH 1/3] Update dotnet.yml --- .github/workflows/dotnet.yml | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 69aa2816..cc9f5964 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,6 +19,17 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Get current date + run: | + $DATE=& Get-Date -format yyyy-MM-dd + echo "DATE=$DATE" >> $env:GITHUB_ENV + + - name: Get commit SHA + run: | + set a=${{ github.sha }} + echo "SHORT_SHA=$(git rev-parse --short a)" >> $GITHUB_ENV + echo "Commit SHA is %a:~0,7%" + - name: Setup MSBuild v1.1 uses: microsoft/setup-msbuild@v1.1 @@ -30,33 +41,22 @@ jobs: - name: Build solution run: msbuild FriishProduce\FriishProduce.csproj -t:rebuild -property:Configuration=Release - - - name: Get current date - run: | - $DATE=& Get-Date -format yyyy-MM-dd - echo "DATE=$DATE" >> $env:GITHUB_ENV - - - name: Get commit hash - id: commit - uses: prompt/actions-commit-hash@v3 - name: Compress archive run: Compress-Archive -Path FriishProduce\bin\Release\* -DestinationPath FriishProduce_latest.zip - - - name: Update release - id: update_release - uses: tubone24/update_release@v1.3.1 - env: - GITHUB_TOKEN: ${{ secrets.github_token }} - TAG_NAME: latest - with: - release_name: "Latest build (${{ steps.commit.outputs.short }})" - body: "This is the latest build as of ${{ env.DATE }}, autogenerated from the most recent commit.\n\n**How to update manually:**\nreplace the files in your FriishProduce directory with the newer ones, and delete any leftover files or folders that are no longer needed." - is_append_body: false - - name: Upload to release + - name: Upload release uses: softprops/action-gh-release@v2 with: tag_name: latest files: FriishProduce_latest.zip + append_body: false + draft: false + prerelease: true + name: "Latest build ${{ env.SHORT_SHA }}" + body: "This is the latest build as of ${{ env.DATE }}, autogenerated from the most recent commit ${{ env.SHORT_SHA }}.\n\n + **How to update manually:** + \n * Extract the files to your FriishProduce directory, overwriting the older versions, and delete any leftover files or folders that are no longer needed. + \n * It is recommended to also clear your previous settings by deleting the FriishProduce folder in your user's local app data directory.\n\n + Be sure to read [the wiki](https://catmanfan.github.io/friishproduce-wiki/about) for instructions and further details." token: ${{ secrets.github_token }} # Required \ No newline at end of file From c0f4abc1aef7e3cba258e688e0bded0889ec11ff Mon Sep 17 00:00:00 2001 From: CatmanFan Date: Sat, 28 Dec 2024 21:27:22 +0100 Subject: [PATCH 2/3] Update dotnet.yml --- .github/workflows/dotnet.yml | 43 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 69aa2816..6ab5b4ca 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -19,6 +19,18 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Get current date + run: | + $DATE=& Get-Date -format yyyy-MM-dd + echo "DATE=$DATE" >> $env:GITHUB_ENV + + - name: Get commit SHA + run: | + set a=${{ github.sha }} + echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV + echo "Commit SHA is $(git rev-parse --short HEAD)" + echo "Commit SHA is " $(git rev-parse --short HEAD) + - name: Setup MSBuild v1.1 uses: microsoft/setup-msbuild@v1.1 @@ -30,33 +42,22 @@ jobs: - name: Build solution run: msbuild FriishProduce\FriishProduce.csproj -t:rebuild -property:Configuration=Release - - - name: Get current date - run: | - $DATE=& Get-Date -format yyyy-MM-dd - echo "DATE=$DATE" >> $env:GITHUB_ENV - - - name: Get commit hash - id: commit - uses: prompt/actions-commit-hash@v3 - name: Compress archive run: Compress-Archive -Path FriishProduce\bin\Release\* -DestinationPath FriishProduce_latest.zip - - - name: Update release - id: update_release - uses: tubone24/update_release@v1.3.1 - env: - GITHUB_TOKEN: ${{ secrets.github_token }} - TAG_NAME: latest - with: - release_name: "Latest build (${{ steps.commit.outputs.short }})" - body: "This is the latest build as of ${{ env.DATE }}, autogenerated from the most recent commit.\n\n**How to update manually:**\nreplace the files in your FriishProduce directory with the newer ones, and delete any leftover files or folders that are no longer needed." - is_append_body: false - - name: Upload to release + - name: Upload release uses: softprops/action-gh-release@v2 with: tag_name: latest files: FriishProduce_latest.zip + append_body: false + draft: false + prerelease: true + name: "Latest build ${{ env.SHORT_SHA }}" + body: "This is the latest build as of ${{ env.DATE }}, autogenerated from the most recent commit ${{ env.SHORT_SHA }}.\n\n + **How to update manually:** + \n * Extract the files to your FriishProduce directory, overwriting the older versions, and delete any leftover files or folders that are no longer needed. + \n * It is recommended to also clear your previous settings by deleting the FriishProduce folder in your user's local app data directory.\n\n + Be sure to read [the wiki](https://catmanfan.github.io/friishproduce-wiki/about) for instructions and further details." token: ${{ secrets.github_token }} # Required \ No newline at end of file From 8d81d89b0a313737f1785ade9827223ac5c878af Mon Sep 17 00:00:00 2001 From: saulfabreg Wii VC Project Date: Sat, 28 Dec 2024 16:11:41 -0500 Subject: [PATCH 3/3] =?UTF-8?q?Database:=20a=20few=20tidyups=20on=20SNES,?= =?UTF-8?q?=20add=201080=C2=B0=20Snowboarding=20(N64),=20add=20rest=20of?= =?UTF-8?q?=20NeoGeo=20VC=20bases,=20part=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FriishProduce/database.json | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/FriishProduce/database.json b/FriishProduce/database.json index b325a9d6..8f5938bf 100644 --- a/FriishProduce/database.json +++ b/FriishProduce/database.json @@ -125,7 +125,7 @@ "id": "00010001-4a4244__", "region": [0, 1, 3, 7], "emu_ver": [0, 0, 0, 0], - "titles": ["スーパードンキーコング２", "Donkey Kong Country 2", "Donkey Kong Country 2", "동키콩 컨트리 2"], + "titles": ["スーパードンキーコング２ ディクシー&ディディー", "Donkey Kong Country 2: Diddy's Kong Quest", "Donkey Kong Country 2: Diddy's Kong Quest", "동키콩 컨트리 2"], "wad_titles": ["Super Donkey Kong 2 - Dixie & Diddy", "Donkey Kong Country 2 - Diddy's Kong Quest"] }, @@ -156,7 +156,8 @@ "id": "00010001-4a4342__", "region": [0, 1, 5], "emu_ver": [1, 1, 1], - "titles": ["スーパーマリオRPG", "Super Mario RPG", "Super Mario RPG"] + "titles": ["スーパーマリオRPG", "Super Mario RPG: Legend of the Seven Stars"], + "wad_titles": ["Super Mario RPG"] }, { @@ -203,6 +204,14 @@ "emu_ver": [1, 1, 1, 3], "titles": ["マリオカート64", "Mario Kart 64", "Mario Kart 64", "마리오 카트 64"] }, + + { + "id": "00010001-4e4144__", + "region": [0, 1, 3, 7], + "emu_ver": [2, 2, 2, 3], + "titles": ["テン・エイティ スノーボーディング", "1080° Snowboarding", "1080° Snowboarding", "1080° 스노우보딩"], + "wad_titles": ["1080 Snowboarding"] + }, { "id": "00010001-4e4143__", @@ -441,6 +450,21 @@ "wad_titles": ["Ryuuko no Ken", "Art of Fighting"], }, + { + "id": "00010001-454148__", + "region": [0, 1, 3], + "emu_ver": [0, 0, 0], + "titles": ["ベースボールスターズ2", "Baseball Stars 2"] + }, + + { + "id": "00010001-454146__", + "region": [0, 1, 3], + "emu_ver": [0, 0, 0], + "titles": ["ラギ", "Blue's Journey"], + "wad_titles": ["Raguy", "Blue's Journey"], + }, + { "id": "00010001-45414e__", "region": [0, 1, 3],