move to shared project

runceel · Dec 18, 2016 · e90dffc · e90dffc
1 parent 0699bf0
commit e90dffc
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 25 deletions.
diff --git a/ReactiveProperty.sln b/ReactiveProperty.sln
@@ -109,7 +109,15 @@ Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "DocumentationProject", "Doc
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveProperty.Portable", "Source\ReactiveProperty.Portable\ReactiveProperty.Portable.csproj", "{D5FCE62E-0718-43C4-A103-69C155D8D402}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ReactiveProperty.Platform.Shared", "Source\ReactiveProperty.Platform.Shared\ReactiveProperty.Platform.Shared.shproj", "{523E5506-24DF-44CA-83CC-6AA02454F150}"
+EndProject
 Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		Source\ReactiveProperty.Platform.Shared\ReactiveProperty.Platform.Shared.projitems*{523e5506-24df-44ca-83cc-6aa02454f150}*SharedItemsImports = 13
+		Source\ReactiveProperty.Platform.Shared\ReactiveProperty.Platform.Shared.projitems*{883c5447-2778-43e4-8cde-6a594b342acd}*SharedItemsImports = 4
+		Source\ReactiveProperty.Platform.Shared\ReactiveProperty.Platform.Shared.projitems*{cd8f2562-e3a0-4f6d-8285-70349597adbc}*SharedItemsImports = 4
+		Source\ReactiveProperty.Platform.Shared\ReactiveProperty.Platform.Shared.projitems*{df40885e-7fcf-409e-a297-d8b3c76e8019}*SharedItemsImports = 4
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Debug|ARM = Debug|ARM
@@ -507,10 +515,11 @@ Global
 		{A54AE997-6255-4000-A4CE-3F8D6D8F0026} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
 		{12BFF19F-18EB-4AFB-AAAB-B024CCF558D4} = {A9542547-5556-442E-ACCB-6DB437E5E25C}
 		{D5FCE62E-0718-43C4-A103-69C155D8D402} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
+		{523E5506-24DF-44CA-83CC-6AA02454F150} = {592AA479-AD7F-476B-AEF8-2B0268EA3BD8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		BuildVersion_AssemblyInfoFilename = Source\NET40\Properties\CommonAssemblyInfo.cs
 		BuildVersion_UseGlobalSettings = True
+		BuildVersion_AssemblyInfoFilename = Source\NET40\Properties\CommonAssemblyInfo.cs
 	EndGlobalSection
 	GlobalSection(TestCaseManagementSettings) = postSolution
 		CategoryFile = ReactiveProperty.vsmdi

diff --git a/Source/ReactiveProperty.Platform.NET45/ReactiveProperty.Platform.NET45.csproj b/Source/ReactiveProperty.Platform.NET45/ReactiveProperty.Platform.NET45.csproj
@@ -89,21 +89,6 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\ReactiveProperty.Platform.NET46\Extensions\DependencyObjectExtensions.cs">
-      <Link>Extensions\DependencyObjectExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\ReactiveProperty.Platform.NET46\Extensions\ObserveEveryValueChangedExtensions.cs">
-      <Link>Extensions\ObserveEveryValueChangedExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\ReactiveProperty.Platform.NET46\Interactivity\EventToReactive.cs">
-      <Link>Interactivity\EventToReactive.cs</Link>
-    </Compile>
-    <Compile Include="..\ReactiveProperty.Platform.NET46\Interactivity\EventToReactiveCommand.cs">
-      <Link>Interactivity\EventToReactiveCommand.cs</Link>
-    </Compile>
-    <Compile Include="..\ReactiveProperty.Platform.NET46\Interactivity\EventToReactiveProperty.cs">
-      <Link>Interactivity\EventToReactiveProperty.cs</Link>
-    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -116,6 +101,7 @@
       <Name>ReactiveProperty.Portable</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\ReactiveProperty.Platform.Shared\ReactiveProperty.Platform.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />

diff --git a/Source/ReactiveProperty.Platform.NET46/ReactiveProperty.Platform.NET46.csproj b/Source/ReactiveProperty.Platform.NET46/ReactiveProperty.Platform.NET46.csproj
@@ -148,11 +148,6 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Extensions\DependencyObjectExtensions.cs" />
-    <Compile Include="Extensions\ObserveEveryValueChangedExtensions.cs" />
-    <Compile Include="Interactivity\EventToReactive.cs" />
-    <Compile Include="Interactivity\EventToReactiveCommand.cs" />
-    <Compile Include="Interactivity\EventToReactiveProperty.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>
@@ -184,6 +179,7 @@
       <Name>ReactiveProperty.Portable</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\ReactiveProperty.Platform.Shared\ReactiveProperty.Platform.Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.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.

diff --git a/.../Extensions/DependencyObjectExtensions.cs → .../Extensions/DependencyObjectExtensions.cs b/.../Extensions/DependencyObjectExtensions.cs → .../Extensions/DependencyObjectExtensions.cs
diff --git a/...ons/ObserveEveryValueChangedExtensions.cs → ...ons/ObserveEveryValueChangedExtensions.cs b/...ons/ObserveEveryValueChangedExtensions.cs → ...ons/ObserveEveryValueChangedExtensions.cs
@@ -1,4 +1,5 @@
-using System;
+#if !WINDOWS_UWP
+using System;
 using System.Collections.Generic;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
@@ -87,3 +88,4 @@ public static class ObserveEveryValueChangedExtensions
         }
     }
 }
