diff --git a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs index 96bbb7e11..527e6292b 100644 --- a/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs +++ b/RocksmithTookitGUI/DLCPackageCreator/DLCPackageCreator.cs @@ -1470,30 +1470,18 @@ private void ImportTone(string toneImportFile) private void PopulateAppIdCombo() { - var i = 0; var currentGameVersion = CurrentGameVersion; if (rbConvert.Checked) currentGameVersion = GameVersion.RS2014; cmbAppIds.Items.Clear(); - - foreach (var song in SongAppIdRepository.Instance().Select(currentGameVersion)) - { - var delimiters = new[] { "-" }; - var songSplit = song.Name.Split(delimiters, StringSplitOptions.None); - if (songSplit.Length != 2) - { - i++; - throw new DataException(" Invalid RocksmithToolkitLib.SongAppId.xml entry. Found too many dashes '-' in: " + song.Name); - } + foreach (var song in SongAppIdRepository.Instance().Select(currentGameVersion)) cmbAppIds.Items.Add(song); - } - + var songAppId = SongAppIdRepository.Instance().Select((currentGameVersion == GameVersion.RS2014) ? ConfigRepository.Instance()["general_defaultappid_RS2014"] : ConfigRepository.Instance()["general_defaultappid_RS2012"], currentGameVersion); cmbAppIds.SelectedItem = songAppId; AppId = songAppId.AppId; - Debug.WriteLine(" RocksmithToolkitLib.SongAppId.xml contains (" + i + ") invalid entries ..."); } private void PopulateArrangements(GameVersion oldGameVersion) @@ -1617,7 +1605,7 @@ private void SelectComboAppId(string appId) else { if (!appId.IsAppIdSixDigits()) - MessageBox.Show("Please enter a valid six digit " + Environment.NewLine + "App ID before continuing.", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Stop); + MessageBox.Show("Please enter a valid six or seven digit " + Environment.NewLine + "App ID before continuing.", MESSAGEBOX_CAPTION, MessageBoxButtons.OK, MessageBoxIcon.Stop); else { cmbAppIds.Items.Insert(0, new SongAppId() { Name = "Unknown AppID", AppId = appId }); diff --git a/RocksmithTookitGUI/Properties/AssemblyInfo.cs b/RocksmithTookitGUI/Properties/AssemblyInfo.cs index ff6cb1779..eeaf32ac6 100644 --- a/RocksmithTookitGUI/Properties/AssemblyInfo.cs +++ b/RocksmithTookitGUI/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT [assembly: AssemblyVersion("2.9.2.1")] -[assembly: AssemblyInformationalVersion("5c76cd1f")] -[assembly: AssemblyConfiguration("2020-02-12T23:57:55")] +[assembly: AssemblyInformationalVersion("0b6278e4")] +[assembly: AssemblyConfiguration("2020-02-14T16:26:02")] diff --git a/RocksmithTookitGUI/ReleaseNotes.txt b/RocksmithTookitGUI/ReleaseNotes.txt index a45136bb2..0baee05b1 100644 --- a/RocksmithTookitGUI/ReleaseNotes.txt +++ b/RocksmithTookitGUI/ReleaseNotes.txt @@ -1,6 +1,5 @@ Rocksmith Toolkit Release Notes -- added RocksmithToolkitLib.SongAppId.xml validation - updated RocksmithToolkitLib.SongAppId.xml dlc AppIDs - improved auto repair of some old toolkit multitone exceptions - volume ranges settable from 0 to -30 with better defaults diff --git a/RocksmithToolkitLib/Properties/AssemblyInfo.cs b/RocksmithToolkitLib/Properties/AssemblyInfo.cs index ce30a67cb..d0b3e56df 100644 --- a/RocksmithToolkitLib/Properties/AssemblyInfo.cs +++ b/RocksmithToolkitLib/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT [assembly: AssemblyVersion("2.9.2.1")] -[assembly: AssemblyInformationalVersion("5c76cd1f")] -[assembly: AssemblyConfiguration("2020-02-12T23:57:55")] +[assembly: AssemblyInformationalVersion("0b6278e4")] +[assembly: AssemblyConfiguration("2020-02-14T16:26:02")] diff --git a/RocksmithToolkitLib/RocksmithToolkitLib.SongAppId.xml b/RocksmithToolkitLib/RocksmithToolkitLib.SongAppId.xml index 4ab398669..69f763e33 100644 --- a/RocksmithToolkitLib/RocksmithToolkitLib.SongAppId.xml +++ b/RocksmithToolkitLib/RocksmithToolkitLib.SongAppId.xml @@ -1,12 +1,13 @@ - - + + + - + @@ -85,7 +86,7 @@ - + @@ -121,9 +122,9 @@ - - - + + + @@ -145,9 +146,12 @@ - - + + + + + @@ -164,7 +168,7 @@ - + @@ -181,16 +185,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -200,38 +204,38 @@ - - - - - - - - - - + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + - + @@ -242,16 +246,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -261,16 +265,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -280,16 +284,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -334,7 +338,7 @@ - + @@ -352,7 +356,7 @@ - + @@ -369,7 +373,7 @@ - + @@ -385,14 +389,14 @@ - + - + @@ -436,9 +440,9 @@ - - - + + + @@ -547,11 +551,11 @@ - - - - - + + + + + @@ -573,9 +577,9 @@ - - - + + + @@ -722,11 +726,11 @@ - - - - - + + + + + @@ -750,7 +754,7 @@ - + @@ -836,15 +840,15 @@ - + - + - + @@ -866,7 +870,7 @@ - + @@ -899,11 +903,11 @@ - - + + - + @@ -964,7 +968,7 @@ - + @@ -1001,9 +1005,9 @@ - - - + + + @@ -1048,7 +1052,7 @@ - + @@ -1241,7 +1245,7 @@ - + @@ -1269,9 +1273,9 @@ - + - + diff --git a/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs b/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs index 6c0fdca82..5dfda529d 100644 --- a/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs +++ b/RocksmithToolkitUpdater/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ // // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT [assembly: AssemblyVersion("2.9.2.1")] -[assembly: AssemblyInformationalVersion("5c76cd1f")] -[assembly: AssemblyConfiguration("2020-02-12T23:57:55")] +[assembly: AssemblyInformationalVersion("0b6278e4")] +[assembly: AssemblyConfiguration("2020-02-14T16:26:02")] diff --git a/VersionInfo.txt b/VersionInfo.txt index 44177f86a..b9341be1b 100644 --- a/VersionInfo.txt +++ b/VersionInfo.txt @@ -1,3 +1,3 @@ 2.9.2.1 -5c76cd1f -2020-02-12T23:57:55 +0b6278e4 +2020-02-14T16:26:02