Internalize JSON.net.

ActiveCampaign · Jan 22, 2015 · 8bfcd9f · 8bfcd9f
1 parent 2edc7ed
commit 8bfcd9f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,4 +41,5 @@ src/Postmark.PCL.Tests/App.config
 sn-build
 *.il
 *.res
-src/packages/
+src/packages/
+Postmark.dll
diff --git a/pack-nuget.bat b/pack-nuget.bat
@@ -6,7 +6,9 @@ mkdir PCL
 mkdir Convenience
 cd ..
 
-build-bin\ILRepack.exe /keyfile:src\Postmark.PCL\key.snk src\Postmark.PCL\bin\Release\Postmark.dll src\Postmark.PCL\bin\Release\Newtonsoft.Json.dll /out:sn-build\PCL\Postmark.dll
-build-bin\ILRepack.exe /keyfile:src\Postmark.PCL\key.snk src\Postmark.Convenience\bin\Release\Postmark.dll src\Postmark.Convenience\bin\Release\Newtonsoft.Json.dll src\Postmark.Convenience\bin\Release\Postmark.dll src\Postmark.Convenience\bin\Release\Postmark.Convenience.dll /out:sn-build\Convenience\Postmark.dll
+build-bin\ILRepack.exe /internalize /keyfile:src\Postmark.PCL\key.snk src\Postmark.PCL\bin\Release\Postmark.dll src\Postmark.PCL\bin\Release\Newtonsoft.Json.dll /out:sn-build\PCL\Postmark.dll
+
+build-bin\ILRepack.exe /internalize src\Postmark.Convenience\bin\Release\Postmark.dll src\Postmark.Convenience\bin\Release\Newtonsoft.Json.dll /out:Postmark.dll
+build-bin\ILRepack.exe /keyfile:src\Postmark.PCL\key.snk Postmark.dll src\Postmark.Convenience\bin\Release\Postmark.Convenience.dll /out:sn-build\Convenience\Postmark.dll
 
 NuGet.exe pack ./postmark-strong.nuspec
diff --git a/src/Postmark.PCL.Tests/Postmark.PCL.Tests.csproj b/src/Postmark.PCL.Tests/Postmark.PCL.Tests.csproj
@@ -34,7 +34,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/src/Postmark.PCL.Tests/packages.config b/src/Postmark.PCL.Tests/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.3" targetFramework="net45" />
+  <package id="NUnit" version="2.6.0.12054" targetFramework="net45" />
 </packages>