fix dependency of StickyWindows.WPF to StickyWindows, see NuGet/Home#…

…5003
thoemmi · Apr 11, 2017 · 6f8c110 · 6f8c110
1 parent bf77eff
commit 6f8c110
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/src/StickyWindows.WPF/StickyWindows.WPF.csproj b/src/StickyWindows.WPF/StickyWindows.WPF.csproj
@@ -14,12 +14,7 @@
     <ProjectReference Include="..\StickyWindows\StickyWindows.csproj" />
   </ItemGroup>
 
-  <!-- GitVersion -->
-  <ItemGroup>
-    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0011">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
+  <Import Project="..\common.targets" />
 
   <!-- libraries used by all .NET versions -->
   <ItemGroup>

diff --git a/src/StickyWindows/StickyWindows.csproj b/src/StickyWindows/StickyWindows.csproj
@@ -7,11 +7,8 @@
     <Copyright>Copyright © Corneliu I. Tusnea, Riccardo Pietrucci, Thomas Freudenberg 2017</Copyright>
     <PackageTags>Window Sticky WinForms</PackageTags>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="GitVersionTask" Version="4.0.0-beta0011">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
+
+  <Import Project="..\common.targets" />
 
   <!-- libraries used by all .NET versions -->
   <ItemGroup>

diff --git a/src/common.targets b/src/common.targets
@@ -0,0 +1,20 @@
+<Project>
+  <!-- GitVersion version -->
+  <PropertyGroup>
+    <GitVersionTaskVersion>4.0.0-beta0011</GitVersionTaskVersion>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- reference GitVersionTask package -->
+    <PackageReference Include="GitVersionTask" Version="$(GitVersionTaskVersion)" PrivateAssets="All">
+  </ItemGroup>
+
+  <!--
+    Import GitVersionTask target
+    This ugly workaround is necessary because of this NuGet issue: https://github.com/NuGet/Home/issues/4790
+  -->
+  <ImportGroup Condition="'$(ExcludeRestorePackageImports)' == 'true'">
+    <Import Project="$(UserProfile)\.nuget\packages\gitversiontask\$(GitVersionTaskVersion)\buildMultiTargeting\GitVersionTask.targets" Condition="Exists('$(UserProfile)\.nuget\packages\gitversiontask\$(GitVersionTaskVersion)\buildMultiTargeting\GitVersionTask.targets')" />
+  </ImportGroup>
+  <Target Name="FixUpVersion" BeforeTargets="_GenerateRestoreProjectSpec" DependsOnTargets="GetVersion" />
+</Project>