Permalink
Browse files

- add App.config file

  • Loading branch information...
cozy1 committed Jan 29, 2019
1 parent 824199a commit 71de56d6f220ab8662387803e8aaf72d0a916a50
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<runtime>
<!-- solution to error 'caused the assembly to be sandboxed' -->
<loadFromRemoteSources enabled="true"/>

This comment has been minimized.

@L0FKA

L0FKA Feb 12, 2019

Contributor

Should've dig it earlier.. but it's not that great solution I'd like to have installer as an option as well :)

</runtime>
</configuration>

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

Oops, something went wrong.
@@ -120,9 +120,6 @@
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>23, 3</value>
</metadata>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>23, 3</value>
</metadata>
<data name="chkShowlights.ToolTip" xml:space="preserve">
<value>CAUTION - FOR DEVELOPER USE ONLY -
If checked, generates only the minimum
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("20dd063f")]
[assembly: AssemblyInformationalVersion("824199a9")]
[assembly: AssemblyConfiguration("")]
@@ -1,5 +1,6 @@
Rocksmith Toolkit Release Notes

- add App.config file (fixes some Win10 errors)
- fixed Auto Updater to work with new file directory structure and improved function
- set "Auto Update" to true in GeneralConfig as default and force use of latest build
- added 'assemblyPath' enumeration to Auto Update feature
@@ -347,6 +347,9 @@
<EmbeddedResource Include="ZpeConverter\ZpeConverter.resx">
<DependentUpon>ZpeConverter.cs</DependentUpon>
</EmbeddedResource>
<Content Include="App.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="app.manifest">
<SubType>Designer</SubType>
</None>
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlTypes;
using System.Drawing;
using System.IO;
@@ -24,6 +25,7 @@
using RocksmithToolkitLib.Ogg;
using Tone = RocksmithToolkitLib.DLCPackage.Manifest.Tone.Tone;
using RocksmithToolkitLib.PsarcLoader;
using System.Diagnostics;


namespace RocksmithToolkitLib.DLCPackage
@@ -542,6 +544,20 @@ private static void GenerateRS2014SongPsarc(Stream output, DLCPackageData info,
var manifest = new Manifest2014<Attributes2014>();
var attribute = new Attributes2014(arrangementFileName, arr, info, platform);

if (false) // for debugging represent conflicts
{
var infoArrangement = info.Arrangements.Where(x => x.ArrangementName == arr.ArrangementName).FirstOrDefault();
if (arr.Represent != Convert.ToBoolean(infoArrangement.ArrangementPropeties.Represent))
Debug.WriteLine("PRE Conflicted XML/JSON Represent elements in: " + arr.ToString());
if (arr.BonusArr != Convert.ToBoolean(infoArrangement.ArrangementPropeties.BonusArr))
Debug.WriteLine("PRE Conflicted XML/JSON BonusArr elements in: " + arr.ToString());

if (attribute.ArrangementProperties.Represent != infoArrangement.ArrangementPropeties.Represent)
Debug.WriteLine("POST Conflicted XML/JSON Represent elements in: " + arr.ToString());
if (attribute.ArrangementProperties.BonusArr != infoArrangement.ArrangementPropeties.BonusArr)
Debug.WriteLine("POST Conflicted XML/JSON BonusArr elements in: " + arr.ToString());
}

// Commented out - EOF properly sets the bonus/represent elements
//if (arrangement.ArrangementType == ArrangementType.Bass || arrangement.ArrangementType == ArrangementType.Guitar)
//{
@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("20dd063f")]
[assembly: AssemblyInformationalVersion("824199a9")]
[assembly: AssemblyConfiguration("")]
@@ -36,7 +36,7 @@ public static string RSTKGuiVersion
get
{
if (GeneralExtensions.IsInDesignMode)
AssemblyConfiguration = "IDE";
AssemblyConfiguration = "DEBUG";

return String.Format("{0}-{1} {2}", AssemblyVersion, AssemblyInformationVersion, AssemblyConfiguration).Trim();
}
@@ -340,31 +340,30 @@ public AutoUpdaterForm(string[] args)
if (File.Exists(latestZipPath))
File.Delete(latestZipPath);

// TODO: FIXME
// close localToolkitDir if it's open so it can be deleted
// find open localToolkitDir and close it so it can be deleted
if (localToolkitDir != newLocalToolkitDir)
{
var shellWindows = new SHDocVw.ShellWindows();
foreach (SHDocVw.InternetExplorer shellWindow in shellWindows)
{
var debugMe = shellWindow.LocationURL.ToLower();

var processType = Path.GetFileNameWithoutExtension(shellWindow.FullName).ToLower();
if (processType.Equals("explorer") &&
shellWindow.LocationURL.ToLower().Replace(@"/", @"\").Contains(localToolkitDir.ToLower()))
var cleanLocationUrl = shellWindow.LocationURL.ToLower().Replace(@"/", @"\");
if (processType.Equals("explorer") && cleanLocationUrl.Contains(localToolkitDir.ToLower()))
{
shellWindow.Quit();
Thread.Sleep(100);
shellWindow.Quit();
Thread.Sleep(100);

if (isDebugMe)
MessageBox.Show("localToolkitDir: " + localToolkitDir + Environment.NewLine +
"should now be closed ...", "DPDM");

// attempt to delete the closed directory
DeleteDirectory(localToolkitDir);
break;
}
}

// delete empty/closed directory
DeleteDirectory(localToolkitDir);
}

if (isDebugMe)
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("20dd063f")]
[assembly: AssemblyInformationalVersion("824199a9")]
[assembly: AssemblyConfiguration("")]
@@ -1,3 +1,3 @@
2.9.2.0
20dd063f
824199a9

0 comments on commit 71de56d

Please sign in to comment.