Use Nuget/Xamarin Components for external references, where possible

jnkvca · Oct 26, 2013 · b9bf0db · b9bf0db
1 parent 57e6abd
commit b9bf0db
Show file tree

Hide file tree

Showing 43 changed files with 46 additions and 35,647 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,4 +7,6 @@ bin/
 obj/
 /BuildOutput
 *.shfbproj_*
-UpgradeLog*.htm
+UpgradeLog*.htm
+Source/packages
+Source/Components
diff --git a/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/Net40/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/Portable/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/WinRT/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/WindowsPhone/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.dll b/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.dll
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.pdb b/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.pdb
diff --git a/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.xml b/Libraries/Json.NET/Bin/WindowsPhone/Signed/Newtonsoft.Json.xml
diff --git a/Libraries/Json.NET/Bin/versions.txt b/Libraries/Json.NET/Bin/versions.txt
diff --git a/Libraries/Json.NET/readme.txt b/Libraries/Json.NET/readme.txt
diff --git a/Libraries/WPFToolkit.Extended/WPFToolkit.Extended-License.txt b/Libraries/WPFToolkit.Extended/WPFToolkit.Extended-License.txt
diff --git a/Libraries/WPFToolkit.Extended/Xceed.Wpf.DataGrid.dll b/Libraries/WPFToolkit.Extended/Xceed.Wpf.DataGrid.dll
diff --git a/Libraries/WPFToolkit.Extended/Xceed.Wpf.Toolkit.dll b/Libraries/WPFToolkit.Extended/Xceed.Wpf.Toolkit.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/DirectX/x64/Microsoft.WindowsAPICodePack.DirectX.dll b/Libraries/WindowsApiCodePack/binaries/DirectX/x64/Microsoft.WindowsAPICodePack.DirectX.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/DirectX/x64/Microsoft.WindowsAPICodePack.DirectX.pdb b/Libraries/WindowsApiCodePack/binaries/DirectX/x64/Microsoft.WindowsAPICodePack.DirectX.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/DirectX/x86/Microsoft.WindowsAPICodePack.DirectX.dll b/Libraries/WindowsApiCodePack/binaries/DirectX/x86/Microsoft.WindowsAPICodePack.DirectX.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/DirectX/x86/Microsoft.WindowsAPICodePack.DirectX.pdb b/Libraries/WindowsApiCodePack/binaries/DirectX/x86/Microsoft.WindowsAPICodePack.DirectX.pdb
diff --git a/...s/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.dll b/...s/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.dll
diff --git a/...s/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.pdb b/...s/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ExtendedLinguisticServices.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Sensors.dll b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Sensors.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Sensors.pdb b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Sensors.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Shell.dll b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Shell.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Shell.pdb b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.Shell.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ShellExtensions.dll b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ShellExtensions.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ShellExtensions.pdb b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.ShellExtensions.pdb
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.dll b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.dll
diff --git a/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.pdb b/Libraries/WindowsApiCodePack/binaries/Microsoft.WindowsAPICodePack.pdb
diff --git a/Source/Eto.Json/Eto.Json - iOS.csproj b/Source/Eto.Json/Eto.Json - iOS.csproj
@@ -40,7 +40,7 @@
     <Reference Include="System.Core" />
     <Reference Include="monotouch" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\Libraries\Json.NET\Bin\Portable\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\Components\json.net-4.5.11\lib\ios\Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
@@ -78,4 +78,11 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
+  <ItemGroup>
+    <XamarinComponentReference Include="json.net">
+      <InstallationInProgress>True</InstallationInProgress>
+      <Version>4.5.11</Version>
+      <Visible>False</Visible>
+    </XamarinComponentReference>
+  </ItemGroup>
 </Project>
diff --git a/Source/Eto.Json/Eto.Json.csproj b/Source/Eto.Json/Eto.Json.csproj
@@ -33,11 +33,11 @@
   <Import Condition="Exists('../../../Eto.Common.targets')" Project="../../../Eto.Common.targets" />
   <ItemGroup>
     <Reference Include="System" />
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\Libraries\Json.NET\Bin\Net40\Newtonsoft.Json.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Core" />
+    <Reference Include="Newtonsoft.Json">
+      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="JsonReader.cs" />
@@ -77,4 +77,7 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
diff --git a/Source/Eto.Platform.Windows/Eto.Platform.Windows.csproj b/Source/Eto.Platform.Windows/Eto.Platform.Windows.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -10,8 +10,6 @@
     <OutputType>Library</OutputType>
     <AssemblyName>Eto.Platform.Windows</AssemblyName>
     <RootNamespace>Eto.Platform.Windows</RootNamespace>