+#endif
diff --git a/...rm.NET46/Interactivity/EventToReactive.cs → ...m.Shared/Interactivity/EventToReactive.cs b/...rm.NET46/Interactivity/EventToReactive.cs → ...m.Shared/Interactivity/EventToReactive.cs
diff --git a/...6/Interactivity/EventToReactiveCommand.cs → ...d/Interactivity/EventToReactiveCommand.cs b/...6/Interactivity/EventToReactiveCommand.cs → ...d/Interactivity/EventToReactiveCommand.cs
diff --git a/.../Interactivity/EventToReactiveProperty.cs → .../Interactivity/EventToReactiveProperty.cs b/.../Interactivity/EventToReactiveProperty.cs → .../Interactivity/EventToReactiveProperty.cs
diff --git a/Source/ReactiveProperty.Platform.Shared/ReactiveProperty.Platform.Shared.projitems b/Source/ReactiveProperty.Platform.Shared/ReactiveProperty.Platform.Shared.projitems
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>523e5506-24df-44ca-83cc-6aa02454f150</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>ReactiveProperty</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\DependencyObjectExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\ObserveEveryValueChangedExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventToReactive.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventToReactiveCommand.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Interactivity\EventToReactiveProperty.cs" />
+  </ItemGroup>
+</Project>
diff --git a/Source/ReactiveProperty.Platform.Shared/ReactiveProperty.Platform.Shared.shproj b/Source/ReactiveProperty.Platform.Shared/ReactiveProperty.Platform.Shared.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>523e5506-24df-44ca-83cc-6aa02454f150</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="ReactiveProperty.Platform.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/Source/ReactiveProperty.Platform.UWP/ReactiveProperty.Platform.UWP.csproj b/Source/ReactiveProperty.Platform.UWP/ReactiveProperty.Platform.UWP.csproj
@@ -109,9 +109,6 @@
     <None Include="project.json" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\ReactiveProperty.Platform.NET46\Extensions\DependencyObjectExtensions.cs">
-      <Link>Extensions\DependencyObjectExtensions.cs</Link>
-    </Compile>
     <Compile Include="Interactivity\Behavior.cs" />
     <Compile Include="Interactivity\Behavior.Internal.cs" />
     <Compile Include="Interactivity\ConditionBehavior.cs" />
@@ -131,6 +128,7 @@
       <Name>ReactiveProperty.Portable</Name>
     </ProjectReference>
   </ItemGroup>
+  <Import Project="..\ReactiveProperty.Platform.Shared\ReactiveProperty.Platform.Shared.projitems" Label="Shared" />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>