replaced dependency on editbin.exe and VS2015-specific path with a La…

…rgeAddressAware NuGet package (goldshtn#72)
atsvetkov · Nov 11, 2017 · 71f4d6f · 71f4d6f
1 parent e71adc7
commit 71f4d6f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/msos/msos.csproj b/msos/msos.csproj
@@ -264,6 +264,7 @@
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
     <Error Condition="!Exists('..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets'))" />
     <Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\LargeAddressAware.1.0.1\build\LargeAddressAware.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LargeAddressAware.1.0.1\build\LargeAddressAware.targets'))" />
   </Target>
   <UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
     <ParameterGroup>
@@ -302,13 +303,16 @@ foreach (var item in filesToCleanup)
     <CosturaCleanup Config="FodyWeavers.xml" Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" Condition="'$(Configuration)' != 'Release-NoCostura'" />
   </Target>
   <PropertyGroup>
-    <PostBuildEvent>call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\vsvars32.bat"
-editbin /largeaddressaware "$(TargetPath)"</PostBuildEvent>
-	<PostBuildEvent Condition="'$(Platform)' == 'x86' And '$(Configuration)' == 'Release-NoCostura'">xcopy /Y /F "$(ProjectDir)"costura32\*.dll .</PostBuildEvent>
-	<PostBuildEvent Condition="'$(Platform)' == 'x64' And '$(Configuration)' == 'Release-NoCostura'">xcopy /Y /F "$(ProjectDir)"costura64\*.dll .</PostBuildEvent>
+    <PostBuildEvent Condition="'$(Platform)' == 'x86' And '$(Configuration)' == 'Release-NoCostura'">xcopy /Y /F "$(ProjectDir)"costura32\*.dll .</PostBuildEvent>
+    <PostBuildEvent Condition="'$(Platform)' == 'x64' And '$(Configuration)' == 'Release-NoCostura'">xcopy /Y /F "$(ProjectDir)"costura64\*.dll .</PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)' == 'x86'">
+    <LargeAddressAware>true</LargeAddressAware>
   </PropertyGroup>
   <Import Project="..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets" Condition="Exists('..\packages\Costura.Fody.2.0.0-beta0018\build\Costura.Fody.targets') And '$(Configuration)' != 'Release-NoCostura'" />
   <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets') And '$(Configuration)' != 'Release-NoCostura'" />
+  <Import Project="..\packages\LargeAddressAware.1.0.1\build\LargeAddressAware.targets" Condition="Exists('..\packages\LargeAddressAware.1.0.1\build\LargeAddressAware.targets')" />
+
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

diff --git a/msos/packages.config b/msos/packages.config
@@ -4,6 +4,7 @@
   <package id="Fody" version="1.29.4" targetFramework="net46" developmentDependency="true" />
   <package id="ICSharpCode.Decompiler" version="2.3.1" targetFramework="net45" />
   <package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net45" />
+  <package id="LargeAddressAware" version="1.0.1" targetFramework="net46" />
   <package id="Microsoft.Diagnostics.Runtime" version="0.8.31" targetFramework="net45" />
   <package id="Mono.Cecil" version="0.9.5.4" targetFramework="net45" />
   <package id="NetSerializer" version="3.0.0.0" targetFramework="net45" />