Skip to content
Permalink
Browse files

- git version upgrade

  • Loading branch information
cozy1 committed Oct 21, 2019
1 parent b161bb6 commit 278f62ba4f655d61634f3291823c2b58cf2d37c8
Showing with 111 additions and 90 deletions.
  1. +1 −0 .gitignore
  2. +5 −4 PatchAssemblyVersion.ps1
  3. BIN RocksmithPreBuild.exe
  4. +33 −22 RocksmithPreBuild/Program.cs
  5. +2 −2 RocksmithPreBuild/Properties/AssemblyInfo.cs
  6. +4 −4 RocksmithTookitGUI/Properties/AssemblyInfo.cs
  7. +1 −1 RocksmithToolkitCLI/artistfolders/Properties/AssemblyInfo.cs
  8. +1 −1 RocksmithToolkitCLI/cdlcconverter/Properties/AssemblyInfo.cs
  9. +1 −1 RocksmithToolkitCLI/convert2012/Properties/AssemblyInfo.cs
  10. +1 −1 RocksmithToolkitCLI/packagecreator/Properties/AssemblyInfo.cs
  11. +1 −1 RocksmithToolkitCLI/packer/Properties/AssemblyInfo.cs
  12. +1 −1 RocksmithToolkitCLI/pcdecrypt/Properties/AssemblyInfo.cs
  13. +1 −1 RocksmithToolkitCLI/sng2014/Properties/AssemblyInfo.cs
  14. +1 −1 RocksmithToolkitCLI/sngtotab/Properties/AssemblyInfo.cs
  15. +1 −1 RocksmithToolkitCLI/toneliberator/Properties/AssemblyInfo.cs
  16. +1 −1 RocksmithToolkitCLI/transferprofile/Properties/AssemblyInfo.cs
  17. +1 −1 RocksmithToolkitCLI/xml2sng/Properties/AssemblyInfo.cs
  18. +1 −1 RocksmithToolkitGUI.Tests/Properties/AssemblyInfo.cs
  19. +1 −1 RocksmithToolkitLib.Tests/Properties/AssemblyInfo.cs
  20. +2 −3 RocksmithToolkitLib/DLCPackage/DLCPackageData.cs
  21. +1 −1 RocksmithToolkitLib/Extensions/TreeViewBrowser.cs
  22. +3 −3 RocksmithToolkitLib/Properties/AssemblyInfo.cs
  23. +20 −13 RocksmithToolkitLib/RocksmithToolkitLib.csproj
  24. +3 −3 RocksmithToolkitLib/Sng/Sng2014FileWriter.cs
  25. +16 −14 RocksmithToolkitLib/ToolkitVersion.cs
  26. +4 −4 RocksmithToolkitUpdater/Properties/AssemblyInfo.cs
  27. +3 −3 VersionInfo.txt
  28. +1 −1 prebuild READ READ.bat
@@ -123,3 +123,4 @@ __pycache__/
/.vs/RocksmithCustomSongCreator/v15/Server/sqlite3
/.vs/RocksmithCustomSongCreator/v15/sqlite3

*.vshost.exe
@@ -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.0"
$Assembly_Configuration = ""
$Assembly_Version = "2.9.2.1"
# $AssemblyConfiguration = "BUILD", "BETA", "RELEASE", or (any other string)
# $AssemblyConfiguration = $env:APPVEYOR_REPO_COMMIT_TIMESTAMP
$Assembly_Configuration = $env:APPVEYOR_REPO_COMMIT_TIMESTAMP

Write-Host "- Patching: $Assembly_File"
Write-Host "- AssemblyVersion: $Assembly_Version"
BIN +512 Bytes (100%) RocksmithPreBuild.exe
Binary file not shown.
@@ -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", "00000000" }; // use manually set git subversion
args = new[] { "PREBUILDER", "READ", "READ" }; // default use existing version/type and set date
// 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(" 'NONE' is converted to an empty/null string for use in the app");
Console.WriteLine(" arg2 = 'BUILD', 'BETA', 'RELEASE' sets [AssemblyConfiguration] to corresponding string");
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;
}
}

@@ -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: AssemblyFileVersion("1.0.3.0")]
[assembly: AssemblyVersion("1.0.4.0")]
[assembly: AssemblyFileVersion("1.0.4.0")]
@@ -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: AssemblyInformationalVersion("013e9e81")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyVersion("2.9.2.1")]
[assembly: AssemblyInformationalVersion("b161bb65")]
[assembly: AssemblyConfiguration("10/21/2019 9:24:00 PM")]
@@ -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
@@ -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("")]

@@ -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
@@ -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("")]

@@ -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("")]

@@ -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("")]

@@ -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("")]

@@ -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("")]

@@ -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
@@ -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
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("xml2sng")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("RocksmithToolkitGUI.Test")]
[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

@@ -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("")]

@@ -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)
@@ -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()))
@@ -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: AssemblyInformationalVersion("013e9e81")]
[assembly: AssemblyVersion("2.9.2.1")]
[assembly: AssemblyInformationalVersion("")]
[assembly: AssemblyConfiguration("")]

0 comments on commit 278f62b

Please sign in to comment.
You can’t perform that action at this time.