Browse Source

Merge commit "update test projects in Rx\Test"

Donna Malayeri 12 years ago
parent
commit
8c8a32aa68
26 changed files with 223 additions and 525 deletions
  1. 3 69
      .gitignore
  2. 17 13
      Rx.NET/Test/Rx/ConsoleApp45_NoPlatformServices/ConsoleApp45_NoPlatformServices.csproj
  3. 1 1
      Rx.NET/Test/Rx/ConsoleApp45_NoPlatformServices/Program.cs
  4. 0 16
      Rx.NET/Test/Rx/ConsoleApp45_NuGet/App.config
  5. 21 15
      Rx.NET/Test/Rx/ConsoleApp45_NuGet/ConsoleApp45_NuGet.csproj
  6. 1 1
      Rx.NET/Test/Rx/ConsoleApp45_NuGet/Program.cs
  7. 7 7
      Rx.NET/Test/Rx/ConsoleApp45_NuGet/packages.config
  8. 9 9
      Rx.NET/Test/Rx/PortableLibraryProfile78_NuGet/PortableLibraryProfile78_NuGet.csproj
  9. 5 5
      Rx.NET/Test/Rx/PortableLibraryProfile78_NuGet/packages.config
  10. 0 271
      Rx.NET/Test/Rx/Rx.sln
  11. 1 1
      Rx.NET/Test/Rx/WinFormsApp45_NuGet/Form1.cs
  12. 18 13
      Rx.NET/Test/Rx/WinFormsApp45_NuGet/WinFormsApp45_NuGet.csproj
  13. 6 6
      Rx.NET/Test/Rx/WinFormsApp45_NuGet/packages.config
  14. 1 1
      Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/MainPage.xaml.cs
  15. 7 22
      Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/Package.appxmanifest
  16. 32 18
      Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/WindowsStoreApp8_NuGet.csproj
  17. BIN
      Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/WindowsStoreApp8_NuGet_TemporaryKey.pfx
  18. 8 8
      Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/packages.config
  19. 1 1
      Rx.NET/Test/Rx/WpfApp45_NuGet/MainWindow.xaml.cs
  20. 21 18
      Rx.NET/Test/Rx/WpfApp45_NuGet/WpfApp45_NuGet.csproj
  21. 7 7
      Rx.NET/Test/Rx/WpfApp45_NuGet/packages.config
  22. 1 1
      Rx.NET/Test/Rx/WpfXbapApp45_NuGet/Page1.xaml.cs
  23. 49 15
      Rx.NET/Test/Rx/WpfXbapApp45_NuGet/WpfXbapApp45_NuGet.csproj
  24. 7 6
      Rx.NET/Test/Rx/WpfXbapApp45_NuGet/packages.config
  25. 0 1
      Rx.NET/Test/Rx/packages/repositories.config
  26. BIN
      Rx/NET/Test/Rx/WindowsStoreApp8_NuGet/appkey.snk

+ 3 - 69
.gitignore

