Skip to content

Commit f1b739e

Browse files
BAKAOLCBAKAOLC
committed
chore(release): merge dev into main for v0.4.36
2 parents f5131f0 + 97c9f37 commit f1b739e

1,132 files changed

Lines changed: 2859 additions & 295 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/actions/ritsulib-build/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ runs:
3636
with:
3737
node-version: "22"
3838
cache: npm
39-
cache-dependency-path: Viewer/package-lock.json
39+
cache-dependency-path: components/viewer/package-lock.json
4040

4141
- uses: astral-sh/setup-uv@v8.1.0
4242
with:

‎Diagnostics/GameLogFolderOpener.cs‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎STS2-RitsuLib.csproj‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@
2929
<RitsuLibTelemetryBuildChannel Condition="'$(RitsuLibTelemetryBuildChannel)' == '' and '$(Configuration)' == 'Debug'">local_debug</RitsuLibTelemetryBuildChannel>
3030
<RitsuLibTelemetryBuildChannel Condition="'$(RitsuLibTelemetryBuildChannel)' == ''">local_release</RitsuLibTelemetryBuildChannel>
3131
<RitsuLibTelemetryBuildConfiguration Condition="'$(RitsuLibTelemetryBuildConfiguration)' == ''">$(Configuration)</RitsuLibTelemetryBuildConfiguration>
32-
<RitsuLibViewerProjectDir>$(MSBuildProjectDirectory)\Viewer</RitsuLibViewerProjectDir>
32+
<RitsuLibViewerProjectDir>$(MSBuildProjectDirectory)\components\viewer</RitsuLibViewerProjectDir>
3333
<RitsuLibViewerDistDir>$(RitsuLibViewerProjectDir)\dist</RitsuLibViewerDistDir>
3434
<RitsuLibBuildViewer Condition="'$(RitsuLibBuildViewer)' == '' and Exists('$(RitsuLibViewerProjectDir)\package.json')">true</RitsuLibBuildViewer>
3535
<RitsuLibBuildViewer Condition="'$(RitsuLibBuildViewer)' == ''">false</RitsuLibBuildViewer>
3636
<RitsuLibCopyToGame Condition="'$(RitsuLibCopyToGame)' == ''">true</RitsuLibCopyToGame>
37-
<RitsuLibAnalyzerProject>$(MSBuildProjectDirectory)\Analyzers\STS2-RitsuLib-Analyzers.csproj</RitsuLibAnalyzerProject>
37+
<RitsuLibAnalyzerProject>$(MSBuildProjectDirectory)\components\analyzers\STS2-RitsuLib-Analyzers.csproj</RitsuLibAnalyzerProject>
3838
<RitsuLibAnalyzerTargetFramework>netstandard2.0</RitsuLibAnalyzerTargetFramework>
39-
<RitsuLibAnalyzerAssembly>$(MSBuildProjectDirectory)\Analyzers\bin\$(Configuration)\$(RitsuLibAnalyzerTargetFramework)\STS2-RitsuLib.Analyzers.dll</RitsuLibAnalyzerAssembly>
39+
<RitsuLibAnalyzerAssembly>$(MSBuildProjectDirectory)\components\analyzers\bin\$(Configuration)\$(RitsuLibAnalyzerTargetFramework)\STS2-RitsuLib.Analyzers.dll</RitsuLibAnalyzerAssembly>
4040
</PropertyGroup>
4141

4242
<PropertyGroup Label="NuGet package">
4343
<IsPackable>true</IsPackable>
44-
<Version>0.4.35</Version>
44+
<Version>0.4.36</Version>
4545
<Authors>OLC</Authors>
4646
<Description>Shared framework library for Slay the Spire 2 mods.</Description>
4747
<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -88,7 +88,7 @@
8888

8989
<ItemGroup>
9090
<RitsuLibAnalyzerBuildInput Include="$(RitsuLibAnalyzerProject)"/>
91-
<RitsuLibAnalyzerBuildInput Include="$(MSBuildProjectDirectory)\Analyzers\**\*.cs"/>
91+
<RitsuLibAnalyzerBuildInput Include="$(MSBuildProjectDirectory)\components\analyzers\**\*.cs"/>
9292
</ItemGroup>
9393

