Merge remote-tracking branch 'jsakamoto/split-dlrnupkg' into ipy-2.7-…

…maint

CurrentVersion.props

@@ -10,4 +10,14 @@
 
     <AssemblyRevision>0</AssemblyRevision>
   </PropertyGroup>
+  <PropertyGroup>
+    <DlrMajorVersion>1</DlrMajorVersion>
+    <DlrMinorVersion>1</DlrMinorVersion>
+    <DlrMicroVersion>0</DlrMicroVersion>
+    <!-- Allowed: alpha,beta,candidate,final -->
+    <DlrReleaseLevel>final</DlrReleaseLevel>
+    <DlrReleaseSerial>0</DlrReleaseSerial>
+
+    <DlrAssemblyRevision>21</DlrAssemblyRevision>
+  </PropertyGroup>
 </Project>

Languages/IronPython/IronPython.nuspec

@@ -13,10 +13,13 @@
     <summary>IronPython is an open-source implementation of the Python programming language which is tightly integrated with the .NET Framework.</summary>
     <language>en-US</language>
     <tags>ironpython python dynamic dlr</tags>
+    <dependencies>
+      <dependency id="DynamicLanguageRuntime" version="1.1.0" />
+    </dependencies>
   </metadata>
   <files>
     <file src="ipy*.exe" target="tools" />
     <file src="ipy*.exe.config" target="tools" />
-    <file src="Platforms\**\*.*" target="lib" />
+    <file src="Platforms\**\*.*" target="lib" exclude="**\Microsoft.*.*" />
   </files>
 </package>

Runtime/DynamicLanguageRuntime.nuspec

@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>DynamicLanguageRuntime</id>
+    <title>DynamicLanguageRuntime</title>
+    <!-- version number defined by Dlr*Version property in ~/CurrentVersion.props. -->
+    <version>0.0.0</version>
+    <authors>DLR Contributors,Microsoft</authors>
+    <owners>DLR Community</owners>
+    <projectUrl>http://dlr.codeplex.com</projectUrl>
+    <licenseUrl>http://dlr.codeplex.com/license</licenseUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <summary>The Dynamic Language Runtime enables language developers to more easily create dynamic languages for the .NET platform.</summary>
+    <description>The Dynamic Language Runtime enables language developers to more easily create dynamic languages for the .NET platform.</description>
+    <language>en-US</language>
+    <tags>dynamic dlr</tags>
+  </metadata>
+  <files>
+    <file src="Platforms\**\Microsoft.*.*" target="lib" />
+  </files>
+</package>

Solutions/Build.IronPython.proj

@@ -190,7 +190,12 @@
         <NuGetVersion Condition="'$(ReleaseLevel)' == 'final' and '$(ReleaseSerial)' == '0'">$(MajorVersion).$(MinorVersion).$(MicroVersion)</NuGetVersion>
         <NuGetVersion Condition="'$(ReleaseLevel)' != 'final' or '$(ReleaseSerial)' != '0'">$(MajorVersion).$(MinorVersion).$(MicroVersion)-$(ReleaseLevel)$(ReleaseSerial)</NuGetVersion>
     </PropertyGroup>
+    <PropertyGroup>
+      <DlrNuGetVersion Condition="'$(ReleaseLevel)' == 'final' and '$(ReleaseSerial)' == '0'">$(DlrMajorVersion).$(DlrMinorVersion).$(DlrMicroVersion)</DlrNuGetVersion>
+      <DlrNuGetVersion Condition="'$(ReleaseLevel)' != 'final' or '$(ReleaseSerial)' != '0'">$(DlrMajorVersion).$(DlrMinorVersion).$(DlrMicroVersion)-$(DlrReleaseLevel)$(DlrReleaseSerial)</DlrNuGetVersion>
+    </PropertyGroup>
     <MakeDir Directories="$(PackageDir)" Condition="!Exists('$(PackageDir)')" />
+    <Exec Command="$(UtilDir)\Misc\NuGet.exe pack -Version $(DlrNuGetVersion) &quot;$(BaseDir)\Runtime\DynamicLanguageRuntime.nuspec&quot; -BasePath &quot;$(StageDir)&quot; -OutputDirectory &quot;$(PackageDir)&quot;" />
     <Exec Command="$(UtilDir)\Misc\NuGet.exe pack -Version $(NuGetVersion) &quot;$(BaseDir)\Languages\IronPython\IronPython.nuspec&quot; -BasePath &quot;$(StageDir)&quot; -OutputDirectory &quot;$(PackageDir)&quot;" />
     <Exec Command="$(UtilDir)\Misc\NuGet.exe pack -Version $(NuGetVersion) &quot;$(BaseDir)\Languages\IronPython\IronPython.StdLib.nuspec&quot; -BasePath &quot;$(StageDir)&quot; -OutputDirectory &quot;$(PackageDir)&quot;" />
   </Target>