diff --git a/Microsoft.Research/ImportedILMerge/ILMerge.exe b/Microsoft.Research/ImportedILMerge/ILMerge.exe deleted file mode 100644 index c2922d4d..00000000 Binary files a/Microsoft.Research/ImportedILMerge/ILMerge.exe and /dev/null differ diff --git a/Microsoft.Research/ManagedContract.Setup/buildMSI10.xml b/Microsoft.Research/ManagedContract.Setup/buildMSI10.xml index 6af80ea4..81b54df0 100644 --- a/Microsoft.Research/ManagedContract.Setup/buildMSI10.xml +++ b/Microsoft.Research/ManagedContract.Setup/buildMSI10.xml @@ -32,6 +32,7 @@ + + DependsOnTargets="PrepareMerges;ExecuteMerges"/> + + + + + + + + + + + + + $(SolutionDir)packages\ILMerge.@(ILMergeVersion)\tools\ilmerge.exe + $(ILMergeExePath) "/targetplatform:v4,$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0" + $(ILMergeExePath) "/targetplatform:v4,$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5" + + + + + + ..\..\Foxtrot\Driver\$(BinDir) CCRefGenAttributes\$(BinDir) @@ -391,8 +417,6 @@ $(CCI2Dir)\ccdoc.exe.config $(Clousot1Dir)\clousot.exe.config - ..\ImportedILMerge\ilmerge.exe "/targetplatform:v4,$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0" - ..\ImportedILMerge\ilmerge.exe "/targetplatform:v4,$(ProgramFiles)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5" diff --git a/packages.config b/packages.config new file mode 100644 index 00000000..38db3184 --- /dev/null +++ b/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file