- git version upgrade

rscustom · Oct 21, 2019 · 278f62b · 278f62b
1 parent b161bb6
commit 278f62b
Show file tree

Hide file tree

Showing 28 changed files with 111 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -123,3 +123,4 @@ __pycache__/
 /.vs/RocksmithCustomSongCreator/v15/Server/sqlite3
 /.vs/RocksmithCustomSongCreator/v15/sqlite3
 
+*.vshost.exe
diff --git a/PatchAssemblyVersion.ps1 b/PatchAssemblyVersion.ps1
@@ -16,12 +16,13 @@ $env:GIT_HASH = $env:APPVEYOR_REPO_COMMIT.Substring(0, 8)
 $Assembly_Informational_Version = "$env:GIT_HASH"
 
 # NOTE TO DEVS
-# Manually edit the '$AssemblyVersion' and '$AssemblyConfiguration' values
+# Manually edit the '$AssemblyVersion' and '$AssemblyConfiguration' values here
 # before committing a major revisions/releases to github
 # these will be automatically applied to all AssemblyInfo.cs files by AppVeyor ...
-# $AssemblyConfiguration "BUILD", "BETA", "RELEASE", or (blank) "" 
+$Assembly_Version = "2.9.2.1"
-$Assembly_Version = "2.9.2.0"
+# $AssemblyConfiguration = "BUILD", "BETA", "RELEASE", or (any other string) 
-$Assembly_Configuration = ""
+# $AssemblyConfiguration = $env:APPVEYOR_REPO_COMMIT_TIMESTAMP
+$Assembly_Configuration = $env:APPVEYOR_REPO_COMMIT_TIMESTAMP
 
 Write-Host "- Patching: $Assembly_File"
 Write-Host "- AssemblyVersion: $Assembly_Version"

diff --git a/RocksmithPreBuild.exe b/RocksmithPreBuild.exe
diff --git a/RocksmithPreBuild/Program.cs b/RocksmithPreBuild/Program.cs
@@ -14,7 +14,7 @@ private static void Main(string[] args)
             // common variables are here
             var assemblyVersion = "0.0.0.0";
             var assemblyInformationVersion = "00000000"; // aka gitSubVersion
-            var assemblyConfiguration = ""; // BUILD, BETA, RELEASE, or blank
+            var assemblyConfiguration = ""; // BUILD, BETA, RELEASE, empty string, or DateTime string
             var appExe = Assembly.GetExecutingAssembly().Location;
             var appPath = Path.GetDirectoryName(appExe);
             var parentPath = Path.GetDirectoryName(appPath);
@@ -31,17 +31,18 @@ private static void Main(string[] args)
             // Console.SetWindowSize(90, 35);
 
             // feed the CLI some data when working in debug mode
+            //#if (DEBUG)
             if (DebugMode)
             {
                 //args = new[] { "PREBUILDER", "1.2.3.4", "RELEASE" };
                 //args = new[] { "PREBUILDER", "1.2.3.4", "BETA" };
                 //args = new[] { "PREBUILDER", "1.2.3.4", "BUILD" };
                 // args = new[] { "PREBUILDER", "1.2.3.4", "NONE" };
-                // args = new[] { "PREBUILDER", "READ", "READ" }; // use existing version/type
+                args = new[] { "PREBUILDER", "READ", "READ" }; // default use existing version/type and set date
-                args = new[] { "PREBUILDER", "READ", "READ", "00000000" }; // use manually set git subversion
+                // args = new[] { "PREBUILDER", "READ", "READ", "00000000" }; // resets git subversion and AssemblyConfiguration
                 //args = new[] { "" }; // shows help
             }
