Fix and improve nuget packaging

(1) Fix constants override that was wiping out the CLR2 symbol on 3.5 compiles
(2) Minimize artifacts included in nuget package

Author: dmiller

Clojure.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Clojure</id>
-        <version>1.5.0.0</version>
+        <version>1.5.0.1</version>
         <authors>Rich Hickey, Clojure</authors>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <licenseUrl>http://opensource.org/licenses/eclipse-1.0.php</licenseUrl>
@@ -12,19 +12,16 @@
         <tags>clojure clojureclr</tags>
     </metadata>
     <files>
-        <file src="bin\4.0\Release\ilmerge\*" target="lib\net40" />
-        <file src="bin\4.0\Release\Microsoft.Dynamic.*" target="lib\net40" />
-        <file src="bin\4.0\Release\Microsoft.Scripting.*" target="lib\net40" />
+        <file src="bin\4.0\Release\ilmerge\Clojure.dll" target="lib\net40" />
+        <file src="bin\4.0\Release\Microsoft.Dynamic.dll" target="lib\net40" />
+        <file src="bin\4.0\Release\Microsoft.Scripting.dll" target="lib\net40" />
         <file src="bin\4.0\Release\Clojure.Main.exe" target="tools\net40" />
-        <file src="bin\4.0\Release\Clojure.Main.pdb" target="tools\net40" />
         <file src="bin\4.0\Release\Clojure.Compile.exe" target="tools\net40" />
-        <file src="bin\4.0\Release\Clojure.Compile.pdb" target="tools\net40" />
-        <file src="bin\3.5\Release\ilmerge\*" target="lib\net35" />
-        <file src="bin\3.5\Release\Microsoft.Dynamic.*" target="lib\net35" />
-        <file src="bin\3.5\Release\Microsoft.Scripting.*" target="lib\net35" />		
+        <file src="bin\3.5\Release\ilmerge\Clojure.dll" target="lib\net35" />
+        <file src="bin\3.5\Release\Microsoft.Dynamic.dll" target="lib\net35" />
+        <file src="bin\3.5\Release\Microsoft.Scripting.dll" target="lib\net35" />	
+        <file src="bin\3.5\Release\Microsoft.Scripting.Core.dll" target="lib\net35" />
         <file src="bin\3.5\Release\Clojure.Main.exe" target="tools\net35" />
-        <file src="bin\3.5\Release\Clojure.Main.pdb" target="tools\net35" />
         <file src="bin\3.5\Release\Clojure.Compile.exe" target="tools\net35" />
-        <file src="bin\3.5\Release\Clojure.Compile.pdb" target="tools\net35" />
 	</files>
 </package>

Clojure/Clojure.Compile/Clojure.Compile.csproj

@@ -135,4 +135,7 @@
     <PostBuildEvent Condition=" '$(Runtime)' == 'Mono' ">mono "$(TargetPath)" clojure.core clojure.core.protocols clojure.main clojure.set clojure.zip  clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect</PostBuildEvent>
     <PostBuildEvent Condition=" '$(Runtime)' == '.Net' ">"$(TargetPath)" clojure.core clojure.core.protocols clojure.main clojure.set clojure.zip  clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect</PostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>"$(TargetPath)" clojure.core clojure.core.protocols clojure.main clojure.set clojure.zip  clojure.walk clojure.stacktrace clojure.template clojure.test clojure.test.tap clojure.test.junit clojure.pprint clojure.clr.io clojure.repl clojure.clr.shell clojure.string clojure.data clojure.reflect clojure.edn</PostBuildEvent>
+  </PropertyGroup>
 </Project>

Clojure/Clojure/Clojure.csproj

@@ -40,7 +40,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\3.5\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CLR2</DefineConstants>
+    <DefineConstants>$(PlatformSym);TRACE;DEBUG;CLR2</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -50,7 +50,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\3.5\Release\</OutputPath>
-    <DefineConstants>TRACE;CLR2</DefineConstants>
+    <DefineConstants>$(PlatformSym);TRACE;CLR2</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -61,7 +61,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\..\bin\4.0\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
+    <DefineConstants>$(PlatformSym);TRACE;DEBUG;CODE_ANALYSIS</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@@ -71,7 +71,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\4.0\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>$(PlatformSym);TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>

Clojure/build.proj

@@ -6,8 +6,12 @@
     <cljc>Clojure.Compile.exe</cljc>
     <clji>Clojure.Main.exe</clji>
     <Runtime Condition=" '$(Runtime)' == '' ">.Net</Runtime>
-    <DefineConstants Condition=" '$(Runtime)' == 'Mono' ">MONO</DefineConstants>
-    <DefineConstants Condition=" '$(Runtime)' == '.Net' ">DOTNET</DefineConstants>    
+    <!-- 
+	<DefineConstants Condition=" '$(Runtime)' == 'Mono' ">MONO</DefineConstants>
+    <DefineConstants Condition=" '$(Runtime)' == '.Net' ">DOTNET</DefineConstants> 
+	-->	
+	<PlatformSym Condition=" '$(Runtime)' == 'Mono' ">MONO</PlatformSym>
+	<PlatformSym Condition=" '$(Runtime)' == '.Net' ">DOTNET</PlatformSym>
   </PropertyGroup>
 
   <!--Is there a way to avoid this duplication? This is also encoded in the project files, although relative to a different path -->
@@ -26,7 +30,7 @@
 
   <Target Name="Build">
     <MSBuild Projects="ClojureCLR.sln"
-             Properties="Runtime=$(Runtime);DefineConstants=$(DefineConstants)"/>
+             Properties="Runtime=$(Runtime)"/>
   </Target>
 
   <Target Name="CompileTest" DependsOnTargets="Build">