Updating NuGet packages

anton-bot · Aug 28, 2013 · c13001c · c13001c
1 parent 8271a2b
commit c13001c
Show file tree

Hide file tree

Showing 14 changed files with 139 additions and 64 deletions.
diff --git a/.jamignore b/.jamignore
@@ -9,4 +9,6 @@ node_modules
 doc
 examples
 src
-tests
+tests
+.nuget
+nuget
diff --git a/.npmignore b/.npmignore
@@ -1,7 +1,10 @@
 /node_modules/
 /npm-debug.log
-
-/content/
+/.nuget/
+/nuget/
+/src/
+/doc/
+/examples/
 /tests/
 /.jshintrc
 /.npmignore
diff --git a/.nuget/nuget.config b/.nuget/nuget.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <solution>
+    <add key="disableSourceControlIntegration" value="true" />
+  </solution>
+</configuration>
diff --git a/.nuget/nuget.exe b/.nuget/nuget.exe
diff --git a/.nuget/nuget.targets b/.nuget/nuget.targets
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <PropertyGroup>
+        <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
+
+        <!-- Windows specific commands -->
+        <NuGetToolsPath Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
+        <PackagesConfig Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+        <PackagesDir Condition=" '$(OS)' == 'Windows_NT'">$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
+
+        <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
+        <NuGetToolsPath Condition=" '$(OS)' != 'Windows_NT'">$(SolutionDir).nuget</NuGetToolsPath>
+        <PackagesConfig Condition=" '$(OS)' != 'Windows_NT' ">packages.config</PackagesConfig>
+        <PackagesDir Condition=" '$(OS)' != 'Windows_NT'">$(SolutionDir)packages</PackagesDir>
+
+        <!-- NuGet command -->
+        <NuGetExePath>$(NuGetToolsPath)\nuget.exe</NuGetExePath>
+        <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
+        <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
+
+        <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
+
+        <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
+        <PackageSources>""</PackageSources>
+
+        <!-- Enable the restore command to run before builds -->
+        <RestorePackages Condition="$(RestorePackages) == ''">false</RestorePackages>
+
+        <!-- Property that enables building a package from a project -->
+        <BuildPackage Condition="$(BuildPackage) == ''">false</BuildPackage>
+
+        <!-- Commands -->
+        <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source $(PackageSources) -o "$(PackagesDir)"</RestoreCommand>
+        <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(RestorePackages) == 'true'">
+            RestorePackages;
+            $(BuildDependsOn);
+        </BuildDependsOn>
+
+        <!-- Make the build depend on restore packages -->
+        <BuildDependsOn Condition="$(BuildPackage) == 'true'">
+            $(BuildDependsOn);
+            BuildPackage;
+        </BuildDependsOn>
+    </PropertyGroup>
+
+    <Target Name="CheckPrerequisites">
+        <!-- Raise an error if we're unable to locate nuget.exe  -->
+        <Error Condition="!Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
+    </Target>
+
+    <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(RestoreCommand)"
+              Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
+
+        <Exec Command="$(RestoreCommand)"
+              LogStandardErrorAsError="true"
+              Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
+    </Target>
+
+    <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
+        <Exec Command="$(BuildCommand)" 
+              Condition=" '$(OS)' != 'Windows_NT' " />
+
+        <Exec Command="$(BuildCommand)"
+              LogStandardErrorAsError="true"
+              Condition=" '$(OS)' == 'Windows_NT' " />
+    </Target>
+</Project>
diff --git a/nuget/RxJS-Aggregates/RxJS-Aggregates.nuspec b/nuget/RxJS-Aggregates/RxJS-Aggregates.nuspec
@@ -10,16 +10,16 @@
     <projectUrl>http://rx.codeplex.com</projectUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=265024</licenseUrl>
+    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
     <language>en-US</language>
     <tags>Rx RxJS Reactive Extensions Observable</tags>
     <dependencies>
       <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-      <dependency id="RxJS-Main" version="2.1.11.0< />