-
+            //#endif
             if (!args.Any() || args[0].ToUpper().Contains("HELP") || args[0].Contains("?"))
             {
                 Console.WriteLine("");
@@ -60,8 +61,9 @@ private static void Main(string[] args)
                 Console.WriteLine("            arg2 = 'READ' [AssemblyConfiguration Read Mode]");
                 Console.WriteLine("");
                 Console.WriteLine("            arg1 = '2.8.3.0' [AssemblyVersion Write Mode]");
-                Console.WriteLine("            arg2 = 'BUILD', 'BETA', 'RELEASE', or 'NONE' [AssemblyConfiguration Write Mode]");
+                Console.WriteLine("            arg2 = 'BUILD', 'BETA', 'RELEASE' sets [AssemblyConfiguration] to corresponding string");
-                Console.WriteLine("                   'NONE' is converted to an empty/null string for use in the app");
+                Console.WriteLine("                   'DATE' sets [AssemblyConfiguration] to $env:APPVEYOR_REPO_COMMIT_TIMESTAMP");
+                Console.WriteLine("                   'NONE' sets [AssemblyConfiguration] to empty string");
                 Console.WriteLine("");
                 Console.WriteLine(" - Optional: (write git subversion)");
                 Console.WriteLine("            arg3 = '00000000' [AssemblyInformationVersion Write Mode] aka gitsubversion");
@@ -133,7 +135,7 @@ private static void Main(string[] args)
                 assemblyInformationVersion = lines[0].Substring(0, 8);
 
             Console.ForegroundColor = ConsoleColor.Cyan;
-            Console.WriteLine(" - gitSubVersion (AssemblyInformationVersion): " + assemblyInformationVersion);
+            Console.WriteLine(" - gitSubVersion [AssemblyInformationVersion]: " + assemblyInformationVersion);
             Console.ForegroundColor = ConsoleColor.Green;
             Console.WriteLine("");
 
@@ -162,16 +164,15 @@ private static void Main(string[] args)
                             File.WriteAllLines(patchAssemblyVersionPath, lines.ToArray());
                             Console.WriteLine(" - Updated $Assembly_Version: " + assemblyVersion);
                         }
-
-                        Console.ForegroundColor = ConsoleColor.Green;
                     }
                     else
                     {
                         Console.ForegroundColor = ConsoleColor.Yellow;
                         Console.WriteLine(" - <ERROR> Could not find '$Assembly_Version' ...");
                         Console.WriteLine(patchAssemblyVersionPath);
-                        Console.ForegroundColor = ConsoleColor.Green;
                     }
+
+                    Console.ForegroundColor = ConsoleColor.Green;
                 }
 
                 // $Assembly_Configuration = "BETA" 
@@ -184,31 +185,41 @@ private static void Main(string[] args)
                         Console.ForegroundColor = ConsoleColor.Cyan;
                         if (args[2].ToUpper() == "READ")
                         {
-                            assemblyConfiguration = GetStringInBetween("\"", "\"", line);
+                            // default AssemblyConfiguration
+                            if (String.IsNullOrEmpty(assemblyConfiguration))
+                                assemblyConfiguration = DateTime.UtcNow.ToString();
+                            else
+                                assemblyConfiguration = GetStringInBetween("\"", "\"", line);
+
                             Console.WriteLine(" - Read $Assembly_Configuration: " + assemblyConfiguration);
                         }
                         else
                         {
                             // convert configuration term 'RELEASE' to empty (blank)
-                            if (args[2].ToUpper() == "NONE")
+                            if (args[2].ToUpper() == "DATE")
+                                assemblyConfiguration = "$env:APPVEYOR_REPO_COMMIT_TIMESTAMP";
+                            else if (args[2].ToUpper() == "NONE")
                                 assemblyConfiguration = "";
                             else
                                 assemblyConfiguration = (args[2]);
 
-                            lines[idx] = "$Assembly_Configuration = \"" + assemblyConfiguration + "\"";
+                            if (args[2].ToUpper() == "DATE")
+                                lines[idx] = "$Assembly_Configuration = $env:APPVEYOR_REPO_COMMIT_TIMESTAMP";
+                            else
+                                lines[idx] = "$Assembly_Configuration = \"" + assemblyConfiguration + "\"";
+
                             File.WriteAllLines(patchAssemblyVersionPath, lines.ToArray());
                             Console.WriteLine(" - Updated $Assembly_Configuration: " + assemblyConfiguration);
                         }
-
-                        Console.ForegroundColor = ConsoleColor.Green;
                     }
                     else
                     {
                         Console.ForegroundColor = ConsoleColor.Yellow;
                         Console.WriteLine(" - <ERROR> Could not find '$Assembly_Configuration' ...");
                         Console.WriteLine(patchAssemblyVersionPath);
-                        Console.ForegroundColor = ConsoleColor.Green;
                     }
+
+                    Console.ForegroundColor = ConsoleColor.Green;
                 }
 
                 Console.WriteLine("");
@@ -247,15 +258,15 @@ private static void Main(string[] args)
                             File.WriteAllLines(assemblyInfoPath, lines.ToArray());
                             Console.ForegroundColor = ConsoleColor.Cyan;
                             Console.WriteLine(" - Updated AssemblyVersion: " + assemblyVersion);
