Permalink
Browse files

- dev update of build structure

  • Loading branch information...
cozy1 committed Jan 22, 2019
1 parent 10014e9 commit e054e9abe9f8ac42653e02c13ff8c09c940cfed7
@@ -19,9 +19,9 @@ $Assembly_Informational_Version = "$env:GIT_HASH"
# Manually edit the '$AssemblyVersion' and '$AssemblyConfiguration' values
# before committing a major revisions/releases to github
# these will be automatically applied to all AssemblyInfo.cs files by AppVeyor ...
# $AssemblyConfiguration should be "BETA" or use "" if RELEASE
$Assembly_Version = "2.9.1.0"
$Assembly_Configuration = "BETA"
# $AssemblyConfiguration "BUILD", "BETA", "RELEASE", or (blank) ""
$Assembly_Version = "2.9.2.0"
$Assembly_Configuration = ""

Write-Host "- Patching: $Assembly_File"
Write-Host "- AssemblyVersion: $Assembly_Version"
BIN +0 Bytes (100%) RocksmithPreBuild.exe
Binary file not shown.
@@ -14,8 +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 = "BETA";

var assemblyConfiguration = ""; // BUILD, BETA, RELEASE, or blank
var appExe = Assembly.GetExecutingAssembly().Location;
var appPath = Path.GetDirectoryName(appExe);
var parentPath = Path.GetDirectoryName(appPath);
@@ -33,12 +32,20 @@ private static void Main(string[] args)

// feed the CLI some data when working in debug mode
if (DebugMode)
//args = new[] { "PREBUILDER", "2.8.3.1", "RELEASE" };
//args = new[] { "PREBUILDER", "2.8.3.1", "BETA" };
args = new[] { "PREBUILDER", "READ", "READ" };
//args = new[] { "" }; // shows help
{
//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[] { "" }; // shows help
}

if (!args.Any() || args.Length != 3 || args[0].ToUpper().Contains("HELP") || args[0].Contains("?"))
if (args.Any() && args[0].ToUpper().Contains("CONVERT"))
{
// use the easter egg feature to convert non-VS2010 projects
}
else if (!args.Any() || args.Length != 3 || args[0].ToUpper().Contains("HELP") || args[0].Contains("?"))
{
Console.WriteLine("");
Console.WriteLine(" CLI RocksmithPreBuild.exe");
@@ -55,12 +62,12 @@ private static void Main(string[] args)
Console.WriteLine(" arg1 = 'READ' [AssemblyVersion Read Mode] ");
Console.WriteLine(" arg2 = 'READ' [AssemblyConfiguration Read Mode]");
Console.WriteLine(" arg1 = '2.8.3.0' [AssemblyVersion Write Mode]");
Console.WriteLine(" arg2 = 'BETA' or 'RELEASE' [AssemblyConfiguration Write Mode]");
Console.WriteLine(" 'RELEASE' is converted to an empty/null string for use in the app");
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("");
Console.WriteLine(" - Usage: Run CLI RocksmithPreBuilder.exe with arguments from inside");
Console.WriteLine(" the VS2010 DEBUG MODE pre-build event in RocksmithToolkitLib");
Console.WriteLine(" e.g. cmd /c \"RocksmithPreBuild.exe PREBUILD 2.8.3.0 RELEASE\"");
Console.WriteLine(" e.g. cmd /c \"RocksmithPreBuild.exe PREBUILD 1.2.3.4 RELEASE\"");
Console.WriteLine("");
Console.WriteLine("Press any key to continue");
if (DebugMode) Console.Read();
@@ -178,7 +185,7 @@ private static void Main(string[] args)
else
{
// convert configuration term 'RELEASE' to empty (blank)
if (args[2].ToUpper() == "RELEASE")
if (args[2].ToUpper() == "NONE")
assemblyConfiguration = "";
else
assemblyConfiguration = (args[2]);
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("RocksmithPreBuilder")]
[assembly: AssemblyCopyright("Copyright © 2017")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

@@ -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.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.0.1")]
[assembly: AssemblyFileVersion("1.0.0.1")]

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -260,9 +260,7 @@ private void MainForm_Shown(object sender, EventArgs e)
bool showRevNote = ConfigRepository.Instance().GetBoolean("general_showrevnote");
if (showRevNote)
{
if (this.Text.ToUpper().Contains("BETA"))
ShowHelpForm();

ShowHelpForm();
ConfigRepository.Instance()["general_showrevnote"] = "false";
}

@@ -287,13 +285,12 @@ private void MainForm_Shown(object sender, EventArgs e)

private void ShowHelpForm()
{
Assembly assembly = Assembly.GetExecutingAssembly();
using (Stream streamBetaInfo = assembly.GetManifestResourceStream("RocksmithToolkitGUI.BetaInfo.rtf")) //RocksmithToolkitGUI.Resources.
using (Stream stream = File.OpenRead("ReleaseNotes.rtf"))
{
using (var helpViewer = new HelpForm())
{
helpViewer.Text = String.Format("{0}", "TOOLKIT BETA REVISION MESSAGE ...");
helpViewer.PopulateRichText(streamBetaInfo);
helpViewer.Text = String.Format("{0}", "Toolkit Release Notes ...");
helpViewer.PopulateRichText(stream);
helpViewer.ShowDialog();
}
}
@@ -28,6 +28,6 @@
// Revision
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.1.0")]
[assembly: AssemblyInformationalVersion("16013f00")]
[assembly: AssemblyConfiguration("BETA")]
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("10014e93")]
[assembly: AssemblyConfiguration("")]
Oops, something went wrong.

0 comments on commit e054e9a

Please sign in to comment.