+      <dependency id="RxJS-Main" version="2.1.11.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="rx.aggregates.js" target="..\..\rx.aggregates.js" />
-    <file src="rx.aggregates.min.js" target="..\..\rx.aggregates.min.js" />
+    <file src="..\..\rx.aggregates.js" target="content\Scripts\rx.aggregates.js" />
+    <file src="..\..\rx.aggregates.min.js" target="content\Scripts\rx.aggregates.min.js" />
   </files>
 </package>
diff --git a/nuget/RxJS-All/RxJS-All.nuspec b/nuget/RxJS-All/RxJS-All.nuspec
@@ -4,25 +4,25 @@
     <id>RxJS-All</id>
     <title>Reactive Extensions for JavaScript - All Libraries</title>
     <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-    <version>0.9.0.0</version>
+    <version>2.1.11.0</version>
     <authors>Microsoft Corporation</authors>
     <description>Reactive Extensions for JavaScript libraries.</description>
-    <projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
+    <projectUrl>http://rx.codeplex.com</projectUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=265024</licenseUrl>
+    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
     <language>en-US</language>
     <tags>Rx RxJS Reactive Extensions Observable</tags>
     <dependencies>
       <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-      <dependency id="RxJS-Main" version="0.9.0.0" />
-      <dependency id="RxJS-Aggregates" version="0.9.0.0" />
-      <dependency id="RxJS-Binding" version="0.9.0.0" />
-      <dependency id="RxJS-Coincidence" version="0.9.0.0" />
-      <dependency id="RxJS-JoinPatterns" version="0.9.0.0" />
-      <dependency id="RxJS-Time" version="0.9.0.0" />
-      <dependency id="RxJS-Experimental" version="0.9.0.0" />
-      <dependency id="RxJS-Testing" version="0.9.0.0" />
+      <dependency id="RxJS-Main" version="2.1.11.0" />
+      <dependency id="RxJS-Aggregates" version="2.1.11.0" />
+      <dependency id="RxJS-Binding" version="2.1.11.0" />
+      <dependency id="RxJS-Coincidence" version="2.1.11.0" />
+      <dependency id="RxJS-JoinPatterns" version="2.1.11.0" />
+      <dependency id="RxJS-Time" version="2.1.11.0" />
+      <dependency id="RxJS-Experimental" version="2.1.11.0" />
+      <dependency id="RxJS-Testing" version="2.1.11.0" />
     </dependencies>
   </metadata>
 </package>
diff --git a/nuget/RxJS-Binding/RxJS-Binding.nuspec b/nuget/RxJS-Binding/RxJS-Binding.nuspec
@@ -3,22 +3,21 @@
   <metadata>
     <id>RxJS-Binding</id>
     <title>Reactive Extensions for JavaScript - Binding</title>
-    <version>0.9.0.0</version>
+    <version>2.1.11.0</version>
     <authors>Microsoft Corporation</authors>
     <description>Reactive Extensions for JavaScript library with binding operationrs.</description>
-    <projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
+    <projectUrl>http://rx.codeplex.com</projectUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=265024</licenseUrl>
+    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
     <language>en-US</language>
     <tags>Rx RxJS Reactive Extensions Observable</tags>
     <dependencies>
-      <dependency id="RxJS-Main" version="0.9.0.0" />
+      <dependency id="RxJS-Main" version="2.1.11.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="rx.binding.js" target="content\Scripts\rx.binding.js" />
-    <file src="rx.binding-vsdoc.js" target="content\Scripts\rx.binding-vsdoc.js" />
-    <file src="rx.binding.min.js" target="content\Scripts\rx.binding.min.js" />
+    <file src="..\..\rx.binding.js" target="content\Scripts\rx.binding.js" />
+    <file src="..\..\rx.binding.min.js" target="content\Scripts\rx.binding.min.js" />
   </files>
 </package>
diff --git a/nuget/RxJS-Coincidence/RxJS-Coincidence.nuspec b/nuget/RxJS-Coincidence/RxJS-Coincidence.nuspec
@@ -4,23 +4,22 @@
     <id>RxJS-Coincidence</id>
     <title>Reactive Extensions for JavaScript - Coincidence</title>
     <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-    <version>0.9.0.0</version>
+    <version>2.1.11.0</version>
     <authors>Microsoft Corporation</authors>
     <description>Reactive Extensions for JavaScript library with reactive coincidence join event processing query operations.</description>
