Skip to content
Permalink
Browse files

- app.config work

  • Loading branch information...
cozy1 committed Mar 16, 2019
1 parent f34b4cd commit 378802d2405a105d575d4ffe83d15e47111610b2
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("3b4767c4")]
[assembly: AssemblyInformationalVersion("f34b4cda")]
[assembly: AssemblyConfiguration("")]
@@ -69,6 +69,9 @@
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<ProjectConfigFileName>App.config</ProjectConfigFileName>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -350,7 +353,6 @@
</EmbeddedResource>
<None Include="App.config">
<SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="app.manifest">
<SubType>Designer</SubType>
@@ -458,27 +460,28 @@ xcopy /E /S /Y "$(SolutionDir)ThirdPartyApps\*.*" "$(TargetDir)*.*"
</PostBuildEvent>
</PropertyGroup>
<PropertyGroup>
<PostBuildEvent>REM Cleanup for Release (AppVeyor) Build
<PostBuildEvent>REM copy ToolkitUpdater App.config to Release folder
copy /Y "$(SolutionDir)RocksmithToolkitUpdater\$(OutDir)*.exe.config" "$(TargetDir)*.*"

REM Cleanup for Release (AppVeyor) Build

if $(ConfigurationName) == Release (
del /S /Q "$(TargetDir)*.exe.config"
del /S /Q "$(TargetDir)*.pdb"
del /S /Q "$(TargetDir)*.vshost.exe"

del /S /Q "$(SolutionDir)*.pdb"

REM used by appVeyor so commented out
REM del /S /Q "$(SolutionDir)*.vshost.exe"

del /S /Q "$(TargetDir)MiscUtil.xml"
del /S /Q "$(TargetDir)NLog.xml"
del /S /Q "$(TargetDir)Newtonsoft.Json.xml"
del /S /Q "$(TargetDir)X360.xml"
del /S /Q "$(TargetDir)X360.xml"
)

REM Cleanup for Release (Mac Wineskin) Build

if $(ConfigurationName) == RocksmithToolkitMac (
del /S /Q "$(TargetDir)*.exe.config"
del /S /Q "$(TargetDir)*.pdb"
del /S /Q "$(TargetDir)*.vshost.exe"

@@ -21,6 +21,7 @@ partial class UpdateForm : Form
// TODO: users may need to add both files to AV whitelist to run updater
private const string APP_UPDATER = "RocksmithToolkitUpdater.exe";
private const string APP_UPDATING = "RocksmithToolkitUpdating.exe";
private const string APP_CONFIG_EXT = ".config";

private string LocalToolkitDir
{
@@ -50,6 +51,10 @@ public void Init(ToolkitVersionOnline onlineVersion)
if (File.Exists(updatingAppPath))
File.Delete(updatingAppPath);

var updatingConfigPath = Path.Combine(LocalToolkitDir, APP_UPDATING + APP_CONFIG_EXT);
if (File.Exists(updatingConfigPath))
File.Delete(updatingConfigPath);

var useBeta = ConfigRepository.Instance().GetBoolean("general_usebeta");
lblCurrentVersion.Text = ToolkitVersion.RSTKGuiVersion;
lblNewVersion.Text = String.Format("{0}-{1} {2}", onlineVersion.OnlineVersion, onlineVersion.Revision, useBeta ? "" : "DISABLED");
@@ -81,6 +86,8 @@ private void btnInstall_Click(object sender, EventArgs e)
var tempToolkitDir = Path.Combine(Path.GetTempPath(), "RocksmithToolkit");
var updaterAppPath = Path.Combine(LocalToolkitDir, APP_UPDATER);
var updatingAppPath = Path.Combine(tempToolkitDir, APP_UPDATING);
var updaterConfigPath = Path.Combine(LocalToolkitDir, APP_UPDATER + APP_CONFIG_EXT);
var updatingConfigPath = Path.Combine(tempToolkitDir, APP_UPDATING + APP_CONFIG_EXT);

if (!File.Exists(updaterAppPath))
{
@@ -99,6 +106,7 @@ private void btnInstall_Click(object sender, EventArgs e)
{
// make a copy of AutoUpdater to prevent locking the process during update
File.Copy(updaterAppPath, updatingAppPath, true);
File.Copy(updaterConfigPath, updatingConfigPath, true);

// normal operation
if (!GeneralExtension.IsInDesignMode)
@@ -12,7 +12,7 @@ namespace RocksmithToolkitLib.Tests
/// <summary>
/// Initializes an instance of TestSettings global variables for Unit Testing
/// </summary>
public class TestSettings : NotifyPropChangedBase
public class TestSettings
{
public string ResourcesDir { get; set; }
public List<string> ResourcePaths { get; set; }
@@ -27,5 +27,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("3b4767c4")]
[assembly: AssemblyInformationalVersion("f34b4cda")]
[assembly: AssemblyConfiguration("")]
@@ -29,5 +29,5 @@
//
// THESE VALUES ARE PROGRAMMATICALLY GENERATED - DO NOT EDIT
[assembly: AssemblyVersion("2.9.2.0")]
[assembly: AssemblyInformationalVersion("3b4767c4")]
[assembly: AssemblyInformationalVersion("f34b4cda")]
[assembly: AssemblyConfiguration("")]
@@ -12,7 +12,6 @@
<AssemblyName>RocksmithToolkitUpdater</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -53,6 +52,12 @@
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
<UseVSHostingProcess>false</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<ProjectConfigFileName>App.config</ProjectConfigFileName>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
@@ -1,3 +1,3 @@
2.9.2.0
3b4767c4
f34b4cda

0 comments on commit 378802d

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