Import the common target before the Silverlight and WP7 targets.

This ensures that changing the OutputPath to the artifacts directory works.
SignalR · Oct 17, 2012 · 3c62912 · 3c62912
1 parent c4bbd75
commit 3c62912
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...soft.AspNet.SignalR.Client.Silverlight/Microsoft.AspNet.SignalR.Client.Silverlight.csproj b/...soft.AspNet.SignalR.Client.Silverlight/Microsoft.AspNet.SignalR.Client.Silverlight.csproj
@@ -198,9 +198,9 @@
   </ItemGroup>
   <ItemGroup />
 
+  <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(LocalToolsPath)\Silverlight\v4.0\SignalR.Silverlight.targets"
           Condition="'$(LocalToolsPath)'!=''" />
-  <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets"
           Condition=" '$(LocalToolsPath)' == '' And Exists('$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets')" />
 

diff --git a/...ft.AspNet.SignalR.Client.Silverlight5/Microsoft.AspNet.SignalR.Client.Silverlight5.csproj b/...ft.AspNet.SignalR.Client.Silverlight5/Microsoft.AspNet.SignalR.Client.Silverlight5.csproj
@@ -198,9 +198,9 @@
     </None>
   </ItemGroup>
 
+  <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(LocalToolsPath)\Silverlight\v5.0\SignalR.Silverlight.targets"
           Condition="'$(LocalToolsPath)'!=''" />
-  <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets"
           Condition=" '$(LocalToolsPath)' == '' And Exists('$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets')" />
 

diff --git a/src/Microsoft.AspNet.SignalR.Client.WP7/Microsoft.AspNet.SignalR.Client.WP7.csproj b/src/Microsoft.AspNet.SignalR.Client.WP7/Microsoft.AspNet.SignalR.Client.WP7.csproj
@@ -199,9 +199,9 @@
 
   <!--<Import Project="C:\tools\WP7\SignalR.WP7.targets" />-->
 
+  <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(LocalToolsPath)\WP7\SignalR.WP7.targets"
           Condition=" '$(LocalToolsPath)' != '' " />
-  <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets"
           Condition=" '$(LocalToolsPath)' == '' And Exists('$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets')" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets"

diff --git a/src/Microsoft.AspNet.SignalR.Client.WP71/Microsoft.AspNet.SignalR.Client.WP71.csproj b/src/Microsoft.AspNet.SignalR.Client.WP71/Microsoft.AspNet.SignalR.Client.WP71.csproj
@@ -191,9 +191,9 @@
     <CompileTimeSolutionDir Condition="'$(MissingExternalDependenciesBlendDesignTimehack)'!='true'">$(SolutionDir)</CompileTimeSolutionDir>
     <CompileTimeSolutionDir Condition="'$(MissingExternalDependenciesBlendDesignTimehack)'=='true'">$(SolutionDir)..\</CompileTimeSolutionDir>
   </PropertyGroup>
+  <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(LocalToolsPath)\WP7\SignalR.WP71.targets"
           Condition="'$(LocalToolsPath)'!=''" />
-  <Import Project="..\Common\Microsoft.AspNet.SignalR.targets" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.$(TargetFrameworkProfile).Overrides.targets"
           Condition="'$(LocalToolsPath)'==''" />
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight for Phone\$(TargetFrameworkVersion)\Microsoft.Silverlight.CSharp.targets"