-                            Console.ForegroundColor = ConsoleColor.Green;
                         }
                         else
                         {
                             Console.ForegroundColor = ConsoleColor.Yellow;
                             Console.WriteLine(" - <ERROR> Could not find 'AssemblyVersion' ...");
                             Console.WriteLine(assemblyInfoPath);
-                            Console.ForegroundColor = ConsoleColor.Green;
                         }
+
+                        Console.ForegroundColor = ConsoleColor.Green;
                     }
 
                     // [assembly: AssemblyInformationalVersion("00000000")]
@@ -269,15 +280,15 @@ private static void Main(string[] args)
                             File.WriteAllLines(assemblyInfoPath, lines.ToArray());
                             Console.ForegroundColor = ConsoleColor.Cyan;
                             Console.WriteLine(" - Updated AssemblyInformationalVersion: " + assemblyInformationVersion);
-                            Console.ForegroundColor = ConsoleColor.Green;
                         }
                         else
                         {
                             Console.ForegroundColor = ConsoleColor.Yellow;
                             Console.WriteLine(" - <ERROR> Could not find 'AssemblyInformationalVersion' ...");
                             Console.WriteLine(assemblyInfoPath);
-                            Console.ForegroundColor = ConsoleColor.Green;
                         }
+
+                        Console.ForegroundColor = ConsoleColor.Green;
                     }
 
                     // [assembly: AssemblyConfiguration("BETA")]
@@ -291,15 +302,15 @@ private static void Main(string[] args)
                             File.WriteAllLines(assemblyInfoPath, lines.ToArray());
                             Console.ForegroundColor = ConsoleColor.Cyan;
                             Console.WriteLine(" - Updated AssemblyConfiguration: " + assemblyConfiguration);
-                            Console.ForegroundColor = ConsoleColor.Green;
                         }
                         else
                         {
                             Console.ForegroundColor = ConsoleColor.Yellow;
                             Console.WriteLine(" - <ERROR> Could not find 'AssemblyConfiguration' ...");
                             Console.WriteLine(assemblyInfoPath);
-                            Console.ForegroundColor = ConsoleColor.Green;
                         }
+
+                        Console.ForegroundColor = ConsoleColor.Green;
                     }
                 }
 

