Fix publishing nuget packages, add batch files to execute msbuild mor…

…e easily
picoe · Apr 13, 2014 · 6fadb5f · 6fadb5f
1 parent 19c2725
commit 6fadb5f
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 5 deletions.
diff --git a/Resources/Publish.targets b/Resources/Publish.targets
@@ -26,15 +26,17 @@
     	<MSBuild Targets="BuildPackage" Properties="ProjectPath=..\Source\Eto.Sample\Eto.Forms.Sample.nuspec;TargetDir=$(TargetDir);NugetBuildOptions=-Version $(AssemblyInformationalVersion)" Projects="$(MSBuildProjectFile)"/>
     </Target>
     <Target Name="Publish">
-    	<MSBuild Projects="..\Source\Eto\Eto.csproj" Targets="PublishPackage" Properties="Configuration=$(Configuration)" />
-    	<MSBuild Projects="..\Source\Eto.Json\Eto.Json.csproj" Targets="PublishPackage" Properties="Configuration=$(Configuration)" />
+		<GetAssemblyInformationVersion AssemblyFileName="$(TargetDir)\Eto.dll">
+			<Output TaskParameter="AssemblyInformationalVersion" PropertyName="AssemblyInformationalVersion" />
+		</GetAssemblyInformationVersion>
+    	<MSBuild Projects="..\Source\Eto.Json\Eto.Json.csproj" Targets="PublishPackage" Properties="Configuration=$(Configuration);NupkgName=Eto.Forms.Json.$(AssemblyInformationalVersion).nupkg" />
     	<MSBuild Projects="..\Source\Eto.Platform.Gtk\Eto.Platform.Gtk.csproj" Targets="PublishPackage" Properties="Configuration=$(Configuration)" />
     	<MSBuild Projects="..\Source\Eto.Platform.Windows\Eto.Platform.Windows.csproj" Targets="PublishPackage" Properties="Configuration=$(Configuration)" />
     	<MSBuild Projects="..\Source\Eto.Platform.Wpf\Eto.Platform.Wpf.csproj" Targets="PublishPackage" Properties="Configuration=$(Configuration)" />
     	<MSBuild Projects="..\Source\Eto.Platform.Mac\Eto.Platform.Mac.csproj" Targets="PublishPackage" Properties="Configuration=$(Configuration)" />
     	<MSBuild Projects="..\Source\Eto.Platform.Direct2D\Eto.Platform.Direct2D.csproj" Targets="PublishPackage" Properties="Configuration=$(Configuration)" />
     	<MSBuild Projects="..\Source\Eto.Platform.Mac\Eto.Platform.XamMac.csproj" Targets="PublishPackage" Properties="Configuration=$(Configuration)" />
-    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Platform.Mac.Template.nuspec;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
-    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Forms.Sample.nuspec;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Platform.Mac.Template.$(AssemblyInformationalVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
+    	<MSBuild Targets="PublishPackage" Properties="NupkgName=Eto.Forms.Sample.$(AssemblyInformationalVersion).nupkg;TargetDir=$(TargetDir)" Projects="$(MSBuildProjectFile)"/>
     </Target>
 </Project>
diff --git a/Resources/package.cmd b/Resources/package.cmd
@@ -0,0 +1,7 @@
+echo off
+
+set MSBUILD=c:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe
+
+%MSBUILD% -t:Package Publish.targets
+
+pause
diff --git a/Resources/publish.cmd b/Resources/publish.cmd
@@ -0,0 +1,16 @@
+echo off
+
+SET /p ask=Are you sure you want to publish to nuget?
+if "%ask%"=="y" goto dopublish
+goto end
+
+:dopublish
+
+set MSBUILD=c:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe
+
+echo %MSBUILD% -t:Publish Publish.targets 
+
+:end
+
+
+pause
diff --git a/Source/.nuget/NuGet.targets b/Source/.nuget/NuGet.targets
@@ -15,7 +15,7 @@
         <!-- Download NuGet.exe if it does not already exist -->
         <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
         <BaseDir Condition="$(BaseDir) == '' Or $(BaseDir) == '*Undefined*'">$(ProjectDir)..</BaseDir>
-        <NugetBuildOptions Condition="$(NugetBuildOptions) == ''">-symbols</NugetBuildOptions>
+        <NugetBuildOptions Condition="$(NugetBuildOptions) == ''"></NugetBuildOptions>
     </PropertyGroup>
 
     <ItemGroup Condition=" '$(PackageSources)' == '' ">