From f2ccd4f4546e36bb24c1eae2033ff3df1003e6bc Mon Sep 17 00:00:00 2001
From: Mikhail Pilin <mikhail@pilin.name>
Date: Wed, 22 Apr 2020 11:46:07 +0200
Subject: [PATCH] Remove WOW64 checking. Switch to
 Microsoft.NETFramework.ReferenceAssemblies.net20. Fix scripts.

---
 AELauncher/AEProcess.cs |   6 ------
 Common.targets          |  10 +++++++---
 build.cmd               |   2 +-
 version.hpp             | Bin 460 -> 460 bytes
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/AELauncher/AEProcess.cs b/AELauncher/AEProcess.cs
index 34cc394..4f6f12a 100644
--- a/AELauncher/AEProcess.cs
+++ b/AELauncher/AEProcess.cs
@@ -13,12 +13,10 @@ namespace ww898.AELauncher
   public static class AEProcess
   {
     private const string Sys32Dir = @"%SystemRoot%\System32";
-    private const string Wow64Dir = @"%SystemRoot%\SysWOW64";
 
     private const string AeLoaderDll = "AELoader.dll";
 
     private const string Sys32AeLoaderDll = Sys32Dir + @"\" + AeLoaderDll;
-    private const string Wow64AeLoaderDll = Wow64Dir + @"\" + AeLoaderDll;
 
     private const string DonorExe = Sys32Dir + @"\recdisc.exe";
 
@@ -53,10 +51,6 @@ private static void Run(string executable, string arguments = null)
       if (!File.Exists(Environment.ExpandEnvironmentVariables(Sys32AeLoaderDll)))
         throw new FileNotFoundException(Sys32AeLoaderDll + " wasn't found");
 
-      if (Directory.Exists(Environment.ExpandEnvironmentVariables(Wow64Dir)))
-        if (!File.Exists(Environment.ExpandEnvironmentVariables(Wow64AeLoaderDll)))
-          throw new FileNotFoundException(Wow64AeLoaderDll + " wasn't found");
-
       if (!ElevationUtil.IsUacEnabled())
         throw new Exception("UAC is disabled");
 
diff --git a/Common.targets b/Common.targets
index 7c43d09..5e03b32 100644
--- a/Common.targets
+++ b/Common.targets
@@ -7,9 +7,13 @@
     <Authors>Mikhail Pilin</Authors>
     <Copyright>Copyright © 2020 Mikhail Pilin</Copyright>
     <Description>Auto elevation executor</Description>
-    <Version>1.0.2</Version>
+    <PackageReleaseNotes>Remove unnecessary WOW64 checking</PackageReleaseNotes>
+    <Version>1.0.3</Version>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(OS)' == 'Windows_NT' AND ('$(TargetFramework)' == 'net20' or '$(TargetFramework)' == 'net30' or '$(TargetFramework)' == 'net35')">
-    <FrameworkPathOverride>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
+  <PropertyGroup>
+    <FrameworkPathOverride Condition="'$(TargetFramework)' == 'net20'">$(NuGetPackageRoot)microsoft.netframework.referenceassemblies.net20/1.0.0/build/.NETFramework/v2.0/</FrameworkPathOverride>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Condition="'$(TargetFramework)' == 'net20'" Include="Microsoft.NETFramework.ReferenceAssemblies.net20" Version="1.0.0" ExcludeAssets="All" PrivateAssets="All" />
+  </ItemGroup>
 </Project>
diff --git a/build.cmd b/build.cmd
index 2abaf26..c7fb096 100644
--- a/build.cmd
+++ b/build.cmd
@@ -8,7 +8,7 @@ set _root_dir=%~dp0..
 set _ae_dir=%_root_dir%\ae
 set _install_dir=%_ae_dir%\install
 set _run_dir=%_ae_dir%\run
-set _zip_file=%_root_dir%\ae.zip
+set _zip_file=%_root_dir%\AELoader.zip
 
 del /q "%_zip_file%"
 rmdir /q /s "%_ae_dir%"
diff --git a/version.hpp b/version.hpp
index 58bc30311ce46b6874d16625c123e61ecc6fd381..08eb73b8476c0132d738fab5c0285b24f2be59d9 100644
GIT binary patch
delta 18
acmX@Ze1>_#CRSqxUIwm-4`nA_`2hetE(aU{

delta 18
acmX@Ze1>_#CRQT`UIwm-4`nA_`2hetBL^D*