From bf0467f5a1e9f98d2b5fec6b9fd7c87ea5e9c8fc Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Fri, 10 Feb 2017 16:55:16 +0100
Subject: [PATCH] Fixed nuspec dependencies between Tapeti packages

---
 Publish.ps1                                   | 34 ++++++++++++-------
 Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec        |  4 +++
 Tapeti.Flow/Tapeti.Flow.nuspec                |  4 +++
 .../Tapeti.SimpleInjector.nuspec              |  3 ++
 Tapeti/Tapeti.nuspec                          |  3 ++
 5 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/Publish.ps1 b/Publish.ps1
index 341b1cc..417e532 100644
--- a/Publish.ps1
+++ b/Publish.ps1
@@ -1,3 +1,5 @@
+param([switch]$nopush = "nopush")
+
 New-Item -Path publish -Type directory -Force | Out-Null
 
 $version = GitVersion.exe | Out-String | ConvertFrom-Json
@@ -8,27 +10,33 @@ Write-Host "Publishing version $($version.NuGetVersion) using API key $($nugetke
 
 
 Write-Host "Packing Tapeti.Annotations.csproj" -Foreground Blue
-NuGet.exe pack Tapeti\Tapeti.Annotations.csproj -OutputDir publish -Version $version.NuGetVersion
+NuGet.exe pack Tapeti.Annotations\Tapeti.Annotations.csproj -OutputDir publish -Version $version.NuGetVersion -Properties depversion="$($version.NuGetVersion)"
 
 Write-Host "Packing Tapeti.csproj" -Foreground Blue
-NuGet.exe pack Tapeti\Tapeti.csproj -OutputDir publish -Version $version.NuGetVersion
+NuGet.exe pack Tapeti\Tapeti.csproj -OutputDir publish -Version $version.NuGetVersion -Properties depversion="$($version.NuGetVersion)"
 
 Write-Host "Packing Tapeti.Flow.csproj" -Foreground Blue
-NuGet.exe pack Tapeti.Flow\Tapeti.Flow.csproj -OutputDir publish -Version $version.NuGetVersion
+NuGet.exe pack Tapeti.Flow\Tapeti.Flow.csproj -OutputDir publish -Version $version.NuGetVersion -Properties depversion="$($version.NuGetVersion)"
 
 Write-Host "Packing Tapeti.SimpleInjector.csproj" -Foreground Blue
-NuGet.exe pack Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj -OutputDir publish -Version $version.NuGetVersion
+NuGet.exe pack Tapeti.SimpleInjector\Tapeti.SimpleInjector.csproj -OutputDir publish -Version $version.NuGetVersion -Properties depversion="$($version.NuGetVersion)"
 
 
+if ($nopush -eq $false)
+{
+  Write-Host "Pushing Tapeti.Annotations.csproj" -Foreground Blue
+  NuGet.exe push publish\X2Software.Tapeti.Annotations.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
 
-Write-Host "Pushing Tapeti.Annotations.csproj" -Foreground Blue
-NuGet.exe push publish\X2Software.Tapeti.Annotations.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
+  Write-Host "Pushing Tapeti.csproj" -Foreground Blue
+  NuGet.exe push publish\X2Software.Tapeti.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
 
-Write-Host "Pushing Tapeti.csproj" -Foreground Blue
-NuGet.exe push publish\X2Software.Tapeti.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
+  Write-Host "Pushing Tapeti.Flow.csproj" -Foreground Blue
+  NuGet.exe push publish\X2Software.Tapeti.Flow.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
 
-Write-Host "Pushing Tapeti.Flow.csproj" -Foreground Blue
-NuGet.exe push publish\X2Software.Tapeti.Flow.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
-
-Write-Host "Pushing Tapeti.SimpleInjector.csproj" -Foreground Blue
-NuGet.exe push publish\X2Software.Tapeti.SimpleInjector.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
+  Write-Host "Pushing Tapeti.SimpleInjector.csproj" -Foreground Blue
+  NuGet.exe push publish\X2Software.Tapeti.SimpleInjector.$($version.NuGetVersion).nupkg -apikey $nugetkey -Source https://www.nuget.org/api/v2/package
+}
+else
+{
+  Write-Host "Skipping push" -Foreground Blue
+}
\ No newline at end of file
diff --git a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec
index 22ac4c0..6edf2b8 100644
--- a/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec
+++ b/Tapeti.Flow.SQL/Tapeti.Flow.SQL.nuspec
@@ -12,5 +12,9 @@
     <description>SQL backing repository for the Tapeti Flow package</description>
     <copyright></copyright>
     <tags>rabbitmq tapeti sql</tags>
+    <dependencies>
+      <dependency id="X2Software.Tapeti" version="[$depversion$]" />
+      <dependency id="X2Software.Tapeti.Flow" version="[$depversion$]" />
+    </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/Tapeti.Flow/Tapeti.Flow.nuspec b/Tapeti.Flow/Tapeti.Flow.nuspec
index 6790a44..eeb40d0 100644
--- a/Tapeti.Flow/Tapeti.Flow.nuspec
+++ b/Tapeti.Flow/Tapeti.Flow.nuspec
@@ -12,5 +12,9 @@
     <description>Flow extension for Tapeti</description>
     <copyright></copyright>
     <tags>rabbitmq tapeti flow</tags>
+    <dependencies>
+      <dependency id="X2Software.Tapeti" version="[$depversion$]" />
+      <dependency id="X2Software.Tapeti.Annotations" version="[$depversion$]" />
+    </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec
index 9da5b38..dd4aa82 100644
--- a/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec
+++ b/Tapeti.SimpleInjector/Tapeti.SimpleInjector.nuspec
@@ -12,5 +12,8 @@
     <description>SimpleInjector integration package for Tapeti</description>
     <copyright></copyright>
     <tags>rabbitmq tapeti simpleinjector</tags>
+    <dependencies>
+      <dependency id="X2Software.Tapeti" version="[$depversion$]" />
+    </dependencies>
   </metadata>
 </package>
\ No newline at end of file
diff --git a/Tapeti/Tapeti.nuspec b/Tapeti/Tapeti.nuspec
index 045367c..97376f0 100644
--- a/Tapeti/Tapeti.nuspec
+++ b/Tapeti/Tapeti.nuspec
@@ -12,5 +12,8 @@
     <description>Controller-based framework for RabbitMQ microservice architectures</description>
     <copyright></copyright>
     <tags>rabbitmq tapeti</tags>
+    <dependencies>
+      <dependency id="X2Software.Tapeti.Annotations" version="[$depversion$]" />
+    </dependencies>
   </metadata>
 </package>
\ No newline at end of file