From 2c6b9c0d49708bdba824d1557b80f006e7aa29c4 Mon Sep 17 00:00:00 2001 From: AntonioDrusin Date: Mon, 20 May 2013 13:40:49 -0400 Subject: [PATCH] Fixed ilmerge using the wrong reference assemblies if you have .NET 4.5 installed. --- build/Modules/ILMerge.psm1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/Modules/ILMerge.psm1 b/build/Modules/ILMerge.psm1 index 10509c9..383cdc4 100644 --- a/build/Modules/ILMerge.psm1 +++ b/build/Modules/ILMerge.psm1 @@ -1,13 +1,14 @@ $script:ilMergeModule = @{} $script:ilMergeModule.ilMergePath = $null +<# see this article: http://www.mattwrock.com/post/2012/02/29/What-you-should-know-about-running-ILMerge-on-Net-45-Beta-assemblies-targeting-Net-40.aspx #> function Merge-Assemblies { Param( $files, $outputFile, $exclude, $keyfile, - $targetPlatform="v4,C:/WINDOWS/Microsoft.NET/Framework/v4.0.30319" + $targetPlatform="v4,C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0" ) $exclude | out-file ".\exclude.txt"