-    <ReleaseVersion>
-    </ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup>
     <FileAlignment>512</FileAlignment>
@@ -42,12 +40,10 @@
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.WindowsAPICodePack">
-      <HintPath>..\..\Libraries\WindowsApiCodePack\binaries\Microsoft.WindowsAPICodePack.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\Windows7APICodePack-Core.1.1.0.0\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAPICodePack.Shell">
-      <HintPath>..\..\Libraries\WindowsApiCodePack\binaries\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
-      <Private>False</Private>
+      <HintPath>..\packages\Windows7APICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>
@@ -323,6 +319,9 @@
       <Link>CustomControls\Assemblies\Interop.SHDocVw.dll</Link>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>

diff --git a/Source/Eto.Platform.Windows/packages.config b/Source/Eto.Platform.Windows/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Windows7APICodePack-Core" version="1.1.0.0" targetFramework="net40" />
+  <package id="Windows7APICodePack-Shell" version="1.1.0.0" targetFramework="net40" />
+</packages>
diff --git a/Source/Eto.Platform.Wpf/Eto.Platform.Wpf.csproj b/Source/Eto.Platform.Wpf/Eto.Platform.Wpf.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -10,8 +10,6 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Eto.Platform.Wpf</RootNamespace>
     <AssemblyName>Eto.Platform.Wpf</AssemblyName>
-    <ReleaseVersion>
-    </ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup>
     <FileAlignment>512</FileAlignment>
@@ -68,15 +66,14 @@
     <Reference Include="WindowsFormsIntegration">
       <Package>/Users/curtis/Projects/Resources/WPFDependencies/WindowsFormsIntegration.dll</Package>
     </Reference>
-    <Reference Include="Xceed.Wpf.Toolkit">
-      <HintPath>..\..\Libraries\WPFToolkit.Extended\Xceed.Wpf.Toolkit.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="Interop.SHDocVw">
       <HintPath>..\..\Libraries\SHDocVw\Interop.SHDocVw.dll</HintPath>
       <Private>False</Private>
       <EmbedInteropTypes>False</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.2.0.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Eto.Platform.Mac\Conversions.sd.cs">
@@ -224,7 +221,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="..\..\Libraries\WPFToolkit.Extended\Xceed.Wpf.Toolkit.dll">
+    <EmbeddedResource Include="..\packages\Extended.Wpf.Toolkit.2.0.0\lib\net40\Xceed.Wpf.Toolkit.dll">
       <Link>CustomControls\Assemblies\Xceed.Wpf.Toolkit.dll</Link>
     </EmbeddedResource>
     <EmbeddedResource Include="..\..\Libraries\WPFColorPicker\ColorPicker.dll">
@@ -233,10 +230,6 @@
     <EmbeddedResource Include="..\..\Libraries\SHDocVw\Interop.SHDocVw.dll">
       <Link>CustomControls\Assemblies\Interop.SHDocVw.dll</Link>
     </EmbeddedResource>
-    <Content Include="..\..\Libraries\WPFToolkit.Extended\WPFToolkit.Extended-License.txt">
-      <Link>WPFToolkit.Extended-License.txt</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <EmbeddedResource Include="Properties\FontDialogResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>FontDialogResources.Designer.cs</LastGenOutput>
@@ -295,6 +288,9 @@
       <Name>Eto</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>

diff --git a/Source/Eto.Platform.Wpf/packages.config b/Source/Eto.Platform.Wpf/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Extended.Wpf.Toolkit" version="2.0.0" targetFramework="net40" />
+</packages>
diff --git a/Source/Eto.Test/Eto.Test.Mac/Eto.Test.XamMac.csproj b/Source/Eto.Test/Eto.Test.Mac/Eto.Test.XamMac.csproj
@@ -59,7 +59,7 @@
     <Reference Include="System.Drawing" />
     <Reference Include="XamMac" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\..\Libraries\Json.NET\Bin\Net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.5.0.8\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -68,6 +68,7 @@
   <ItemGroup>
     <None Include="Info.plist" />
     <None Include="linker.xml" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Mono\MonoMac\v0.0\Mono.MonoMac.targets" />

diff --git a/Source/Eto.Test/Eto.Test.Mac/packages.config b/Source/Eto.Test/Eto.Test.Mac/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net40" />
+</packages>