Bump version

.github/workflows/build_nupkg.yml

@@ -28,13 +28,13 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: 'Nuget Package'
-        path: 'bin/Release/*.nupkg'
+        path: 'SabreTools.Models/bin/Release/*.nupkg'
 
     - name: Upload to rolling
       uses: ncipollo/release-action@v1.14.0
       with:
         allowUpdates: True
-        artifacts: 'bin/Release/*.nupkg'
+        artifacts: 'SabreTools.Models/bin/Release/*.nupkg'
         body: 'Last built commit: ${{ github.sha }}'
         name: 'Rolling Release'
         prerelease: True

SabreTools.Models.csproj

@@ -1,41 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <!-- Assembly Properties -->
-    <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
-    <LangVersion>latest</LangVersion>
-    <Nullable>enable</Nullable>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>1.4.8</Version>
-    <WarningsNotAsErrors>CS0618</WarningsNotAsErrors>
-
-    <!-- Package Properties -->
-    <Authors>Matt Nadareski</Authors>
-    <Description>Common models used by other SabreTools projects</Description>
-    <Copyright>Copyright (c) Matt Nadareski 2022-2024</Copyright>
-    <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <RepositoryUrl>https://github.com/SabreTools/SabreTools.Models</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <PackageTags>model models executable protection archive</PackageTags>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Include="README.md" Pack="true" PackagePath="" />
-  </ItemGroup>
-
-  <!-- Support for old .NET versions -->
-  <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`))">
-    <PackageReference Include="MinValueTupleBridge" Version="0.2.0" />
-  </ItemGroup>
-  <ItemGroup Condition="$(TargetFramework.StartsWith(`net4`))">
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-</Project>

SabreTools.Models.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Models", "SabreTools.Models.csproj", "{51F0D5D9-7C2B-445A-8ECD-4A47B33609C4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SabreTools.Models", "SabreTools.Models\SabreTools.Models.csproj", "{51F0D5D9-7C2B-445A-8ECD-4A47B33609C4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

SabreTools.Models/Charts/SongIni.cs

@@ -4,7 +4,7 @@ namespace SabreTools.Models.Charts
 {
     /// <see href="https://github.com/TheNathannator/GuitarGame_ChartFormats/tree/main/doc/FileFormats/song.ini"/> 
     /// <remarks>[song]/[Song]</remarks>
-    internal class SongIni
+    public class SongIni
     {
         #region Song/Chart Metadata
 

SabreTools.Models/Charts/Tier.cs

@@ -0,0 +1,16 @@
+namespace SabreTools.Models.Charts
+{
+    /// <see href="https://github.com/TheNathannator/GuitarGame_ChartFormats/blob/main/doc/FileFormats/Other/Frets%20on%20Fire%20X/Careers.md"/> 
+    public class Tier
+    {
+        /// <summary>
+        /// Display name of the tier.
+        /// </summary>
+        public string? Name { get; set; }
+
+        /// <summary>
+        /// Name used for associating a song with this tier, and for checking unlock requirements.
+        /// </summary>
+        public string? UnlockId { get; set; }
+    }
+}

SabreTools.Models/Charts/TitlesIni.cs

@@ -1,10 +1,8 @@
-using System.Collections.Generic;
-
 namespace SabreTools.Models.Charts
 {
     /// <see href="https://github.com/TheNathannator/GuitarGame_ChartFormats/blob/main/doc/FileFormats/Other/Frets%20on%20Fire%20X/Careers.md"/> 
     /// <remarks>[titles]</remarks>
-    internal class TitlesIni
+    public class TitlesIni
     {
         /// <summary>
         /// A space-separated list of .ini sections to include in the career.
@@ -13,9 +11,8 @@ namespace SabreTools.Models.Charts
         public string[]? SectionList { get; set; }
 
         /// <summary>
-        /// `name` - Display name of the tier.
-        /// `unlock_id` - Name used for associating a song with this tier, and for checking unlock requirements.
+        /// This entry points to other sections that should be used as part of the career.
         /// </summary>
-        public Dictionary<string, (string? Name, string? UnlockId)>? Sections { get; set; }
+        public Tier[]? Sections { get; set; }
     }
 }