diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 667dd790..c120735a 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/Toolbox/Properties/app.manifest b/Toolbox/Properties/app.manifest new file mode 100644 index 00000000..60eec770 --- /dev/null +++ b/Toolbox/Properties/app.manifest @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Toolbox/Toolbox.csproj b/Toolbox/Toolbox.csproj index a2ae69c6..66818358 100644 --- a/Toolbox/Toolbox.csproj +++ b/Toolbox/Toolbox.csproj @@ -38,6 +38,15 @@ Tool.ico + + LocalIntranet + + + false + + + Properties\app.manifest + @@ -151,6 +160,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/Updater/Program.cs b/Updater/Program.cs index f06baf91..bc0f63d4 100644 --- a/Updater/Program.cs +++ b/Updater/Program.cs @@ -77,11 +77,11 @@ namespace Updater Console.WriteLine("Installing..."); foreach (string dir in Directory.GetDirectories("master/")) { - string dirName = new DirectoryInfo(dir).Name; - File.SetAttributes(dirName, FileAttributes.Normal); File.SetAttributes(folderDir, FileAttributes.Normal); + string dirName = new DirectoryInfo(dir).Name; + if (Directory.Exists(Path.Combine(folderDir, dirName + @"\"))) Directory.Delete(Path.Combine(folderDir, dirName + @"\"), true); Directory.Move(dir, Path.Combine(folderDir, dirName + @"\")); diff --git a/Updater/Properties/app.manifest b/Updater/Properties/app.manifest new file mode 100644 index 00000000..3b5ed3da --- /dev/null +++ b/Updater/Properties/app.manifest @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Updater/Updater.csproj b/Updater/Updater.csproj index 797c4856..091b8d98 100644 --- a/Updater/Updater.csproj +++ b/Updater/Updater.csproj @@ -32,6 +32,15 @@ prompt 4 + + LocalIntranet + + + true + + + Properties\app.manifest + ..\Toolbox\Lib\Octokit.dll @@ -52,6 +61,7 @@ + \ No newline at end of file diff --git a/Updater/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Updater/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache index dd3caddb..c6ec9296 100644 Binary files a/Updater/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache and b/Updater/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Updater/obj/Release/Updater.csproj.FileListAbsolute.txt b/Updater/obj/Release/Updater.csproj.FileListAbsolute.txt index d15f45b2..b8430136 100644 --- a/Updater/obj/Release/Updater.csproj.FileListAbsolute.txt +++ b/Updater/obj/Release/Updater.csproj.FileListAbsolute.txt @@ -39,3 +39,8 @@ C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csp C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.csproj.CopyComplete C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.exe C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.pdb +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.exe.manifest +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Toolbox\bin\Release\Updater.application +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.TrustInfo.xml +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.exe.manifest +C:\Users\Nathan\Documents\GitHub\SwitchToolboxV1\Updater\obj\Release\Updater.application