@@ -1,33 +1,4 @@
-Ix.NET/Layout
-Rx.NET/Layout
-
-
-*.pydevproject
-.project
-.metadata
-bin/
-tmp/
-*.tmp
-*.bak
-*.swp
-*~.nib
-local.properties
-.classpath
-.settings/
-.loadpath
-
-# External tool builders
-.externalToolBuilders/
-
-# Locally stored "Eclipse launch configurations"
-*.launch
-
-# CDT-specific
-.cproject
-
-# PDT-specific
-.buildpath
-
+Rx/Layout/*
 
 #################
 ## Visual Studio
@@ -64,7 +35,7 @@ local.properties
 *.dotCover
 
 ## TODO: If you have NuGet Package Restore enabled, uncomment this
-#packages/
+# packages/
 
 # Visual C++ cache files
 ipch/
@@ -114,8 +85,6 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
-
-
 ############
 ## Windows
 ############
@@ -125,39 +94,4 @@ Thumbs.db
 
 # Folder config file
 Desktop.ini
-
-
-#############
-## Python
-#############
-
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
-
-# Mac crap
-.DS_Store
+Rx/NET/Test/Rx/packages/

+ 17 - 13
Rx.NET/Test/Rx/ConsoleApp45_NoPlatformServices/ConsoleApp45_NoPlatformServices.csproj

@@ -38,25 +38,29 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Reactive.Core, Version=2.0.20814.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
+    <Reference Include="System.Reactive.Core">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft SDKs\Reactive Extensions\v2.0\Binaries\.NETFramework\v4.5\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\..\..\Source\System.Reactive.Core\bin\Release45\System.Reactive.Core.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.0.20814.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
+    <Reference Include="System.Reactive.Interfaces">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft SDKs\Reactive Extensions\v2.0\Binaries\.NETFramework\v4.5\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\..\..\Source\System.Reactive.Interfaces\bin\Release45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.0.20814.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
+    <Reference Include="System.Reactive.Linq">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft SDKs\Reactive Extensions\v2.0\Binaries\.NETFramework\v4.5\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\..\..\Source\System.Reactive.Linq\bin\Release45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Providers, Version=2.0.20814.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
+    <Reference Include="System.Reactive.PlatformServices">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft SDKs\Reactive Extensions\v2.0\Binaries\.NETFramework\v4.5\System.Reactive.Providers.dll</HintPath>
+      <HintPath>..\..\..\Source\System.Reactive.PlatformServices\bin\Release45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Runtime.Remoting, Version=2.0.20814.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
+    <Reference Include="System.Reactive.Providers">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Microsoft SDKs\Reactive Extensions\v2.0\Binaries\.NETFramework\v4.5\System.Reactive.Runtime.Remoting.dll</HintPath>
+      <HintPath>..\..\..\Source\System.Reactive.Providers\bin\Release45\System.Reactive.Providers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Runtime.Remoting">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\Source\System.Reactive.Runtime.Remoting\bin\Release45\System.Reactive.Runtime.Remoting.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -72,9 +76,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PortableLibraryProfile7\PortableLibraryProfile78.csproj">
-      <Project>{d1a0ccfc-74ab-411c-b031-8cae34d128ae}</Project>
-      <Name>PortableLibraryProfile78</Name>
+    <ProjectReference Include="..\PortableLibraryProfile78_NuGet\PortableLibraryProfile78_NuGet.csproj">
+      <Project>{a8eff824-9d19-4a20-a59c-64846b9b9346}</Project>
+      <Name>PortableLibraryProfile78_NuGet</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+ 1 - 1
Rx.NET/Test/Rx/ConsoleApp45_NoPlatformServices/Program.cs

@@ -7,7 +7,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using PortableLibraryProfile7;
+using PortableLibraryProfile78_NuGet;
 
 namespace ConsoleApp45_NoPlatformServices
 {

+ 0 - 16
Rx.NET/Test/Rx/ConsoleApp45_NuGet/App.config

@@ -3,20 +3,4 @@
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Interfaces" publicKeyToken="f300afd708cefcd3" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.20823.0" newVersion="2.0.20823.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Core" publicKeyToken="f300afd708cefcd3" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.20823.0" newVersion="2.0.20823.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reactive.Linq" publicKeyToken="f300afd708cefcd3" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.20823.0" newVersion="2.0.20823.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

+ 21 - 15
Rx.NET/Test/Rx/ConsoleApp45_NuGet/ConsoleApp45_NuGet.csproj

@@ -38,23 +38,29 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.0.21030\lib\Net45\System.Reactive.Core.dll</HintPath>
+    <Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.0.21030\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
+    <Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.0.21030\lib\Net45\System.Reactive.Linq.dll</HintPath>
+    <Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.0.21030\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
+    <Reference Include="System.Reactive.PlatformServices, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-PlatformServices.2.1.30214.0\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Providers, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Providers.2.0.21030\lib\Net45\System.Reactive.Providers.dll</HintPath>
+    <Reference Include="System.Reactive.Providers, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Providers.2.1.30214.0\lib\Net45\System.Reactive.Providers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Runtime.Remoting, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Remoting.2.0.21030\lib\Net45\System.Reactive.Runtime.Remoting.dll</HintPath>
+    <Reference Include="System.Reactive.Runtime.Remoting, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Remoting.2.1.30214.0\lib\Net45\System.Reactive.Runtime.Remoting.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -71,9 +77,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PortableLibraryProfile7\PortableLibraryProfile78.csproj">
-      <Project>{d1a0ccfc-74ab-411c-b031-8cae34d128ae}</Project>
-      <Name>PortableLibraryProfile78</Name>
+    <ProjectReference Include="..\PortableLibraryProfile78_NuGet\PortableLibraryProfile78_NuGet.csproj">
+      <Project>{a8eff824-9d19-4a20-a59c-64846b9b9346}</Project>
+      <Name>PortableLibraryProfile78_NuGet</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+ 1 - 1
Rx.NET/Test/Rx/ConsoleApp45_NuGet/Program.cs

@@ -7,7 +7,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
-using PortableLibraryProfile7;
+using PortableLibraryProfile78_NuGet;
 
 namespace ConsoleApp45_NuGet
 {

+ 7 - 7
Rx.NET/Test/Rx/ConsoleApp45_NuGet/packages.config

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Main" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-PlatformServices" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Providers" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Remoting" version="2.0.21030" targetFramework="net45" />
+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Providers" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Remoting" version="2.1.30214.0" targetFramework="net45" />
 </packages>

+ 9 - 9
Rx.NET/Test/Rx/PortableLibraryProfile78_NuGet/PortableLibraryProfile78_NuGet.csproj

@@ -40,23 +40,23 @@
     <Compile Include="MyExtensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Readme.txt" />
+  </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Reactive.Core">
-      <HintPath>..\packages\Rx-Core.2.0.21030\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Core.dll</HintPath>
+      <HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Interfaces">
-      <HintPath>..\packages\Rx-Interfaces.2.0.21030\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Interfaces.dll</HintPath>
+      <HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="System.Reactive.Linq">
-      <HintPath>..\packages\Rx-Linq.2.0.21030\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Linq.dll</HintPath>
+      <HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Portable-Net45+WinRT45+WP8\System.Reactive.Linq.dll</HintPath>
     </Reference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Readme.txt" />
-  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

+ 5 - 5
Rx.NET/Test/Rx/PortableLibraryProfile78_NuGet/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.0.21030" targetFramework="portable-win+net45+wp80" />
-  <package id="Rx-Interfaces" version="2.0.21030" targetFramework="portable-win+net45+wp80" />
-  <package id="Rx-Linq" version="2.0.21030" targetFramework="portable-win+net45+wp80" />
-  <package id="Rx-Main" version="2.0.21030" targetFramework="portable-win+net45+wp80" />
-  <package id="Rx-PlatformServices" version="2.0.21030" targetFramework="portable-win+net45+wp80" />
+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="portable-win+net45+wp80" />
+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="portable-win+net45+wp80" />
+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="portable-win+net45+wp80" />
+  <package id="Rx-Main" version="2.1.30214.0" targetFramework="portable-win+net45+wp80" />
+  <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="portable-win+net45+wp80" />
 </packages>

+ 0 - 271
Rx.NET/Test/Rx/Rx.sln

@@ -1,30 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2012
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp45", "ConsoleApp45\ConsoleApp45.csproj", "{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortableLibraryProfile78", "PortableLibraryProfile7\PortableLibraryProfile78.csproj", "{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp45_NoPlatformServices", "ConsoleApp45_NoPlatformServices\ConsoleApp45_NoPlatformServices.csproj", "{EFB25023-A3B1-49AE-97ED-381C3EB1C7DE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp45", "WpfApp45\WpfApp45.csproj", "{BC782FCE-D176-417B-B4CE-1DA8391BDD14}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsApp45", "WinFormsApp45\WinFormsApp45.csproj", "{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfXbapApp45", "WpfXbapApp45\WpfXbapApp45.csproj", "{82B61A8E-30F3-4AF5-89F6-16FF74002A27}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SilverlightApp5", "SilverlightApp5\SilverlightApp5.csproj", "{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SilverlightApp5_NoPlatformServices", "SilverlightApp5_NoPlatformServices\SilverlightApp5_NoPlatformServices.csproj", "{A5F7FB02-2C13-4136-802A-D437B2CC74D9}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPhoneApp7", "WindowsPhoneApp7\WindowsPhoneApp7.csproj", "{FD823BD9-F491-47B5-BAFB-487F70C76CEB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPhoneApp7_NoPlatformServices", "WindowsPhoneApp7_NoPlatformServices\WindowsPhoneApp7_NoPlatformServices.csproj", "{6C94F10E-615F-4C3F-AE97-F4256871512D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPhoneAgent7", "WindowsPhoneAgent7\WindowsPhoneAgent7.csproj", "{2EC6C827-1C79-418E-AFAD-F19B04595132}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsStoreApp8", "WindowsStoreApp8\WindowsStoreApp8.csproj", "{3C5D57EF-E97C-460C-83B3-AE907343212C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp45_NuGet", "ConsoleApp45_NuGet\ConsoleApp45_NuGet.csproj", "{D29AD031-E726-4EDF-8AA8-8DD8817EC30F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormsApp45_NuGet", "WinFormsApp45_NuGet\WinFormsApp45_NuGet.csproj", "{F0830B04-35BA-4159-B7A0-85D038875802}"
@@ -33,86 +11,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfApp45_NuGet", "WpfApp45_
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfXbapApp45_NuGet", "WpfXbapApp45_NuGet\WpfXbapApp45_NuGet.csproj", "{DD45DAA1-64CB-47A7-AE25-2382873BFD2F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPhoneApp7_NuGet", "WindowsPhoneApp7_NuGet\WindowsPhoneApp7_NuGet.csproj", "{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsStoreApp8_NuGet", "WindowsStoreApp8_NuGet\WindowsStoreApp8_NuGet.csproj", "{5E52DD4D-85C0-41A7-BC2C-B8FF2838DEDE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPhoneApp8", "WindowsPhoneApp8\WindowsPhoneApp8.csproj", "{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsPhoneAgent8", "WindowsPhoneAgent8\WindowsPhoneAgent8.csproj", "{851CE25F-2123-4136-9C92-F6176AE8BB73}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PortableLibraryProfile78_NuGet", "PortableLibraryProfile78_NuGet\PortableLibraryProfile78_NuGet.csproj", "{A8EFF824-9D19-4A20-A59C-64846B9B9346}"
 EndProject
 Global
-	GlobalSection(TeamFoundationVersionControl) = preSolution
-		SccNumberOfProjects = 22
-		SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
-		SccTeamFoundationServer = http://sqlbuvsts01:8080/main
-		SccLocalPath0 = .
-		SccProjectUniqueName1 = ConsoleApp45\\ConsoleApp45.csproj
-		SccProjectName1 = ConsoleApp45
-		SccLocalPath1 = ConsoleApp45
-		SccProjectUniqueName2 = ConsoleApp45_NoPlatformServices\\ConsoleApp45_NoPlatformServices.csproj
-		SccProjectName2 = ConsoleApp45_NoPlatformServices
-		SccLocalPath2 = ConsoleApp45_NoPlatformServices
-		SccProjectUniqueName3 = WpfApp45\\WpfApp45.csproj
-		SccProjectName3 = WpfApp45
-		SccLocalPath3 = WpfApp45
-		SccProjectUniqueName4 = WinFormsApp45\\WinFormsApp45.csproj
-		SccProjectName4 = WinFormsApp45
-		SccLocalPath4 = WinFormsApp45
-		SccProjectUniqueName5 = WpfXbapApp45\\WpfXbapApp45.csproj
-		SccProjectName5 = WpfXbapApp45
-		SccLocalPath5 = WpfXbapApp45
-		SccProjectUniqueName6 = SilverlightApp5\\SilverlightApp5.csproj
-		SccProjectName6 = SilverlightApp5
-		SccLocalPath6 = SilverlightApp5
-		SccProjectUniqueName7 = SilverlightApp5_NoPlatformServices\\SilverlightApp5_NoPlatformServices.csproj
-		SccProjectName7 = SilverlightApp5_NoPlatformServices
-		SccLocalPath7 = SilverlightApp5_NoPlatformServices
-		SccProjectUniqueName8 = WindowsPhoneApp7\\WindowsPhoneApp7.csproj
-		SccProjectName8 = WindowsPhoneApp7
-		SccLocalPath8 = WindowsPhoneApp7
-		SccProjectUniqueName9 = WindowsPhoneApp7_NoPlatformServices\\WindowsPhoneApp7_NoPlatformServices.csproj
-		SccProjectName9 = WindowsPhoneApp7_NoPlatformServices
-		SccLocalPath9 = WindowsPhoneApp7_NoPlatformServices
-		SccProjectUniqueName10 = WindowsPhoneAgent7\\WindowsPhoneAgent7.csproj
-		SccProjectName10 = WindowsPhoneAgent7
-		SccLocalPath10 = WindowsPhoneAgent7
-		SccProjectUniqueName11 = WindowsStoreApp8\\WindowsStoreApp8.csproj
-		SccProjectName11 = WindowsStoreApp8
-		SccLocalPath11 = WindowsStoreApp8
-		SccProjectUniqueName12 = ConsoleApp45_NuGet\\ConsoleApp45_NuGet.csproj
-		SccProjectName12 = ConsoleApp45_NuGet
-		SccLocalPath12 = ConsoleApp45_NuGet
-		SccProjectUniqueName13 = WinFormsApp45_NuGet\\WinFormsApp45_NuGet.csproj
-		SccProjectName13 = WinFormsApp45_NuGet
-		SccLocalPath13 = WinFormsApp45_NuGet
-		SccProjectUniqueName14 = WpfApp45_NuGet\\WpfApp45_NuGet.csproj
-		SccProjectName14 = WpfApp45_NuGet
-		SccLocalPath14 = WpfApp45_NuGet
-		SccProjectUniqueName15 = WpfXbapApp45_NuGet\\WpfXbapApp45_NuGet.csproj
-		SccProjectName15 = WpfXbapApp45_NuGet
-		SccLocalPath15 = WpfXbapApp45_NuGet
-		SccProjectUniqueName16 = WindowsPhoneApp7_NuGet\\WindowsPhoneApp7_NuGet.csproj
-		SccProjectName16 = WindowsPhoneApp7_NuGet
-		SccLocalPath16 = WindowsPhoneApp7_NuGet
-		SccProjectUniqueName17 = WindowsStoreApp8_NuGet\\WindowsStoreApp8_NuGet.csproj
-		SccProjectName17 = WindowsStoreApp8_NuGet
-		SccLocalPath17 = WindowsStoreApp8_NuGet
-		SccProjectUniqueName18 = PortableLibraryProfile7\\PortableLibraryProfile78.csproj
-		SccProjectName18 = PortableLibraryProfile7
-		SccLocalPath18 = PortableLibraryProfile7
-		SccProjectUniqueName19 = WindowsPhoneApp8\\WindowsPhoneApp8.csproj
-		SccProjectName19 = WindowsPhoneApp8
-		SccLocalPath19 = WindowsPhoneApp8
-		SccProjectUniqueName20 = WindowsPhoneAgent8\\WindowsPhoneAgent8.csproj
-		SccProjectName20 = WindowsPhoneAgent8
-		SccLocalPath20 = WindowsPhoneAgent8
-		SccProjectUniqueName21 = PortableLibraryProfile78_NuGet\\PortableLibraryProfile78_NuGet.csproj
-		SccProjectName21 = PortableLibraryProfile78_NuGet
-		SccLocalPath21 = PortableLibraryProfile78_NuGet
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
@@ -124,26 +27,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Release|ARM.ActiveCfg = Release|Any CPU
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Release|x64.ActiveCfg = Release|Any CPU
-		{B6121879-D99F-4F3E-BB7E-6A8FD21C8D23}.Release|x86.ActiveCfg = Release|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Release|ARM.ActiveCfg = Release|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Release|x64.ActiveCfg = Release|Any CPU
-		{D1A0CCFC-74AB-411C-B031-8CAE34D128AE}.Release|x86.ActiveCfg = Release|Any CPU
 		{EFB25023-A3B1-49AE-97ED-381C3EB1C7DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EFB25023-A3B1-49AE-97ED-381C3EB1C7DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EFB25023-A3B1-49AE-97ED-381C3EB1C7DE}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -154,114 +37,6 @@ Global
 		{EFB25023-A3B1-49AE-97ED-381C3EB1C7DE}.Release|ARM.ActiveCfg = Release|Any CPU
 		{EFB25023-A3B1-49AE-97ED-381C3EB1C7DE}.Release|x64.ActiveCfg = Release|Any CPU
 		{EFB25023-A3B1-49AE-97ED-381C3EB1C7DE}.Release|x86.ActiveCfg = Release|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Release|ARM.ActiveCfg = Release|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Release|x64.ActiveCfg = Release|Any CPU
-		{BC782FCE-D176-417B-B4CE-1DA8391BDD14}.Release|x86.ActiveCfg = Release|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Release|ARM.ActiveCfg = Release|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Release|x64.ActiveCfg = Release|Any CPU
-		{9BE013D1-B801-4AB3-B1A6-E7AE8B8340C7}.Release|x86.ActiveCfg = Release|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Release|Any CPU.Build.0 = Release|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Release|ARM.ActiveCfg = Release|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Release|x64.ActiveCfg = Release|Any CPU
-		{82B61A8E-30F3-4AF5-89F6-16FF74002A27}.Release|x86.ActiveCfg = Release|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Release|ARM.ActiveCfg = Release|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Release|x64.ActiveCfg = Release|Any CPU
-		{1F443979-B0CD-4AB2-B84E-E7EBF3DB47CB}.Release|x86.ActiveCfg = Release|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Release|ARM.ActiveCfg = Release|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Release|x64.ActiveCfg = Release|Any CPU
-		{A5F7FB02-2C13-4136-802A-D437B2CC74D9}.Release|x86.ActiveCfg = Release|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Release|ARM.ActiveCfg = Release|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Release|x64.ActiveCfg = Release|Any CPU
-		{FD823BD9-F491-47B5-BAFB-487F70C76CEB}.Release|x86.ActiveCfg = Release|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Release|ARM.ActiveCfg = Release|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Release|x64.ActiveCfg = Release|Any CPU
-		{6C94F10E-615F-4C3F-AE97-F4256871512D}.Release|x86.ActiveCfg = Release|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Release|ARM.ActiveCfg = Release|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Release|x64.ActiveCfg = Release|Any CPU
-		{2EC6C827-1C79-418E-AFAD-F19B04595132}.Release|x86.ActiveCfg = Release|Any CPU
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|ARM.ActiveCfg = Debug|ARM
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|ARM.Build.0 = Debug|ARM
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|ARM.Deploy.0 = Debug|ARM
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|x64.ActiveCfg = Debug|x64
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|x64.Build.0 = Debug|x64
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|x64.Deploy.0 = Debug|x64
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|x86.ActiveCfg = Debug|x86
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|x86.Build.0 = Debug|x86
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Debug|x86.Deploy.0 = Debug|x86
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|ARM.ActiveCfg = Release|ARM
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|ARM.Build.0 = Release|ARM
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|ARM.Deploy.0 = Release|ARM
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|x64.ActiveCfg = Release|x64
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|x64.Build.0 = Release|x64
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|x64.Deploy.0 = Release|x64
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|x86.ActiveCfg = Release|x86
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|x86.Build.0 = Release|x86
-		{3C5D57EF-E97C-460C-83B3-AE907343212C}.Release|x86.Deploy.0 = Release|x86
 		{D29AD031-E726-4EDF-8AA8-8DD8817EC30F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D29AD031-E726-4EDF-8AA8-8DD8817EC30F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D29AD031-E726-4EDF-8AA8-8DD8817EC30F}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -302,18 +77,6 @@ Global
 		{DD45DAA1-64CB-47A7-AE25-2382873BFD2F}.Release|ARM.ActiveCfg = Release|Any CPU
 		{DD45DAA1-64CB-47A7-AE25-2382873BFD2F}.Release|x64.ActiveCfg = Release|Any CPU
 		{DD45DAA1-64CB-47A7-AE25-2382873BFD2F}.Release|x86.ActiveCfg = Release|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Release|ARM.ActiveCfg = Release|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Release|x64.ActiveCfg = Release|Any CPU
-		{3C4980E2-DA4E-4400-8C68-DE5DED6925F6}.Release|x86.ActiveCfg = Release|Any CPU
 		{5E52DD4D-85C0-41A7-BC2C-B8FF2838DEDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5E52DD4D-85C0-41A7-BC2C-B8FF2838DEDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E52DD4D-85C0-41A7-BC2C-B8FF2838DEDE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -338,40 +101,6 @@ Global
 		{5E52DD4D-85C0-41A7-BC2C-B8FF2838DEDE}.Release|x86.ActiveCfg = Release|x86
 		{5E52DD4D-85C0-41A7-BC2C-B8FF2838DEDE}.Release|x86.Build.0 = Release|x86
 		{5E52DD4D-85C0-41A7-BC2C-B8FF2838DEDE}.Release|x86.Deploy.0 = Release|x86
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|ARM.ActiveCfg = Debug|ARM
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|ARM.Build.0 = Debug|ARM
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|ARM.Deploy.0 = Debug|ARM
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|x86.ActiveCfg = Debug|x86
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|x86.Build.0 = Debug|x86
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Debug|x86.Deploy.0 = Debug|x86
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|ARM.ActiveCfg = Release|ARM
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|ARM.Build.0 = Release|ARM
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|ARM.Deploy.0 = Release|ARM
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|x64.ActiveCfg = Release|Any CPU
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|x86.ActiveCfg = Release|x86
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|x86.Build.0 = Release|x86
-		{BE0AB9DB-781C-4551-A75F-6FE28A1C0FFE}.Release|x86.Deploy.0 = Release|x86
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Debug|ARM.ActiveCfg = Debug|ARM
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Debug|ARM.Build.0 = Debug|ARM
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Debug|x86.ActiveCfg = Debug|x86
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Debug|x86.Build.0 = Debug|x86
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Release|Any CPU.Build.0 = Release|Any CPU
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Release|ARM.ActiveCfg = Release|ARM
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Release|ARM.Build.0 = Release|ARM
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Release|x64.ActiveCfg = Release|Any CPU
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Release|x86.ActiveCfg = Release|x86
-		{851CE25F-2123-4136-9C92-F6176AE8BB73}.Release|x86.Build.0 = Release|x86
 		{A8EFF824-9D19-4A20-A59C-64846B9B9346}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A8EFF824-9D19-4A20-A59C-64846B9B9346}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A8EFF824-9D19-4A20-A59C-64846B9B9346}.Debug|ARM.ActiveCfg = Debug|Any CPU

+ 1 - 1
Rx.NET/Test/Rx/WinFormsApp45_NuGet/Form1.cs

@@ -8,7 +8,7 @@ using System.Reactive.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using PortableLibraryProfile7;
+using PortableLibraryProfile78_NuGet;
 
 namespace WinFormsApp45_NuGet
 {

+ 18 - 13
Rx.NET/Test/Rx/WinFormsApp45_NuGet/WinFormsApp45_NuGet.csproj

@@ -38,20 +38,25 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.0.21030\lib\Net45\System.Reactive.Core.dll</HintPath>
+    <Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.0.21030\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
+    <Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.0.21030\lib\Net45\System.Reactive.Linq.dll</HintPath>
+    <Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.0.21030\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
+    <Reference Include="System.Reactive.PlatformServices, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-PlatformServices.2.1.30214.0\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Windows.Forms, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-WinForms.2.0.21030\lib\Net45\System.Reactive.Windows.Forms.dll</HintPath>
+    <Reference Include="System.Reactive.Windows.Forms, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-WinForms.2.1.30214.0\lib\Net45\System.Reactive.Windows.Forms.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -98,9 +103,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PortableLibraryProfile7\PortableLibraryProfile78.csproj">
-      <Project>{d1a0ccfc-74ab-411c-b031-8cae34d128ae}</Project>
-      <Name>PortableLibraryProfile78</Name>
+    <ProjectReference Include="..\PortableLibraryProfile78_NuGet\PortableLibraryProfile78_NuGet.csproj">
+      <Project>{a8eff824-9d19-4a20-a59c-64846b9b9346}</Project>
+      <Name>PortableLibraryProfile78_NuGet</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+ 6 - 6
Rx.NET/Test/Rx/WinFormsApp45_NuGet/packages.config

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Main" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-PlatformServices" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-WinForms" version="2.0.21030" targetFramework="net45" />
+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-WinForms" version="2.1.30214.0" targetFramework="net45" />
 </packages>

+ 1 - 1
Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/MainPage.xaml.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
-using PortableLibraryProfile7;
+using PortableLibraryProfile78_NuGet;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
 using Windows.UI.Xaml;

+ 7 - 22
Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/Package.appxmanifest

@@ -1,39 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/2010/manifest">
-
-  <Identity Name="294cc5dd-7678-4c16-9e3b-dee59b28ba4d"
-            Publisher="CN=bartde"
-            Version="1.0.0.0" />
-
+  <Identity Name="294cc5dd-7678-4c16-9e3b-dee59b28ba4d" Publisher="CN=donnam" Version="1.0.0.0" />
   <Properties>
     <DisplayName>WindowsStoreApp8_NuGet</DisplayName>
     <PublisherDisplayName>bartde</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
-
   <Prerequisites>
     <OSMinVersion>6.2.1</OSMinVersion>
     <OSMaxVersionTested>6.2.1</OSMaxVersionTested>
   </Prerequisites>
-
   <Resources>
-    <Resource Language="x-generate"/>
+    <Resource Language="x-generate" />
   </Resources>
-
   <Applications>
-    <Application Id="App"
-        Executable="$targetnametoken$.exe"
-        EntryPoint="WindowsStoreApp8_NuGet.App">
-        <VisualElements
-            DisplayName="WindowsStoreApp8_NuGet"
-            Logo="Assets\Logo.png"
-            SmallLogo="Assets\SmallLogo.png"
-            Description="WindowsStoreApp8_NuGet"
-            ForegroundText="light"
-            BackgroundColor="#464646">
-            <DefaultTile ShowName="allLogos" />
-            <SplashScreen Image="Assets\SplashScreen.png" />
-        </VisualElements>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="WindowsStoreApp8_NuGet.App">
+      <VisualElements DisplayName="WindowsStoreApp8_NuGet" Logo="Assets\Logo.png" SmallLogo="Assets\SmallLogo.png" Description="WindowsStoreApp8_NuGet" ForegroundText="light" BackgroundColor="#464646">
+        <DefaultTile ShowName="allLogos" />
+        <SplashScreen Image="Assets\SplashScreen.png" />
+      </VisualElements>
     </Application>
   </Applications>
   <Capabilities>

+ 32 - 18
Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/WindowsStoreApp8_NuGet.csproj

@@ -17,6 +17,7 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <PackageCertificateThumbprint>454AFB5C98A069A12B775EC00BCD50EACDF3A148</PackageCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -116,7 +117,7 @@
     <AppxManifest Include="Package.appxmanifest">
       <SubType>Designer</SubType>
     </AppxManifest>
-    <None Include="app.config" />
+    <None Include="appkey.snk" />
     <None Include="packages.config" />
     <None Include="WindowsStoreApp8_NuGet_TemporaryKey.pfx" />
   </ItemGroup>
@@ -141,37 +142,50 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.0.21030\lib\WinRT45\System.Reactive.Core.dll</HintPath>
+    <Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Core.2.1.30214.0\lib\NetCore45\System.Reactive.Core.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.0.21030\lib\WinRT45\System.Reactive.Interfaces.dll</HintPath>
+    <Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\NetCore45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.0.21030\lib\WinRT45\System.Reactive.Linq.dll</HintPath>
+    <Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\NetCore45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.0.21030\lib\WinRT45\System.Reactive.PlatformServices.dll</HintPath>
+    <Reference Include="System.Reactive.PlatformServices, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-PlatformServices.2.1.30214.0\lib\NetCore45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Providers, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Providers.2.0.21030\lib\WinRT45\System.Reactive.Providers.dll</HintPath>
+    <Reference Include="System.Reactive.Providers, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Providers.2.1.30214.0\lib\NetCore45\System.Reactive.Providers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Windows.Threading, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-WindowStoreApps.2.0.21030\lib\WinRT45\System.Reactive.Windows.Threading.dll</HintPath>
+    <Reference Include="System.Reactive.Windows.Threading, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-WindowStoreApps.2.1.30214.0\lib\NetCore45\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.WindowsRuntime, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-WinRT.2.0.21030\lib\WinRT45\System.Reactive.WindowsRuntime.dll</HintPath>
+    <Reference Include="System.Reactive.WindowsRuntime, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-WinRT.2.1.30214.0\lib\NetCore45\System.Reactive.WindowsRuntime.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PortableLibraryProfile7\PortableLibraryProfile78.csproj">
-      <Project>{d1a0ccfc-74ab-411c-b031-8cae34d128ae}</Project>
-      <Name>PortableLibraryProfile78</Name>
+    <ProjectReference Include="..\PortableLibraryProfile78_NuGet\PortableLibraryProfile78_NuGet.csproj">
+      <Project>{a8eff824-9d19-4a20-a59c-64846b9b9346}</Project>
+      <Name>PortableLibraryProfile78_NuGet</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '11.0' ">
     <VisualStudioVersion>11.0</VisualStudioVersion>
   </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>appkey.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

BIN
Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/WindowsStoreApp8_NuGet_TemporaryKey.pfx


+ 8 - 8
Rx.NET/Test/Rx/WindowsStoreApp8_NuGet/packages.config

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.0.21030" targetFramework="win" />
-  <package id="Rx-Interfaces" version="2.0.21030" targetFramework="win" />
-  <package id="Rx-Linq" version="2.0.21030" targetFramework="win" />
-  <package id="Rx-Main" version="2.0.21030" targetFramework="win" />
-  <package id="Rx-PlatformServices" version="2.0.21030" targetFramework="win" />
-  <package id="Rx-Providers" version="2.0.21030" targetFramework="win" />
-  <package id="Rx-WindowStoreApps" version="2.0.21030" targetFramework="win" />
-  <package id="Rx-WinRT" version="2.0.21030" targetFramework="win" />
+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="win" />
+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="win" />
+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="win" />
+  <package id="Rx-Main" version="2.1.30214.0" targetFramework="win" />
+  <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="win" />
+  <package id="Rx-Providers" version="2.1.30214.0" targetFramework="win" />
+  <package id="Rx-WindowStoreApps" version="2.1.30214.0" targetFramework="win" />
+  <package id="Rx-WinRT" version="2.1.30214.0" targetFramework="win" />
 </packages>

+ 1 - 1
Rx.NET/Test/Rx/WpfApp45_NuGet/MainWindow.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using PortableLibraryProfile7;
+using PortableLibraryProfile78_NuGet;
 
 namespace WpfApp45_NuGet
 {

+ 21 - 18
Rx.NET/Test/Rx/WpfApp45_NuGet/WpfApp45_NuGet.csproj

@@ -40,23 +40,29 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.0.21030\lib\Net45\System.Reactive.Core.dll</HintPath>
+    <Reference Include="System.Reactive.Core, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.0.21030\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
+    <Reference Include="System.Reactive.Interfaces, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.0.21030\lib\Net45\System.Reactive.Linq.dll</HintPath>
+    <Reference Include="System.Reactive.Linq, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.0.21030\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
+    <Reference Include="System.Reactive.PlatformServices, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-PlatformServices.2.1.30214.0\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Providers, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Providers.2.0.21030\lib\Net45\System.Reactive.Providers.dll</HintPath>
+    <Reference Include="System.Reactive.Providers, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-Providers.2.1.30214.0\lib\Net45\System.Reactive.Providers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Windows.Threading, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-XAML.2.0.21030\lib\Net45\System.Reactive.Windows.Threading.dll</HintPath>
+    <Reference Include="System.Reactive.Windows.Threading, Version=2.1.30214.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Rx-XAML.2.1.30214.0\lib\Net45\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -114,12 +120,9 @@
     <AppDesigner Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\PortableLibraryProfile7\PortableLibraryProfile78.csproj">
-      <Project>{d1a0ccfc-74ab-411c-b031-8cae34d128ae}</Project>
-      <Name>PortableLibraryProfile78</Name>
+    <ProjectReference Include="..\PortableLibraryProfile78_NuGet\PortableLibraryProfile78_NuGet.csproj">
+      <Project>{a8eff824-9d19-4a20-a59c-64846b9b9346}</Project>
+      <Name>PortableLibraryProfile78_NuGet</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

+ 7 - 7
Rx.NET/Test/Rx/WpfApp45_NuGet/packages.config

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Main" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-PlatformServices" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Providers" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-XAML" version="2.0.21030" targetFramework="net45" />
+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Providers" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-XAML" version="2.1.30214.0" targetFramework="net45" />
 </packages>

+ 1 - 1
Rx.NET/Test/Rx/WpfXbapApp45_NuGet/Page1.xaml.cs

@@ -13,7 +13,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
-using PortableLibraryProfile7;
+using PortableLibraryProfile78_NuGet;
 
 namespace WpfXbapApp45_NuGet
 {

+ 49 - 15
Rx.NET/Test/Rx/WpfXbapApp45_NuGet/WpfXbapApp45_NuGet.csproj

@@ -14,10 +14,8 @@
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <EnableSecurityDebugging>true</EnableSecurityDebugging>
-    <Install>False</Install>
     <StartAction>URL</StartAction>
     <HostInBrowser>true</HostInBrowser>
-    <BootstrapperEnabled>false</BootstrapperEnabled>
     <TargetZone>Internet</TargetZone>
     <GenerateManifests>true</GenerateManifests>
     <SignManifests>True</SignManifests>
@@ -25,6 +23,22 @@
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>false</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>false</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -46,20 +60,23 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.0.21030\lib\Net45\System.Reactive.Core.dll</HintPath>
+    <Reference Include="System.Reactive.Core">
+      <HintPath>..\packages\Rx-Core.2.1.30214.0\lib\Net45\System.Reactive.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Reactive.Interfaces">
+      <HintPath>..\packages\Rx-Interfaces.2.1.30214.0\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.0.21030\lib\Net45\System.Reactive.Interfaces.dll</HintPath>
+    <Reference Include="System.Reactive.Linq">
+      <HintPath>..\packages\Rx-Linq.2.1.30214.0\lib\Net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.0.21030\lib\Net45\System.Reactive.Linq.dll</HintPath>
+    <Reference Include="System.Reactive.PlatformServices">
+      <HintPath>..\packages\Rx-PlatformServices.2.1.30214.0\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.0.21030\lib\Net45\System.Reactive.PlatformServices.dll</HintPath>
+    <Reference Include="System.Reactive.Providers">
+      <HintPath>..\packages\Rx-Providers.2.1.30214.0\lib\Net45\System.Reactive.Providers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Windows.Threading, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-XAML.2.0.21030\lib\Net45\System.Reactive.Windows.Threading.dll</HintPath>
+    <Reference Include="System.Reactive.Windows.Threading">
+      <HintPath>..\packages\Rx-XAML.2.1.30214.0\lib\Net45\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
@@ -118,9 +135,26 @@
     <None Include="WpfXbapApp45_NuGet_TemporaryKey.pfx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\PortableLibraryProfile7\PortableLibraryProfile78.csproj">
-      <Project>{d1a0ccfc-74ab-411c-b031-8cae34d128ae}</Project>
-      <Name>PortableLibraryProfile7</Name>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PortableLibraryProfile78_NuGet\PortableLibraryProfile78_NuGet.csproj">
+      <Project>{a8eff824-9d19-4a20-a59c-64846b9b9346}</Project>
+      <Name>PortableLibraryProfile78_NuGet</Name>
     </ProjectReference>
   </ItemGroup>
   <PropertyGroup>

+ 7 - 6
Rx.NET/Test/Rx/WpfXbapApp45_NuGet/packages.config

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Rx-Core" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Interfaces" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Linq" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-Main" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-PlatformServices" version="2.0.21030" targetFramework="net45" />
-  <package id="Rx-XAML" version="2.0.21030" targetFramework="net45" />
+  <package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Main" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-PlatformServices" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-Providers" version="2.1.30214.0" targetFramework="net45" />
+  <package id="Rx-XAML" version="2.1.30214.0" targetFramework="net45" />
 </packages>

+ 0 - 1
Rx.NET/Test/Rx/packages/repositories.config

@@ -2,7 +2,6 @@
 <repositories>
   <repository path="..\ConsoleApp45_NuGet\packages.config" />
   <repository path="..\PortableLibraryProfile78_NuGet\packages.config" />
-  <repository path="..\WindowsPhoneApp7_NuGet\packages.config" />
   <repository path="..\WindowsStoreApp8_NuGet\packages.config" />
   <repository path="..\WinFormsApp45_NuGet\packages.config" />
   <repository path="..\WpfApp45_NuGet\packages.config" />

BIN
Rx/NET/Test/Rx/WindowsStoreApp8_NuGet/appkey.snk