Merge pull request #2 from mcneel/curtis/use-nuget

- Use nuget for Eto dependencies
picoe · Mar 21, 2018 · fbfda2a · fbfda2a
2 parents 33e82bb + 4fed6eb
commit fbfda2a
Show file tree

Hide file tree

Showing 30 changed files with 205 additions and 261 deletions.
diff --git a/src/Eto.CodeEditor/.editorconfig → .editorconfig b/src/Eto.CodeEditor/.editorconfig → .editorconfig
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "lib/Eto"]
-	path = lib/Eto
-	url = https://[email protected]/picoe/Eto.git

diff --git a/lib/Eto b/lib/Eto
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -5,4 +5,4 @@
 		<BaseIntermediateOutputPath>$(BasePath)artifacts\obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
 		<RestoreProjectStyle Condition="'$(RestoreProjectStyle)' == ''">PackageReference</RestoreProjectStyle>
 	</PropertyGroup>
-</Project>
+</Project>
diff --git a/src/Eto.CodeEditor.Wpf/Eto.CodeEditor.Wpf.csproj b/src/Eto.CodeEditor.Wpf/Eto.CodeEditor.Wpf.csproj
@@ -19,15 +19,15 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath>..\..\artifacts\core\Debug\net45\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath>..\..\artifacts\core\Release\net45\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -80,23 +80,18 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\Eto\src\Eto.Wpf\Eto.Wpf.csproj">
-      <Project>{63137fa0-ca55-11e3-9c1a-0800200c9a66}</Project>
-      <Name>Eto.Wpf</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\lib\Eto\src\Eto\Eto.csproj">
-      <Project>{fa7bcdff-e308-4c44-8699-d834c2c679dd}</Project>
-      <Name>Eto</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Eto.CodeEditor\Eto.CodeEditor.csproj">
       <Project>{9ac91936-41e2-4481-980e-80ff089feb8a}</Project>
       <Name>Eto.CodeEditor</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Eto.Platform.Wpf">
+      <Version>2.4.1</Version>
+    </PackageReference>
     <PackageReference Include="jacobslusser.ScintillaNET">
       <Version>3.6.3</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>
diff --git a/src/Eto.CodeEditor.XamMac/Eto.CodeEditor.XamMac2.csproj b/src/Eto.CodeEditor.XamMac/Eto.CodeEditor.XamMac2.csproj
@@ -15,11 +15,10 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug</OutputPath>
+    <OutputPath>..\..\artifacts\core\Debug\net45</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <IntermediateOutputPath>obj\Debug</IntermediateOutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <NoStdLib>false</NoStdLib>
     <EnableCodeSigning>false</EnableCodeSigning>
@@ -33,11 +32,10 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release</OutputPath>
+    <OutputPath>..\..\artifacts\core\Release\net45</OutputPath>
     <DefineConstants></DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <IntermediateOutputPath>obj\Release</IntermediateOutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <NoStdLib>false</NoStdLib>
     <EnableCodeSigning>false</EnableCodeSigning>
@@ -63,21 +61,20 @@
       <Project>{9AC91936-41E2-4481-980E-80FF089FEB8A}</Project>
       <Name>Eto.CodeEditor</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\lib\Eto\src\Eto\Eto.csproj">
-      <Project>{FA7BCDFF-E308-4C44-8699-D834C2C679DD}</Project>
-      <Name>Eto</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\lib\Eto\src\Eto.Mac\Eto.XamMac2-net45.csproj">
-      <Project>{856E8C70-2702-11E4-8C21-0800200C9A66}</Project>
-      <Name>Eto.XamMac2-net45</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Scintilla.XamMac2\Scintilla.XamMac2.csproj">
       <Project>{810B1BCD-8E09-4F69-8726-B6ED91E243E7}</Project>
       <Name>Scintilla.XamMac2</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Eto.Platform.XamMac2">
+      <Version>2.4.1</Version>
+    </PackageReference>
+    <PackageReference Include="NuGet.Build.Packaging">
+      <Version>0.2.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-  <Import Project="..\packages\Eto.Forms.2.4.0-build1268\build\Eto.Forms.targets" Condition="Exists('..\packages\Eto.Forms.2.4.0-build1268\build\Eto.Forms.targets')" />
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
@@ -88,4 +85,4 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
-</Project>
+</Project>
diff --git a/src/Eto.CodeEditor/Eto.CodeEditor.csproj b/src/Eto.CodeEditor/Eto.CodeEditor.csproj
@@ -2,11 +2,15 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard1.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <PackageVersion>1.0.0</PackageVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\artifacts\core\Debug</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\artifacts\core\Release</OutputPath>
   </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\lib\Eto\src\Eto\Eto.csproj" />
