diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3729baff..6d18be4e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,15 +21,15 @@ jobs: run: dotnet restore - name: Download Dalamud run: | - Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip + Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev\" - name: Build run: | dotnet build --no-restore --configuration Release --nologo - name: Archive - run: Compress-Archive -Path Penumbra/bin/Release/net5.0-windows/* -DestinationPath Penumbra.zip + run: Compress-Archive -Path Penumbra/bin/Release/* -DestinationPath Penumbra.zip - name: Upload a Build Artifact uses: actions/upload-artifact@v2.2.1 with: path: | - ./Penumbra/bin/Release/net5.0-windows/* + ./Penumbra/bin/Release/* diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69063dda..dcbf42ab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: run: dotnet restore - name: Download Dalamud run: | - Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip + Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev" - name: Build run: | @@ -29,17 +29,17 @@ jobs: - name: write version into json run: | $ver = '${{ github.ref }}' -replace 'refs/tags/','' - $path = './Penumbra/bin/Release/net5.0-windows/Penumbra.json' + $path = './Penumbra/bin/Release/Penumbra.json' $content = get-content -path $path $content = $content -replace '1.0.0.0',$ver set-content -Path $path -Value $content - name: Archive - run: Compress-Archive -Path Penumbra/bin/Release/net5.0-windows/* -DestinationPath Penumbra.zip + run: Compress-Archive -Path Penumbra/bin/Release/* -DestinationPath Penumbra.zip - name: Upload a Build Artifact uses: actions/upload-artifact@v2.2.1 with: path: | - ./Penumbra/bin/Release/net5.0-windows/* + ./Penumbra/bin/Release/* - name: Create Release id: create_release uses: actions/create-release@v1 diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index ad4375f0..106a976a 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -20,7 +20,7 @@ jobs: run: dotnet restore - name: Download Dalamud run: | - Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/latest.zip -OutFile latest.zip + Invoke-WebRequest -Uri https://goatcorp.github.io/dalamud-distrib/stg/latest.zip -OutFile latest.zip Expand-Archive -Force latest.zip "$env:AppData\XIVLauncher\addon\Hooks\dev" - name: Build run: | @@ -29,17 +29,17 @@ jobs: - name: write version into json run: | $ver = '${{ github.ref }}' -replace 'refs/tags/t','' - $path = './Penumbra/bin/Debug/net5.0-windows/Penumbra.json' + $path = './Penumbra/bin/Debug/Penumbra.json' $content = get-content -path $path $content = $content -replace '1.0.0.0',$ver set-content -Path $path -Value $content - name: Archive - run: Compress-Archive -Path Penumbra/bin/Debug/net5.0-windows/* -DestinationPath Penumbra.zip + run: Compress-Archive -Path Penumbra/bin/Debug/* -DestinationPath Penumbra.zip - name: Upload a Build Artifact uses: actions/upload-artifact@v2.2.1 with: path: | - ./Penumbra/bin/Debug/net5.0-windows/* + ./Penumbra/bin/Debug/* - name: Create Release id: create_release uses: actions/create-release@v1 diff --git a/Penumbra.GameData/Penumbra.GameData.csproj b/Penumbra.GameData/Penumbra.GameData.csproj index 9e0ec95c..ad466524 100644 --- a/Penumbra.GameData/Penumbra.GameData.csproj +++ b/Penumbra.GameData/Penumbra.GameData.csproj @@ -6,13 +6,15 @@ Penumbra.GameData absolute gangstas Penumbra - Copyright © 2020 + Copyright © 2022 1.0.0.0 1.0.0.0 bin\$(Configuration)\ true enable true + false + false @@ -28,24 +30,26 @@ $(MSBuildWarningsAsMessages);MSB3277 + + $(AppData)\XIVLauncher\addon\Hooks\dev\ + + - $(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll + $(DalamudLibPath)Dalamud.dll False - $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll + $(DalamudLibPath)Lumina.dll False - $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll + $(DalamudLibPath)Lumina.Excel.dll + False + + + $(DalamudLibPath)Newtonsoft.Json.dll False - - - - false - - diff --git a/Penumbra/Import/TexToolsImporter.Archives.cs b/Penumbra/Import/TexToolsImporter.Archives.cs index 0f461c79..1b8a45fa 100644 --- a/Penumbra/Import/TexToolsImporter.Archives.cs +++ b/Penumbra/Import/TexToolsImporter.Archives.cs @@ -111,7 +111,7 @@ public partial class TexToolsImporter using var t = new StreamReader( e ); using var j = new JsonTextReader( t ); var obj = JObject.Load( j ); - var name = obj[ nameof( Mod.Name ) ]?.Value< string >().RemoveInvalidPathSymbols() ?? string.Empty; + var name = obj[ nameof( Mod.Name ) ]?.Value< string >()?.RemoveInvalidPathSymbols() ?? string.Empty; if( name.Length == 0 ) { throw new Exception( "Invalid mod archive: mod meta has no name." ); diff --git a/Penumbra/Penumbra.csproj b/Penumbra/Penumbra.csproj index aed24408..2689f37d 100644 --- a/Penumbra/Penumbra.csproj +++ b/Penumbra/Penumbra.csproj @@ -6,13 +6,15 @@ Penumbra absolute gangstas Penumbra - Copyright © 2020 + Copyright © 2022 1.0.0.0 1.0.0.0 bin\$(Configuration)\ true enable true + false + false @@ -25,36 +27,43 @@ + + $(AppData)\XIVLauncher\addon\Hooks\dev\ + + - $(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll + $(DalamudLibPath)Dalamud.dll False - $(AppData)\XIVLauncher\addon\Hooks\dev\ImGui.NET.dll + $(DalamudLibPath)ImGui.NET.dll False - $(AppData)\XIVLauncher\addon\Hooks\dev\ImGuiScene.dll + $(DalamudLibPath)ImGuiScene.dll False - $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll + $(DalamudLibPath)Lumina.dll False - $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll + $(DalamudLibPath)Lumina.Excel.dll False - $(AppData)\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll + $(DalamudLibPath)FFXIVClientStructs.dll + False + + + $(DalamudLibPath)Newtonsoft.Json.dll False -