Merge pull request #4 from timotei/Net40-support

Fix the Winforms and testing .NET 4.0 projects
gluck · Jun 26, 2015 · 1d4bad6 · 1d4bad6
2 parents 2549a99 + 384f92b
commit 1d4bad6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/ReactiveUI.Testing/ReactiveUI.Testing_Net40.csproj b/ReactiveUI.Testing/ReactiveUI.Testing_Net40.csproj
@@ -121,15 +121,15 @@
   <ItemGroup>
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.ReactiveUI.Testing_Net40.config" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net40.csproj">
-      <Project>{1ce2d235-8072-4649-ba5a-cfb1af8776e0}</Project>
+      <Project>{6d40d92b-5241-478e-8084-24ccf3c83bd6}</Project>
       <Name>ReactiveUI_Net40</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.ReactiveUI.Testing_Net40.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

diff --git a/ReactiveUI.Winforms/ReactiveUI.Winforms_Net40.csproj b/ReactiveUI.Winforms/ReactiveUI.Winforms_Net40.csproj
@@ -133,7 +133,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ReactiveUI\ReactiveUI_Net40.csproj">
-      <Project>{1ce2d235-8072-4649-ba5a-cfb1af8776e0}</Project>
+      <Project>{6d40d92b-5241-478e-8084-24ccf3c83bd6}</Project>
       <Name>ReactiveUI_Net40</Name>
     </ProjectReference>
   </ItemGroup>

diff --git a/ReactiveUI.Winforms/ReactiveUI.Winforms_Net45.csproj b/ReactiveUI.Winforms/ReactiveUI.Winforms_Net45.csproj
@@ -110,7 +110,6 @@
     <Compile Include="Winforms\WinformsDefaultPropertyBinding.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="packages.ReactiveUI.Winforms_Net45.config" />
     <Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
   </ItemGroup>