-  </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
@@ -17,4 +21,8 @@
       </Properties>
     </MonoDevelop>
   </ProjectExtensions>
+  <ItemGroup>
+    <PackageReference Include="Eto.Forms" Version="2.4.1" />
+    <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" />
+  </ItemGroup>
 </Project>
diff --git a/src/Eto.Toolkit.sln b/src/Eto.Toolkit.sln
@@ -8,138 +8,73 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.CodeEditor.XamMac2", "E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.CodeEditor.Wpf", "Eto.CodeEditor.Wpf\Eto.CodeEditor.Wpf.csproj", "{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto", "..\lib\Eto\src\Eto\Eto.csproj", "{FA7BCDFF-E308-4C44-8699-D834C2C679DD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Wpf", "..\lib\Eto\src\Eto.Wpf\Eto.Wpf.csproj", "{63137FA0-CA55-11E3-9C1A-0800200C9A66}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Eto", "Eto", "{2FA60EA1-DFCD-42F6-B991-B9F8C61EA808}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac2-net45", "..\lib\Eto\src\Eto.Mac\Eto.XamMac2-net45.csproj", "{856E8C70-2702-11E4-8C21-0800200C9A66}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeEditor", "CodeEditor", "{646F64B2-57A5-4096-854F-F83D981AF1E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.CodeEditor.TestAppWin", "..\test\Eto.CodeEditor.Test\Eto.CodeEditor.TestAppWin.csproj", "{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.CodeEditor.TestAppWin", "..\test\Eto.CodeEditor.TestAppWin\Eto.CodeEditor.TestAppWin.csproj", "{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scintilla.XamMac2", "Scintilla.XamMac2\Scintilla.XamMac2.csproj", "{810B1BCD-8E09-4F69-8726-B6ED91E243E7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac2-modern", "..\lib\Eto\src\Eto.Mac\Eto.XamMac2-modern.csproj", "{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.CodeEditor.TestAppMac", "..\test\Eto.CodeEditor.TestAppMac\Eto.CodeEditor.TestAppMac.csproj", "{DD626F6E-2487-41A7-8D97-B3F673EC117B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.CodeEditor.TestAppMac", "..\test\Eto.CodeEditor.Test.XamMac2\Eto.CodeEditor.TestAppMac.csproj", "{DD626F6E-2487-41A7-8D97-B3F673EC117B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.CodeEditor.TestApp", "..\test\Eto.CodeEditor.TestApp\Eto.CodeEditor.TestApp.csproj", "{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Debug|Mac = Debug|Mac
 		Debug|Windows = Debug|Windows
-		Release|Any CPU = Release|Any CPU
 		Release|Mac = Release|Mac
 		Release|Windows = Release|Windows
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Debug|Mac.ActiveCfg = Debug|Any CPU
 		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Debug|Mac.Build.0 = Debug|Any CPU
 		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Debug|Windows.ActiveCfg = Debug|Any CPU
 		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Debug|Windows.Build.0 = Debug|Any CPU
-		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Release|Mac.ActiveCfg = Release|Any CPU
 		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Release|Mac.Build.0 = Release|Any CPU
 		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Release|Windows.ActiveCfg = Release|Any CPU
 		{9AC91936-41E2-4481-980E-80FF089FEB8A}.Release|Windows.Build.0 = Release|Any CPU
-		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Debug|Mac.ActiveCfg = Debug|Any CPU
 		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Debug|Mac.Build.0 = Debug|Any CPU
 		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Release|Any CPU.Build.0 = Release|Any CPU
 		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Release|Mac.ActiveCfg = Release|Any CPU
 		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Release|Mac.Build.0 = Release|Any CPU
 		{160DE3A8-EDD5-4256-9433-87DAEC4CF259}.Release|Windows.ActiveCfg = Release|Any CPU
-		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Debug|Mac.ActiveCfg = Debug|Any CPU
 		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Debug|Windows.ActiveCfg = Debug|Any CPU
 		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Debug|Windows.Build.0 = Debug|Any CPU
-		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Release|Mac.ActiveCfg = Release|Any CPU
 		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Release|Mac.Build.0 = Release|Any CPU
 		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Release|Windows.ActiveCfg = Release|Any CPU
 		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9}.Release|Windows.Build.0 = Release|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Debug|Mac.ActiveCfg = Debug|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Debug|Mac.Build.0 = Debug|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Debug|Windows.Build.0 = Debug|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Release|Mac.ActiveCfg = Release|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Release|Mac.Build.0 = Release|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Release|Windows.ActiveCfg = Release|Any CPU
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD}.Release|Windows.Build.0 = Release|Any CPU
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Windows.Build.0 = Debug|Any CPU
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU
-		{856E8C70-2702-11E4-8C21-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Debug|Any CPU.ActiveCfg = Debug|Windows
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Debug|Mac.ActiveCfg = Debug|Mac
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Debug|Mac.Build.0 = Debug|Mac
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Debug|Windows.ActiveCfg = Debug|Windows
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Debug|Windows.Build.0 = Debug|Windows
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Release|Any CPU.ActiveCfg = Release|Windows
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Release|Mac.ActiveCfg = Release|Mac
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Release|Mac.Build.0 = Release|Mac
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Release|Windows.ActiveCfg = Release|Windows
-		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Release|Windows.Build.0 = Release|Windows
-		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Debug|Mac.ActiveCfg = Debug|Any CPU
+		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Debug|Mac.Build.0 = Debug|Any CPU
+		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Debug|Windows.ActiveCfg = Debug|Any CPU
+		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Debug|Windows.Build.0 = Debug|Any CPU
+		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Release|Mac.ActiveCfg = Release|Any CPU
+		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Release|Mac.Build.0 = Release|Any CPU
+		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Release|Windows.ActiveCfg = Release|Any CPU
+		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6}.Release|Windows.Build.0 = Release|Any CPU
 		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Debug|Mac.ActiveCfg = Debug|Any CPU
 		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Debug|Mac.Build.0 = Debug|Any CPU
 		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Release|Any CPU.Build.0 = Release|Any CPU
 		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Release|Mac.ActiveCfg = Release|Any CPU
 		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Release|Mac.Build.0 = Release|Any CPU
 		{810B1BCD-8E09-4F69-8726-B6ED91E243E7}.Release|Windows.ActiveCfg = Release|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU
-		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Debug|Any CPU.ActiveCfg = Debug|Mac
-		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Debug|Any CPU.Build.0 = Debug|Mac
 		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Debug|Mac.ActiveCfg = Debug|Mac
 		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Debug|Mac.Build.0 = Debug|Mac
 		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Debug|Windows.ActiveCfg = Debug|Mac
-		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Release|Any CPU.ActiveCfg = Release|Mac
-		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Release|Any CPU.Build.0 = Release|Mac
 		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Release|Mac.ActiveCfg = Release|Mac
 		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Release|Mac.Build.0 = Release|Mac
 		{DD626F6E-2487-41A7-8D97-B3F673EC117B}.Release|Windows.ActiveCfg = Release|Mac
+		{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B}.Debug|Mac.ActiveCfg = Debug|Any CPU
+		{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B}.Debug|Mac.Build.0 = Debug|Any CPU
+		{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B}.Debug|Windows.ActiveCfg = Debug|Any CPU
+		{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B}.Debug|Windows.Build.0 = Debug|Any CPU
+		{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B}.Release|Mac.ActiveCfg = Release|Any CPU
+		{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B}.Release|Mac.Build.0 = Release|Any CPU
+		{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B}.Release|Windows.ActiveCfg = Release|Any CPU
+		{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B}.Release|Windows.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -148,13 +83,10 @@ Global
 		{9AC91936-41E2-4481-980E-80FF089FEB8A} = {646F64B2-57A5-4096-854F-F83D981AF1E8}
 		{160DE3A8-EDD5-4256-9433-87DAEC4CF259} = {646F64B2-57A5-4096-854F-F83D981AF1E8}
 		{835EF387-1702-49FF-B1B1-41C3D0CDF8B9} = {646F64B2-57A5-4096-854F-F83D981AF1E8}
-		{FA7BCDFF-E308-4C44-8699-D834C2C679DD} = {2FA60EA1-DFCD-42F6-B991-B9F8C61EA808}
-		{63137FA0-CA55-11E3-9C1A-0800200C9A66} = {2FA60EA1-DFCD-42F6-B991-B9F8C61EA808}
-		{856E8C70-2702-11E4-8C21-0800200C9A66} = {2FA60EA1-DFCD-42F6-B991-B9F8C61EA808}
 		{2BF83FDA-9BFF-4A1E-8C58-1EAC435DEED6} = {646F64B2-57A5-4096-854F-F83D981AF1E8}
 		{810B1BCD-8E09-4F69-8726-B6ED91E243E7} = {646F64B2-57A5-4096-854F-F83D981AF1E8}
-		{BD6ED8F0-297C-11E5-A2CB-0800200C9A66} = {2FA60EA1-DFCD-42F6-B991-B9F8C61EA808}
 		{DD626F6E-2487-41A7-8D97-B3F673EC117B} = {646F64B2-57A5-4096-854F-F83D981AF1E8}
+		{FD97E2D4-5D8E-46F8-B952-1A2B2E07BA1B} = {646F64B2-57A5-4096-854F-F83D981AF1E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B290EE1E-3782-4C57-A127-FD078514CD8C}