diff --git a/RocksmithPreBuild/Properties/AssemblyInfo.cs b/RocksmithPreBuild/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyVersion("1.0.4.0")]
-[assembly: AssemblyFileVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.4.0")]
diff --git a/RocksmithTookitGUI/Properties/AssemblyInfo.cs b/RocksmithTookitGUI/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyDescription("The purpose of this utility package is to generate custom songs compatible with Ubisoft® Rocksmith™ software. It is maintained by an open source community of enthusiasts and is not affiliated with Ubisoft® and/or the Rocksmith™ team. For more information, please visit: http://www.rscustom.net.")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Project")]
 [assembly: AssemblyProduct("Song Creator Toolkit for Rocksmith")]
-[assembly: AssemblyCopyright("Copyright © 2017")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 // Setting ComVisible to false makes the types in this assembly not visible 
@@ -28,6 +28,6 @@
 //      Revision
 //
 // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
-[assembly: AssemblyVersion("2.9.2.0")]
+[assembly: AssemblyVersion("2.9.2.1")]
-[assembly: AssemblyInformationalVersion("013e9e81")]
+[assembly: AssemblyInformationalVersion("b161bb65")]
-[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyConfiguration("10/21/2019 9:24:00 PM")]
diff --git a/RocksmithToolkitCLI/artistfolders/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/artistfolders/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Tookit CLI")]
 [assembly: AssemblyProduct("artistfolders")]
-[assembly: AssemblyCopyright("Copyright ©  2015 CST Developer Team")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 // Setting ComVisible to false makes the types in this assembly not visible 

diff --git a/RocksmithToolkitCLI/cdlcconverter/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/cdlcconverter/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Project")]
 [assembly: AssemblyProduct("dlcconverter")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/RocksmithToolkitCLI/convert2012/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/convert2012/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Tookit CLI")]
 [assembly: AssemblyProduct("convert2012")]
-[assembly: AssemblyCopyright("Copyright ©  2015 CST Developer Team")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 // Setting ComVisible to false makes the types in this assembly not visible 

diff --git a/RocksmithToolkitCLI/packagecreator/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/packagecreator/Properties/AssemblyInfo.cs
@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Tookit CLI")]
 [assembly: AssemblyProduct("packagecreator")]
-[assembly: AssemblyCopyright("Copyright ©  2015 CST Developer Team")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/RocksmithToolkitCLI/packer/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/packer/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Project")]
 [assembly: AssemblyProduct("packer")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/RocksmithToolkitCLI/pcdecrypt/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/pcdecrypt/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Project")]
 [assembly: AssemblyProduct("pcdecrypt")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/RocksmithToolkitCLI/sng2014/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/sng2014/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("sng 2014 utility")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/RocksmithToolkitCLI/sngtotab/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/sngtotab/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Song Creator Toolkit for Rocksmith")]
 [assembly: AssemblyProduct("sngtotab")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/RocksmithToolkitCLI/toneliberator/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/toneliberator/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Tookit CLI")]
 [assembly: AssemblyProduct("toneliberator")]
-[assembly: AssemblyCopyright("Copyright ©  2017 CST Developer Team, Cozy")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 // Setting ComVisible to false makes the types in this assembly not visible 

diff --git a/RocksmithToolkitCLI/transferprofile/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/transferprofile/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Tookit CLI")]
 [assembly: AssemblyProduct("transferprofile")]
-[assembly: AssemblyCopyright("Copyright ©  2017 CST Developer Team, Cozy")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 // Setting ComVisible to false makes the types in this assembly not visible 

diff --git a/RocksmithToolkitCLI/xml2sng/Properties/AssemblyInfo.cs b/RocksmithToolkitCLI/xml2sng/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("xml2sng")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/RocksmithToolkitGUI.Tests/Properties/AssemblyInfo.cs b/RocksmithToolkitGUI.Tests/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("RocksmithToolkitGUI.Test")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/RocksmithToolkitLib.Tests/Properties/AssemblyInfo.cs b/RocksmithToolkitLib.Tests/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Project")]
 [assembly: AssemblyProduct("RocksmithToolkitTest")]
-[assembly: AssemblyCopyright("Copyright © 2015")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/RocksmithToolkitLib/DLCPackage/DLCPackageData.cs b/RocksmithToolkitLib/DLCPackage/DLCPackageData.cs
@@ -571,19 +571,18 @@ public static DLCPackageData LoadFromFolder(string unpackedDir, Platform targetP
                 // throw exception for corrupt/missing XML file names
                 if (!File.Exists(xmlFile))
                 {
+                    GlobalExtension.HideProgress();
                     var artifactsDir = unpackedDir;
                     StackTrace stackTrace = new StackTrace();
                     var callerName = stackTrace.GetFrame(1).GetMethod().Name;
 
                     if (callerName.Equals("PackageImport") && ConfigRepository.Instance().GetBoolean("creator_structured"))
                         artifactsDir = Path.Combine(unpackedDir, "EOF");
-
+    
                     throw new DataException("Corrupt CDLC artifact file naming." + Environment.NewLine + Environment.NewLine +
                         "1) Open the artifacts folder: " + artifactsDir + "   " + Environment.NewLine +
                         "2) Look for and rename any artifact file names that contain special characters, e.g. '~' tilde" + Environment.NewLine +
                         "3) Reauthor the CDLC using: >CDLC Creator>Add>Edit>Generate" + Environment.NewLine);
-
-                    GlobalExtension.HideProgress();
                 }
 
                 if (attr.Phrases != null)

diff --git a/RocksmithToolkitLib/Extensions/TreeViewBrowser.cs b/RocksmithToolkitLib/Extensions/TreeViewBrowser.cs
@@ -236,7 +236,7 @@ private void InitDefaultFolders()
         private void TreeViewBrowser_NodeMouseDoubleClick(object sender, TreeNodeMouseClickEventArgs e)
         {
             // double click produces the undesired effect of opening folder in a new window
-            return; // so do nothing instead
+            return; // do nothing instead for now
 
             // opens the double clicked directory or file in windows explorer
             if (File.Exists(e.Node.Tag.ToString()) || Directory.Exists(e.Node.Tag.ToString()))

diff --git a/RocksmithToolkitLib/Properties/AssemblyInfo.cs b/RocksmithToolkitLib/Properties/AssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyCompany("Rocksmith Custom Song Project")]
 [assembly: AssemblyProduct("RocksmithToolkitLib")]
-[assembly: AssemblyCopyright("Copyright © 2017")]
+[assembly: AssemblyCopyright("Copyright © 2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 // Setting ComVisible to false makes the types in this assembly not visible 
@@ -28,6 +28,6 @@
 //      Revision
 //
 // THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
-[assembly: AssemblyVersion("2.9.2.0")]
+[assembly: AssemblyVersion("2.9.2.1")]
-[assembly: AssemblyInformationalVersion("013e9e81")]
+[assembly: AssemblyInformationalVersion("")]
 [assembly: AssemblyConfiguration("")]