-    <projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
+    <projectUrl>http://rx.codeplex.com</projectUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=265024</licenseUrl>
+    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
     <language>en-US</language>
     <tags>Rx RxJS Reactive Extensions Observable</tags>
     <dependencies>
       <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-      <dependency id="RxJS-Main" version="0.9.0.0" />
+      <dependency id="RxJS-Main" version="2.1.11.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="rx.coincidence.js" target="content\Scripts\rx.coincidence.js" />
-    <file src="rx.coincidence-vsdoc.js" target="content\Scripts\rx.coincidence-vsdoc.js" />
-    <file src="rx.coincidence.min.js" target="content\Scripts\rx.coincidence.min.js" />
+    <file src="..\..\rx.coincidence.js" target="content\Scripts\rx.coincidence.js" />
+    <file src="..\..\rx.coincidence.min.js" target="content\Scripts\rx.coincidence.min.js" />
   </files>
 </package>
diff --git a/nuget/RxJS-Experimental/RxJS-Experimental.nuspec b/nuget/RxJS-Experimental/RxJS-Experimental.nuspec
@@ -4,23 +4,22 @@
     <id>RxJS-Experimental</id>
     <title>Reactive Extensions for JavaScript - Experimental</title>
     <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-    <version>0.9.0.0</version>
+    <version>2.1.11.0</version>
     <authors>Microsoft Corporation</authors>
     <description>Reactive Extensions for JavaScript library with experimental operators.</description>
-    <projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
+    <projectUrl>http://rx.codeplex.com</projectUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=265024</licenseUrl>
+    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
     <language>en-US</language>
     <tags>Rx RxJS Reactive Extensions Observable</tags>
     <dependencies>
       <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-      <dependency id="RxJS-Main" version="0.9.0.0" />
+      <dependency id="RxJS-Main" version="2.1.11.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="rx.experimental.js" target="content\Scripts\rx.experimental.js" />
-    <file src="rx.experimental-vsdoc.js" target="content\Scripts\rx.experimental-vsdoc.js" />
-    <file src="rx.experimental.min.js" target="content\Scripts\rx.experimental.min.js" />
+    <file src="..\..\rx.experimental.js" target="content\Scripts\rx.experimental.js" />
+    <file src="..\..\rx.experimental.min.js" target="content\Scripts\rx.experimental.min.js" />
   </files>
 </package>
diff --git a/nuget/RxJS-JoinPatterns/RxJS-JoinPatterns.nuspec b/nuget/RxJS-JoinPatterns/RxJS-JoinPatterns.nuspec
@@ -4,23 +4,22 @@
     <id>RxJS-JoinPatterns</id>
     <title>Reactive Extensions for JavaScript - Join Patterns</title>
     <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-    <version>0.9.0.0</version>
+    <version>2.1.11.0</version>
     <authors>Microsoft Corporation</authors>
     <description>Reactive Extensions for JavaScript library with join patterns event processing query operations.</description>
-    <projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
+    <projectUrl>http://rx.codeplex.com</projectUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=265024</licenseUrl>
+    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
     <language>en-US</language>
     <tags>Rx RxJS Reactive Extensions Observable</tags>
     <dependencies>
       <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-      <dependency id="RxJS-Main" version="0.9.0.0" />
+      <dependency id="RxJS-Main" version="2.1.11.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="rx.joinpatterns.js" target="content\Scripts\rx.joinpatterns.js" />
-    <file src="rx.joinpatterns-vsdoc.js" target="content\Scripts\rx.joinpatterns-vsdoc.js" />
-    <file src="rx.joinpatterns.min.js" target="content\Scripts\rx.joinpatterns.min.js" />
+    <file src="..\..\rx.joinpatterns.js" target="content\Scripts\rx.joinpatterns.js" />
+    <file src="..\..\rx.joinpatterns.min.js" target="content\Scripts\rx.joinpatterns.min.js" />
   </files>
 </package>
diff --git a/nuget/RxJS-Main/RxJS-Main.nuspec b/nuget/RxJS-Main/RxJS-Main.nuspec
@@ -4,19 +4,18 @@
     <id>RxJS-Main</id>
     <title>Reactive Extensions for JavaScript - Main Library</title>
     <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-    <version>0.9.0.0</version>