9494
<Target Name="BuildRitsuLibAnalyzers"
@@ -116,7 +116,7 @@
116116
<PackageReference Include="System.IO.Hashing" Version="9.0.0"/>
117117
</ItemGroup>
118118
<ItemGroup>
119-
<ProjectReference Include="Analyzers\STS2-RitsuLib-Analyzers.csproj"
119+
<ProjectReference Include="components\analyzers\STS2-RitsuLib-Analyzers.csproj"
120120
OutputItemType="Analyzer"
121121
ReferenceOutputAssembly="false"
122122
PrivateAssets="all"/>
@@ -141,9 +141,15 @@
141141
<RitsuLibViewerBuildInputs Include="$(RitsuLibViewerProjectDir)\src\**\*"/>
142142
</ItemGroup>
143143
<ItemGroup>
144-
<EmbeddedResource Include="Assets\mod_image.png" LogicalName="STS2RitsuLib.Assets.mod_image.png"/>
145-
<EmbeddedResource Include="Settings\Localization\**\*.json"/>
146-
<EmbeddedResource Include="Ui\Shell\Themes\*.theme.json"/>
144+
<EmbeddedResource Include="resources\mod_image.png" LogicalName="STS2RitsuLib.Assets.mod_image.png"/>
145+
<EmbeddedResource Include="src\Settings\Localization\JoinDiagnostics\*.json"
146+
LogicalName="STS2RitsuLib.Settings.Localization.JoinDiagnostics.%(Filename)%(Extension)"/>
147+
<EmbeddedResource Include="src\Settings\Localization\ModSettingsUi\*.json"
148+
LogicalName="STS2RitsuLib.Settings.Localization.ModSettingsUi.%(Filename)%(Extension)"/>
149+
<EmbeddedResource Include="src\Settings\Localization\StateDivergence\*.json"
150+
LogicalName="STS2RitsuLib.Settings.Localization.StateDivergence.%(Filename)%(Extension)"/>
151+
<EmbeddedResource Include="src\Ui\Shell\Themes\*.theme.json"
152+
LogicalName="STS2RitsuLib.Ui.Shell.Themes.%(Filename)%(Extension)"/>
147153
</ItemGroup>
148154
<ItemGroup>
149155
<None Include="README.md" Pack="true" PackagePath="\"/>
@@ -158,22 +164,19 @@
158164
<EmbeddedResource Remove="sts-2-source\**"/>
159165

160166
<Compile Remove="build\**\*.cs"/>
161-
<Compile Remove="Analyzers\**"/>
162-
<None Remove="Analyzers\**"/>
163-
<Content Remove="Analyzers\**"/>
164-
<EmbeddedResource Remove="Analyzers\**"/>
167+
<!-- Component projects are separate assemblies; keep them out of Godot.Sdk default globs. -->
168+
<Compile Remove="components\**"/>
169+
<None Remove="components\**"/>
170+
<Content Remove="components\**"/>
171+
<EmbeddedResource Remove="components\**"/>
165172

166-
<!-- Loader is a separate assembly; keep it out of Godot.Sdk default globs. -->
167-
<Compile Remove="Loader\**"/>
168-
<None Remove="Loader\**"/>
169-
<Content Remove="Loader\**"/>
170-
<EmbeddedResource Remove="Loader\**"/>
173+
<!-- Repository tools are standalone projects; keep them out of the RitsuLib mod assembly. -->
174+
<Compile Remove="tools\**"/>
175+
<None Remove="tools\**"/>
176+
<Content Remove="tools\**"/>
177+
<EmbeddedResource Remove="tools\**"/>
171178

172179
<!-- The browser log viewer is built and copied as sidecar static assets, not Godot resources. -->
173-
<Compile Remove="Viewer\**"/>
174-
<None Remove="Viewer\node_modules\**"/>
175-
<Content Remove="Viewer\node_modules\**"/>
176-
<EmbeddedResource Remove="Viewer\**"/>
177180
</ItemGroup>
178181
<Target Name="BuildRitsuDebugLogViewer"
179182
BeforeTargets="Build"

‎STS2-RitsuLib.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Visual Studio 2012
33
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STS2-RitsuLib", "STS2-RitsuLib.csproj", "{61148A8E-0640-46D5-99EC-FD849671762E}"
44
EndProject
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STS2-RitsuLib-Loader", "Loader\STS2-RitsuLib-Loader.csproj", "{C3D4E5F6-A7B8-9012-CDEF-345678901234}"
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STS2-RitsuLib-Loader", "components\loader\STS2-RitsuLib-Loader.csproj", "{C3D4E5F6-A7B8-9012-CDEF-345678901234}"
66
EndProject
77
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Properties", "Properties", "{615F28BB-DB76-4ED4-AC07-32D7B3420F59}"
88
ProjectSection(SolutionItems) = preProject
@@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Properties", "Properties",
1111
.\Sts2PathDiscovery.props = .\Sts2PathDiscovery.props
1212
EndProjectSection
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STS2-RitsuLib-Analyzers", "Analyzers\STS2-RitsuLib-Analyzers.csproj", "{EB94728C-3FFA-46C3-8295-74BB50CF4B6A}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "STS2-RitsuLib-Analyzers", "components\analyzers\STS2-RitsuLib-Analyzers.csproj", "{EB94728C-3FFA-46C3-8295-74BB50CF4B6A}"
1515
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution

Analyzers/.gitignore renamed to components/analyzers/.gitignore

File renamed without changes.

Analyzers/STS2-RitsuLib-Analyzers.csproj renamed to components/analyzers/STS2-RitsuLib-Analyzers.csproj

File renamed without changes.

Analyzers/UnsafeAccessorTargetAnalyzer.cs renamed to components/analyzers/UnsafeAccessorTargetAnalyzer.cs

File renamed without changes.

Loader/.gitignore renamed to components/loader/.gitignore

File renamed without changes.

Loader/Bootstrap.cs renamed to components/loader/Bootstrap.cs

File renamed without changes.

Loader/ReflectionHelperModTypesPatch.cs renamed to components/loader/ReflectionHelperModTypesPatch.cs

File renamed without changes.

0 commit comments

Comments
 (0)