0.3.0 Release Candidate

OopyDoopy · OopyDoopy · commit e4ef86e3f7e9 · 2021-03-19T20:38:27.000-04:00
diff --git a/App.config b/App.config
@@ -6,4 +6,4 @@
   <System.Windows.Forms.ApplicationConfigurationSection>
     <add key="DpiAwareness" value="PerMonitorV2" />
   </System.Windows.Forms.ApplicationConfigurationSection>
-</configuration>
+</configuration>
diff --git a/Forms/Form1.cs b/Forms/Form1.cs
@@ -352,8 +352,8 @@ private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e)
                     MessageBox.Show(@"The link for the Injector is invalid.  Please report this problem on the ReShade Centralized github page.");
                     return;
                 }
-                File.Copy(Program.dlls + @"\inject32.exe", Program.mdlls + @"\inject32.exe");
-                File.Copy(Program.dlls + @"\inject64.exe", Program.mdlls + @"\inject64.exe");
+                File.Copy(Program.dlls + @"\inject32.exe", Program.mdlls + @"\inject32.exe", true);
+                File.Copy(Program.dlls + @"\inject64.exe", Program.mdlls + @"\inject64.exe", true);
             }
             File.Delete(@"reshade.exe");
             File.Delete(@"[0]");
diff --git a/ILMergeOrder.txt b/ILMergeOrder.txt
@@ -0,0 +1 @@
+﻿
diff --git a/ReShade Centralized.csproj b/ReShade Centralized.csproj
@@ -194,5 +194,11 @@
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="ILMergeOrder.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="lib\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/ReShade Centralized.sln b/ReShade Centralized.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReShade Centralized", "ReShade Centralized.csproj", "{0545A51F-B5A9-43C0-B333-34B0B8A27F8C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReShade Centralized Updater", "..\ReShade Centralized Updater\ReShade Centralized Updater.csproj", "{3133C13A-7099-425F-A725-F4FB109E7F5E}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -20,12 +18,6 @@ Global
 		{0545A51F-B5A9-43C0-B333-34B0B8A27F8C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{0545A51F-B5A9-43C0-B333-34B0B8A27F8C}.UWP|Any CPU.ActiveCfg = UWP|Any CPU
 		{0545A51F-B5A9-43C0-B333-34B0B8A27F8C}.UWP|Any CPU.Build.0 = UWP|Any CPU
-		{3133C13A-7099-425F-A725-F4FB109E7F5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3133C13A-7099-425F-A725-F4FB109E7F5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3133C13A-7099-425F-A725-F4FB109E7F5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3133C13A-7099-425F-A725-F4FB109E7F5E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3133C13A-7099-425F-A725-F4FB109E7F5E}.UWP|Any CPU.ActiveCfg = Debug|Any CPU
-		{3133C13A-7099-425F-A725-F4FB109E7F5E}.UWP|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Original file line number	Diff line number	Diff line change
`@@ -352,8 +352,8 @@ private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e)`
`352`	`352`	`MessageBox.Show(@"The link for the Injector is invalid. Please report this problem on the ReShade Centralized github page.");`
`353`	`353`	`return;`
`354`	`354`	`}`
`355`		`- File.Copy(Program.dlls + @"\inject32.exe", Program.mdlls + @"\inject32.exe");`
`356`		`- File.Copy(Program.dlls + @"\inject64.exe", Program.mdlls + @"\inject64.exe");`
	`355`	`+ File.Copy(Program.dlls + @"\inject32.exe", Program.mdlls + @"\inject32.exe", true);`
	`356`	`+ File.Copy(Program.dlls + @"\inject64.exe", Program.mdlls + @"\inject64.exe", true);`
`357`	`357`	`}`
`358`	`358`	`File.Delete(@"reshade.exe");`
`359`	`359`	`File.Delete(@"[0]");`