WIP on factoring x64 and x86 out as parameter to *.nuspec files

yuanzp · Jun 20, 2014 · a58ef26 · a58ef26
1 parent 5c6d13b
commit a58ef26
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/NuGet/CefSharp.Common.nuspec b/NuGet/CefSharp.Common.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>CefSharp.Common</id>
+    <id>CefSharp.Common$DotPlatform$</id>
     <version>$version$</version>
     <authors>The CefSharp Authors</authors>
     <owners>The CefSharp Authors</owners>
@@ -12,7 +12,7 @@
     <tags>chrome browser</tags>
     <copyright>Copyright © 2010-2014 The CefSharp Authors</copyright>
     <dependencies>
-      <dependency id="cef.redist" version="[3.1650.1562-pre3,3.1651)" />
+      <dependency id="cef.redist$DotPlatform$" version="[3.1650.1562-pre3,3.1651)" />
     </dependencies>
 </metadata>
   <files>
@@ -24,7 +24,7 @@
     <file src="..\CefSharp.BrowserSubprocess\bin\x86\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\x86"/>
     <file src="..\CefSharp.BrowserSubprocess\bin\x64\Release\CefSharp.BrowserSubprocess.exe" target="CefSharp\x64"/>
 
-    <file src="CefSharp.Common.props" target="build" />
-    <file src="CefSharp.Common.targets" target="build" />
+    <file src="CefSharp.Common.props" target="build\CefSharp.Common$DotPlatform$.props" />
+    <file src="CefSharp.Common.targets" target="build\CefSharp.Common$DotPlatform$.targets" />
   </files>
 </package>
diff --git a/NuGet/CefSharp.Wpf.nuspec b/NuGet/CefSharp.Wpf.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>CefSharp.Wpf</id>
+    <id>CefSharp.Wpf$DotPlatform$</id>
     <version>$version$</version>
     <authors>The CefSharp Authors</authors>
     <owners>The CefSharp Authors</owners>
@@ -12,7 +12,7 @@
     <tags>wpf chrome browser</tags>
     <copyright>Copyright © 2010-2014 The CefSharp Authors</copyright>
     <dependencies>
-      <dependency id="CefSharp.Common" version="[$version$]" />
+      <dependency id="CefSharp.Common$DotPlatform$" version="[$version$]" />
     </dependencies>
   </metadata>
   <files>
@@ -21,6 +21,6 @@
     <file src="..\CefSharp.Wpf\bin\x86\Release\CefSharp.Wpf.dll" target="CefSharp\x86" />
     <file src="..\CefSharp.Wpf\bin\x64\Release\CefSharp.Wpf.dll" target="CefSharp\x64" />
 
-    <file src="CefSharp.Wpf.props" target="build" />
+    <file src="CefSharp.Wpf.props" target="build\CefSharp.Wpf$DotPlatform$.props" />
   </files>
 </package>
diff --git a/NuGet/pack.bat b/NuGet/pack.bat
@@ -1,4 +1,9 @@
-set version=31.0.0-pre1
-NuGet pack CefSharp.Common.nuspec -NoPackageAnalysis -Version %version%
-NuGet pack CefSharp.Wpf.nuspec -NoPackageAnalysis -Version %version%
+set version=31.0.0-pre1a
+NuGet pack CefSharp.Common.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=
+NuGet pack CefSharp.Common.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=.x86
+NuGet pack CefSharp.Common.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=.x64
+NuGet pack CefSharp.Wpf.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=
+NuGet pack CefSharp.Wpf.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=.x86
+NuGet pack CefSharp.Wpf.nuspec -NoPackageAnalysis -Version %version% -Properties DotPlatform=.x64
 rem NuGet pack CefSharp.WinForms.nuspec -NoPackageAnalysis -Version %version%
+pause