Merge pull request #1726 from MvvmCross/bugfix/nuspec_derpage

Fix nuspec derpage

MvvmCross/Test/Test.Core/MvvmCross.Test.Core.csproj

@@ -22,7 +22,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\Debug\Mvx\Portable</OutputPath>
+    <OutputPath>..\..\..\bin\Release\Mvx\Portable</OutputPath>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>

MvvmCross/Windows/Wpf/MvvmCross.Wpf.csproj

@@ -34,9 +34,7 @@
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Interactivity, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Expression.Blend.Sdk3.1.0.1340.1\lib\net35\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Windows.Presentation" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
@@ -76,9 +74,6 @@
       <Name>MvvmCross.Core</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <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.

build.cake

@@ -78,6 +78,9 @@ Task("GitLink")
 	.IsDependentOn("Build")
 	//pdbstr.exe and costura are not xplat currently
 	.WithCriteria(() => IsRunningOnWindows())
+	.WithCriteria(() => 
+		StringComparer.OrdinalIgnoreCase.Equals(versionInfo.BranchName, "develop") || 
+		IsMasterOrReleases())
 	.Does(() => 
 {
 	var projectsToIgnore = new string[] {
@@ -129,6 +132,9 @@ Task("GitLink")
 
 Task("Package")
 	.IsDependentOn("GitLink")
+	.WithCriteria(() => 
+		StringComparer.OrdinalIgnoreCase.Equals(versionInfo.BranchName, "develop") || 
+		IsMasterOrReleases())
 	.Does(() => 
 {
 	var nugetSettings = new NuGetPackSettings {

nuspec/MvvmCross.Console.Platform.nuspec

@@ -15,17 +15,7 @@ This package contains the Console 'MvvmCross Library' assemblies for MvvmCross
 		</dependencies>
 	</metadata>
 	<files>		
-		<!-- PCL -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Core.*" target="lib\portable-net45+win+wpa81+wp80" />
-
-		<!-- dotnet -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Core.*" target="lib\dotnet" />
-
 		<!-- console -->
 		<file src="..\bin\Release\Mvx\Console\MvvmCross.Console.*" target="lib\net45" />
-
-		<!-- console - PCL -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Core.dll" target="lib\net45\MvvmCross.Core.dll" />
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Core.pdb" target="lib\net45\MvvmCross.Core.pdb" />
 	</files>
 </package>

nuspec/MvvmCross.Core.nuspec

@@ -14,10 +14,6 @@ This package contains the 'Core' libraries for MvvmCross
 			<group>
 				<dependency id="MvvmCross.Platform" version="[$version$]" />
 			</group>
-			<group targetFramework=".NETFramework4.5">
-				<dependency id="MvvmCross.Platform" version="[$version$]" />
-				<dependency id="Expression.Blend.Sdk3" version="1.0.1340.1" />
-			</group>
 		</dependencies>
 	</metadata>
 	<files>		
@@ -41,13 +37,14 @@ This package contains the 'Core' libraries for MvvmCross
 		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Core.pdb" target="lib\uap10.0" />
 
 		<!-- droid -->
-		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.*"
-			exclude="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Full*" target="lib\MonoAndroid" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.dll" target="lib\MonoAndroid" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.pdb" target="lib\MonoAndroid" />
 		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Core.dll" target="lib\MonoAndroid" />
 		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Core.pdb" target="lib\MonoAndroid" />
 
 		<!-- iOS -->
-		<file src="..\bin\Release\Mvx\iOS\MvvmCross.iOS.*" target="lib\Xamarin.iOS10" />
+		<file src="..\bin\Release\Mvx\iOS\MvvmCross.iOS.dll" target="lib\Xamarin.iOS10" />
+		<file src="..\bin\Release\Mvx\iOS\MvvmCross.iOS.pdb" target="lib\Xamarin.iOS10" />
 		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Core.dll" target="lib\Xamarin.iOS10" />
 		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Core.pdb" target="lib\Xamarin.iOS10" />
 

nuspec/MvvmCross.Droid.Support.Core.UI.nuspec

@@ -16,7 +16,7 @@ This package contains Support Core UI support for MvvmCross.</description>
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\bin\Release\MvvmCross.Droid.Support.Core.UI.*" target="lib\MonoAndroid70" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Support.Core.UI.*" target="lib\MonoAndroid70" />
 	</files>
 </package>
 

nuspec/MvvmCross.Droid.Support.Core.Utils.nuspec

@@ -16,6 +16,6 @@ This package contains Support Core Util support for MvvmCross.</description>
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\bin\Release\MvvmCross.Droid.Support.Core.Utils.*" target="lib\MonoAndroid70" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Support.Core.Utils.*" target="lib\MonoAndroid70" />
 	</files>
 </package>

nuspec/MvvmCross.Droid.Support.Design.nuspec

@@ -18,7 +18,7 @@ This package contains Support v7 Design support for MvvmCross.</description>
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\bin\Release\MvvmCross.Droid.Support.Design.*" target="lib\MonoAndroid70" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Support.Design.*" target="lib\MonoAndroid70" />
 	</files>
 </package>
 

nuspec/MvvmCross.Droid.Support.Fragment.nuspec

@@ -16,7 +16,7 @@ This package contains Support Fragment support for MvvmCross.</description>
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\bin\Release\MvvmCross.Droid.Support.Fragment.*" target="lib\MonoAndroid70" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Support.Fragment.*" target="lib\MonoAndroid70" />
 	</files>
 </package>
 

nuspec/MvvmCross.Droid.Support.V14.Preference.nuspec

@@ -20,7 +20,7 @@ This package contains Support v7 Preference support for MvvmCross.</description>
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\bin\Release\MvvmCross.Droid.Support.V14.Preference.*" target="lib\MonoAndroid70" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Support.V14.Preference.*" target="lib\MonoAndroid70" />
 	</files>
 </package>
 

nuspec/MvvmCross.Droid.Support.V17.Leanback.nuspec

@@ -25,7 +25,7 @@ This package contains Support v17 Leanback support for MvvmCross.
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\bin\Release\MvvmCross.Droid.Support.V17.Leanback.*" target="lib\MonoAndroid70" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Support.V17.Leanback.*" target="lib\MonoAndroid70" />
 	</files>
 </package>
 

nuspec/MvvmCross.Droid.Support.V7.AppCompat.nuspec

@@ -19,7 +19,7 @@ This package contains Support v7 AppCompat support for MvvmCross.</description>
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\bin\Release\MvvmCross.Droid.Support.V7.AppCompat.*" target="lib\MonoAndroid70" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Support.V7.AppCompat.*" target="lib\MonoAndroid70" />
 	</files>
 </package>
 

nuspec/MvvmCross.Droid.Support.V7.Preference.nuspec

@@ -20,6 +20,6 @@ This package contains Support v7 Preference support for MvvmCross.</description>
 		</dependencies>
 	</metadata>
 	<files>
-		<file src="..\bin\Release\MvvmCross.Droid.Support.V7.Preference.*" target="lib\MonoAndroid70" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Support.V7.Preference.*" target="lib\MonoAndroid70" />
 	</files>
 </package>

nuspec/MvvmCross.Droid.Support.V7.RecyclerView.nuspec

@@ -17,6 +17,6 @@ This package contains Support v7 RecyclerView support for MvvmCross.</descriptio
 		</releaseNotes>
 	</metadata>
 	<files>
-		<file src="..\bin\Release\MvvmCross.Droid.Support.V7.RecyclerView.*" target="lib\MonoAndroid70" />
+		<file src="..\bin\Release\Mvx\Droid\MvvmCross.Droid.Support.V7.RecyclerView.*" target="lib\MonoAndroid70" />
 	</files>
 </package>

nuspec/MvvmCross.Plugin.All.nuspec

@@ -31,32 +31,32 @@ This package contains all plugins for MvvmCross</description>
 	</metadata>
 	<files>		
 		<!-- PCL -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\portable-win+net45+wp8+win8+wpa81\MvvmCross.Plugins.All.dll" />
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\portable-win+net45+wp8+win8+wpa81\MvvmCross.Plugins.All.pdb" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\portable-win+net45+wp8+win8+wpa81" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\portable-win+net45+wp8+win8+wpa81" />
 
 		<!-- dotnet -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\dotnet\MvvmCross.Plugins.All.dll" />
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\dotnet\MvvmCross.Plugins.All.pdb" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\dotnet" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\dotnet" />
 
 		<!-- wpf -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\net45\MvvmCross.Plugins.All.dll" />
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\net45\MvvmCross.Plugins.All.pdb" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\net45" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\net45" />
 
 		<!-- uap -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\uap10.0\MvvmCross.Plugins.All.dll" />
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\uap10.0\MvvmCross.Plugins.All.pdb" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\uap10.0" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\uap10.0" />
 
 		<!-- droid -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\MonoAndroid\MvvmCross.Plugins.All.dll" />
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\MonoAndroid\MvvmCross.Plugins.All.pdb" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\MonoAndroid" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\MonoAndroid" />
 
 		<!-- iOS -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\Xamarin.iOS10\MvvmCross.Plugins.All.dll" />
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\Xamarin.iOS10\MvvmCross.Plugins.All.pdb" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\Xamarin.iOS10" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\Xamarin.iOS10" />
 
 		<!-- mac -->
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\Xamarin.Mac20\MvvmCross.Plugins.All.dll" />
-		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\Xamarin.Mac20\MvvmCross.Plugins.All.pdb" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.dll" target="lib\Xamarin.Mac20" />
+		<file src="..\bin\Release\Mvx\Portable\MvvmCross.Plugins.All.pdb" target="lib\Xamarin.Mac20" />
 
 	</files>
 </package>