+    <version>2.1.11.0</version>
     <authors>Microsoft Corporation</authors>
     <description>Reactive Extensions for JavaScript main library used to express complex event processing queries over observable sequences.</description>
-    <projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
+    <projectUrl>http://rx.codeplex.com</projectUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=265024</licenseUrl>
+    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
     <language>en-US</language>
     <tags>Rx RxJS Reactive Extensions Observable</tags>
   </metadata>
   <files>
-    <file src="rx.js" target="content\Scripts\rx.js" />
-    <file src="rx-vsdoc.js" target="content\Scripts\rx-vsdoc.js" />
-    <file src="rx.min.js" target="content\Scripts\rx.min.js" />
+    <file src="..\..\rx.js" target="content\Scripts\rx.js" />
+    <file src="..\..\rx.min.js" target="content\Scripts\x.min.js" />
   </files>
 </package>
diff --git a/nuget/RxJS-Testing/RxJS-Testing.nuspec b/nuget/RxJS-Testing/RxJS-Testing.nuspec
@@ -4,23 +4,22 @@
     <id>RxJS-Testing</id>
     <title>Reactive Extensions for JavaScript - Test Library</title>
     <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-    <version>0.9.0.0</version>
+    <version>2.1.11.0</version>
     <authors>Microsoft Corporation</authors>
     <description>Reactive Extensions for JavaScript test library, used to write unit tests for complex event processing queries.</description>
-    <projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
+    <projectUrl>http://rx.codeplex.com</projectUrl>
     <iconUrl>http://go.microsoft.com/fwlink/?LinkId=261274</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <licenseUrl>http://go.microsoft.com/fwlink/?LinkID=265024</licenseUrl>
+    <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
     <language>en-US</language>
     <tags>Rx RxJS Reactive Extensions Observable</tags>
     <dependencies>
       <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-      <dependency id="RxJS-Main" version="0.9.0.0" />
+      <dependency id="RxJS-Main" version="2.1.11.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="rx.testing.js" target="content\Scripts\rx.testing.js" />
-    <file src="rx.testing-vsdoc.js" target="content\Scripts\rx.testing-vsdoc.js" />
-    <file src="rx.testing.min.js" target="content\Scripts\rx.testing.min.js" />
+    <file src="..\..\rx.testing.js" target="content\Scripts\rx.testing.js" />
+    <file src="..\..\rx.testing.min.js" target="content\Scripts\rx.testing.min.js" />
   </files>
 </package>
diff --git a/nuget/RxJS-Time/RxJS-Time.nuspec b/nuget/RxJS-Time/RxJS-Time.nuspec
@@ -4,7 +4,7 @@
     <id>RxJS-Time</id>
     <title>Reactive Extensions for JavaScript - Time-Based Operations</title>
     <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-    <version>0.9.0.0</version>
+    <version>2.1.11.0</version>
     <authors>Microsoft Corporation</authors>
     <description>Reactive Extensions for JavaScript library with time-based event processing query operations.</description>
     <projectUrl>http://go.microsoft.com/fwlink/?LinkID=179929</projectUrl>
@@ -15,12 +15,11 @@
     <tags>Rx RxJS Reactive Extensions Observable</tags>
     <dependencies>
       <!-- Automatically updated by build, keeping fixed dev build number here in case of local build -->
-      <dependency id="RxJS-Main" version="0.9.0.0" />
+      <dependency id="RxJS-Main" version="2.1.11.0" />
     </dependencies>
   </metadata>
   <files>
-    <file src="rx.time.js" target="content\Scripts\rx.time.js" />
-    <file src="rx.time-vsdoc.js" target="content\Scripts\rx.time-vsdoc.js" />
-    <file src="rx.time.min.js" target="content\Scripts\rx.time.min.js" />
+    <file src="..\..\rx.time.js" target="content\Scripts\rx.time.js" />
+    <file src="..\..\rx.time.min.js" target="content\Scripts\rx.time.min.js" />
   </files>
 </package>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,6 @@ node_modules @@
     doc
     examples
     src
-    tests
+    tests
+    .nuget
+    nuget