Sun Oct 7 05:11:32 PDT 2012

Author: jng
Date: 2012-10-07 05:11:31 -0700 (Sun, 07 Oct 2012)
New Revision: 7087

Added:
   branches/2.4/MgDev/Desktop/samples_exclude.txt
   branches/2.4/MgDev/nuget/BatchSubstitute.bat
   branches/2.4/MgDev/nuget/mapguide-api-base.nuspec.tpl
   branches/2.4/MgDev/nuget/mapguide-api-web.nuspec.tpl
   branches/2.4/MgDev/nuget/mg-desktop-net40.nuspec.tpl
   branches/2.4/MgDev/nuget/mg-desktop-viewer-net40.nuspec.tpl
   branches/2.4/MgDev/nuget/x64/
   branches/2.4/MgDev/nuget/x64/api-base/
   branches/2.4/MgDev/nuget/x64/api-base/content/
   branches/2.4/MgDev/nuget/x64/api-base/content/net40/
   branches/2.4/MgDev/nuget/x64/api-base/content/net40/mapguide-api-base/
   branches/2.4/MgDev/nuget/x64/api-base/lib/
   branches/2.4/MgDev/nuget/x64/api-base/lib/net40/
   branches/2.4/MgDev/nuget/x64/api-base/tools/
   branches/2.4/MgDev/nuget/x64/api-base/tools/net40/
   branches/2.4/MgDev/nuget/x64/api-base/tools/net40/GetMgApiBasePostBuildCmd.ps1
   branches/2.4/MgDev/nuget/x64/api-base/tools/net40/install.ps1
   branches/2.4/MgDev/nuget/x64/api-base/tools/net40/uninstall.ps1
   branches/2.4/MgDev/nuget/x64/api-desktop-viewer/
   branches/2.4/MgDev/nuget/x64/api-desktop-viewer/lib/
   branches/2.4/MgDev/nuget/x64/api-desktop-viewer/lib/net40/
   branches/2.4/MgDev/nuget/x64/api-desktop-viewer/tools/
   branches/2.4/MgDev/nuget/x64/api-desktop-viewer/tools/net40/
   branches/2.4/MgDev/nuget/x64/api-desktop/
   branches/2.4/MgDev/nuget/x64/api-desktop/content/
   branches/2.4/MgDev/nuget/x64/api-desktop/content/net40/
   branches/2.4/MgDev/nuget/x64/api-desktop/content/net40/mg-desktop/
   branches/2.4/MgDev/nuget/x64/api-desktop/lib/
   branches/2.4/MgDev/nuget/x64/api-desktop/lib/net40/
   branches/2.4/MgDev/nuget/x64/api-desktop/tools/
   branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/
   branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/GetMgDesktopPostBuildCmd.ps1
   branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/install.ps1
   branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/uninstall.ps1
   branches/2.4/MgDev/nuget/x64/api-web/
   branches/2.4/MgDev/nuget/x64/api-web/content/
   branches/2.4/MgDev/nuget/x64/api-web/content/net40/
   branches/2.4/MgDev/nuget/x64/api-web/content/net40/mapguide-api-web/
   branches/2.4/MgDev/nuget/x64/api-web/lib/
   branches/2.4/MgDev/nuget/x64/api-web/lib/net40/
   branches/2.4/MgDev/nuget/x64/api-web/tools/
   branches/2.4/MgDev/nuget/x64/api-web/tools/net40/
   branches/2.4/MgDev/nuget/x64/api-web/tools/net40/GetMgWebApiPostBuildCmd.ps1
   branches/2.4/MgDev/nuget/x64/api-web/tools/net40/install.ps1
   branches/2.4/MgDev/nuget/x64/api-web/tools/net40/uninstall.ps1
   branches/2.4/MgDev/nuget/x86/
   branches/2.4/MgDev/nuget/x86/api-base/
   branches/2.4/MgDev/nuget/x86/api-desktop-viewer/
   branches/2.4/MgDev/nuget/x86/api-desktop/
   branches/2.4/MgDev/nuget/x86/api-web/
Removed:
   branches/2.4/MgDev/nuget/api-base/
   branches/2.4/MgDev/nuget/api-desktop-viewer/
   branches/2.4/MgDev/nuget/api-desktop/
   branches/2.4/MgDev/nuget/api-web/
   branches/2.4/MgDev/nuget/mapguide-api-base.nuspec
   branches/2.4/MgDev/nuget/mapguide-api-web.nuspec
   branches/2.4/MgDev/nuget/mg-desktop-net40.nuspec
   branches/2.4/MgDev/nuget/mg-desktop-viewer-net40.nuspec
   branches/2.4/MgDev/samples_exclude.txt
Modified:
   branches/2.4/MgDev/base_package_excludes.txt
   branches/2.4/MgDev/build_desktop.bat
   branches/2.4/MgDev/desktop_package_excludes.txt
   branches/2.4/MgDev/nuget_pack.bat
   branches/2.4/MgDev/nuget_prepare.bat
   branches/2.4/MgDev/package_excludes.txt
Log:
Split nuget packages to architecture-specific packages

Copied: branches/2.4/MgDev/Desktop/samples_exclude.txt (from rev 7086, branches/2.4/MgDev/samples_exclude.txt)
===================================================================

--- branches/2.4/MgDev/Desktop/samples_exclude.txt	                        (rev 0)
+++ branches/2.4/MgDev/Desktop/samples_exclude.txt	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,6 @@
+bin
+obj
+Lib
+.svn
+_svn
+.suo
\ No newline at end of file

Modified: branches/2.4/MgDev/base_package_excludes.txt
===================================================================
--- branches/2.4/MgDev/base_package_excludes.txt	2012-10-07 10:07:07 UTC (rev 7086)
+++ branches/2.4/MgDev/base_package_excludes.txt	2012-10-07 12:11:31 UTC (rev 7087)
@@ -22,6 +22,9 @@
 OSGeo.MapGuide.Foundation.dll
 OSGeo.MapGuide.Geometry.dll
 OSGeo.MapGuide.PlatformBase.dll
+OSGeo.MapGuide.Foundation.xml
+OSGeo.MapGuide.Geometry.xml
+OSGeo.MapGuide.PlatformBase.xml
 maestroapi.key
 DotNetHarness.exe
 DotNetHarness.exe.config

Modified: branches/2.4/MgDev/build_desktop.bat
===================================================================
--- branches/2.4/MgDev/build_desktop.bat	2012-10-07 10:07:07 UTC (rev 7086)
+++ branches/2.4/MgDev/build_desktop.bat	2012-10-07 12:11:31 UTC (rev 7087)
@@ -35,9 +35,10 @@
 echo [install]: binaries
 %XCOPY% "Desktop\bin\%TYPEBUILD%" "%MG_OUTPUT_DESKTOP%" /EXCLUDE:svn_excludes.txt+%CONFIGURATION%_excludes.txt
 pushd "%MG_OUTPUT_DESKTOP%"
-del MgMapGuideCommon.dll
-del OSGeo.MapGuide.MapGuideCommon.xml
-rd /S /Q Backup
+if exist MgMapGuideCommon.dll del MgMapGuideCommon.dll
+if exist OSGeo.MapGuide.MapGuideCommon.xml del OSGeo.MapGuide.MapGuideCommon.xml
+if exist OSGeo.MapGuide.Web.xml del OSGeo.MapGuide.Web.xml
+if exist Backup rd /S /Q Backup
 popd
 echo [install]: Samples
 pushd Desktop

Modified: branches/2.4/MgDev/desktop_package_excludes.txt
===================================================================
--- branches/2.4/MgDev/desktop_package_excludes.txt	2012-10-07 10:07:07 UTC (rev 7086)
+++ branches/2.4/MgDev/desktop_package_excludes.txt	2012-10-07 12:11:31 UTC (rev 7087)
@@ -1,6 +1,5 @@
 Backup
 Logs
-Schema
 Temp
 Repositories
 Dictionaries

Added: branches/2.4/MgDev/nuget/BatchSubstitute.bat
===================================================================
--- branches/2.4/MgDev/nuget/BatchSubstitute.bat	                        (rev 0)
+++ branches/2.4/MgDev/nuget/BatchSubstitute.bat	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,20 @@
+ at echo off
+REM -- Prepare the Command Processor --
+SETLOCAL ENABLEEXTENSIONS
+SETLOCAL DISABLEDELAYEDEXPANSION
+
+::BatchSubstitude - parses a File line by line and replaces a substring"
+::syntax: BatchSubstitude.bat OldStr NewStr File
+::          OldStr [in] - string to be replaced
+::          NewStr [in] - string to replace with
+::          File   [in] - file to be parsed
+:$changed 20100115
+:$source http://www.dostips.com
+if "%~1"=="" findstr "^::" "%~f0"&GOTO:EOF
+for /f "tokens=1,* delims=]" %%A in ('"type %3|find /n /v """') do (
+    set "line=%%B"
+    if defined line (
+        call set "line=echo.%%line:%~1=%~2%%"
+        for /f "delims=" %%X in ('"echo."%%line%%""') do %%~X
+    ) ELSE echo.
+)
\ No newline at end of file

Deleted: branches/2.4/MgDev/nuget/mapguide-api-base.nuspec
===================================================================
(Binary files differ)

Copied: branches/2.4/MgDev/nuget/mapguide-api-base.nuspec.tpl (from rev 7086, branches/2.4/MgDev/nuget/mapguide-api-base.nuspec)
===================================================================
(Binary files differ)

Deleted: branches/2.4/MgDev/nuget/mapguide-api-web.nuspec
===================================================================
(Binary files differ)

Copied: branches/2.4/MgDev/nuget/mapguide-api-web.nuspec.tpl (from rev 7086, branches/2.4/MgDev/nuget/mapguide-api-web.nuspec)
===================================================================
(Binary files differ)

Deleted: branches/2.4/MgDev/nuget/mg-desktop-net40.nuspec
===================================================================
(Binary files differ)

Copied: branches/2.4/MgDev/nuget/mg-desktop-net40.nuspec.tpl (from rev 7086, branches/2.4/MgDev/nuget/mg-desktop-net40.nuspec)
===================================================================
(Binary files differ)

Deleted: branches/2.4/MgDev/nuget/mg-desktop-viewer-net40.nuspec
===================================================================
(Binary files differ)

Copied: branches/2.4/MgDev/nuget/mg-desktop-viewer-net40.nuspec.tpl (from rev 7086, branches/2.4/MgDev/nuget/mg-desktop-viewer-net40.nuspec)
===================================================================
(Binary files differ)


Property changes on: branches/2.4/MgDev/nuget/x64
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-base
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-base/content
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-base/content/net40
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-base/content/net40/mapguide-api-base
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-base/lib
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-base/lib/net40
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-base/tools
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-base/tools/net40
___________________________________________________________________
Added: bugtraq:number
   + true

Added: branches/2.4/MgDev/nuget/x64/api-base/tools/net40/GetMgApiBasePostBuildCmd.ps1
===================================================================
--- branches/2.4/MgDev/nuget/x64/api-base/tools/net40/GetMgApiBasePostBuildCmd.ps1	                        (rev 0)
+++ branches/2.4/MgDev/nuget/x64/api-base/tools/net40/GetMgApiBasePostBuildCmd.ps1	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,7 @@
+$solutionDir = [System.IO.Path]::GetDirectoryName($dte.Solution.FullName) + "\"
+$path = $installPath.Replace($solutionDir, "`$(SolutionDir)")
+
+$MgApiBasePostBuildCmd = "
+if not exist `"`$(TargetDir)Dictionaries`" md `"`$(TargetDir)Dictionaries`"
+xcopy /s /y `"`$(ProjectDir)mapguide-api-base\Dictionaries`" `"`$(TargetDir)Dictionaries`"
+copy /y `"`$(ProjectDir)mapguide-api-base\*.dll`" `"`$(TargetDir)`""
\ No newline at end of file

Added: branches/2.4/MgDev/nuget/x64/api-base/tools/net40/install.ps1
===================================================================
--- branches/2.4/MgDev/nuget/x64/api-base/tools/net40/install.ps1	                        (rev 0)
+++ branches/2.4/MgDev/nuget/x64/api-base/tools/net40/install.ps1	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,24 @@
+param($installPath, $toolsPath, $package, $project)
+
+# Set Copy Local to false for all mg-desktop references
+foreach ($reference in $project.Object.References)
+{
+    if ($reference.Name -eq "OSGeo.MapGuide.Foundation" -or 
+        $reference.Name -eq "OSGeo.MapGuide.Geometry" -or
+        $reference.Name -eq "OSGeo.MapGuide.PlatformBase")
+    {
+        $reference.CopyLocal = $true
+    }
+}
+Write-Host "Set <Copy Local> = true for all mapguide-api-base references"
+
+. (Join-Path $toolsPath "GetMgApiBasePostBuildCmd.ps1")
+
+# Get the current Post Build Event cmd
+$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value
+
+# Append our post build command if it's not already there
+if (!$currentPostBuildCmd.Contains($MgApiBasePostBuildCmd)) {
+    $project.Properties.Item("PostBuildEvent").Value += $MgApiBasePostBuildCmd
+    Write-Host "Updated mapguide-api-base Post-Build event for project"
+}
\ No newline at end of file

Added: branches/2.4/MgDev/nuget/x64/api-base/tools/net40/uninstall.ps1
===================================================================
--- branches/2.4/MgDev/nuget/x64/api-base/tools/net40/uninstall.ps1	                        (rev 0)
+++ branches/2.4/MgDev/nuget/x64/api-base/tools/net40/uninstall.ps1	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,10 @@
+param($installPath, $toolsPath, $package, $project)
+
+. (Join-Path $toolsPath "GetMgApiBasePostBuildCmd.ps1")
+
+# Get the current Post Build Event cmd
+$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value
+
+# Remove our post build command from it (if it's there)
+$project.Properties.Item("PostBuildEvent").Value = $currentPostBuildCmd.Replace($MgApiBasePostBuildCmd, "")
+Write-Host "Removed mapguide-api-base post-build event"
\ No newline at end of file


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop/content
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop/content/net40
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop/content/net40/mg-desktop
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop/lib
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop/lib/net40
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop/tools
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40
___________________________________________________________________
Added: bugtraq:number
   + true

Added: branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/GetMgDesktopPostBuildCmd.ps1
===================================================================
--- branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/GetMgDesktopPostBuildCmd.ps1	                        (rev 0)
+++ branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/GetMgDesktopPostBuildCmd.ps1	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,12 @@
+$solutionDir = [System.IO.Path]::GetDirectoryName($dte.Solution.FullName) + "\"
+$path = $installPath.Replace($solutionDir, "`$(SolutionDir)")
+
+$MgDesktopPostBuildCmd = "
+if not exist `"`$(TargetDir)FDO`" md `"`$(TargetDir)FDO`"
+xcopy /s /y `"`$(ProjectDir)mg-desktop\FDO`" `"`$(TargetDir)FDO`"
+if not exist `"`$(TargetDir)Resources`" md `"`$(TargetDir)Resources`"
+xcopy /s /y `"`$(ProjectDir)mg-desktop\Resources`" `"`$(TargetDir)Resources`"
+if not exist `"`$(TargetDir)Schema`" md `"`$(TargetDir)Schema`"
+xcopy /s /y `"`$(ProjectDir)mg-desktop\Schema`" `"`$(TargetDir)Schema`"
+copy /y `"`$(ProjectDir)mg-desktop\*.dll`" `"`$(TargetDir)`"
+copy /y `"`$(ProjectDir)mg-desktop\Platform.ini`" `"`$(TargetDir)`""
\ No newline at end of file

Added: branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/install.ps1
===================================================================
--- branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/install.ps1	                        (rev 0)
+++ branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/install.ps1	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,27 @@
+param($installPath, $toolsPath, $package, $project)
+
+# Set Copy Local to false for all mg-desktop references
+foreach ($reference in $project.Object.References)
+{
+    if ($reference.Name -eq "OSGeo.MapGuide.Foundation" -or 
+        $reference.Name -eq "OSGeo.MapGuide.Geometry" -or
+        $reference.Name -eq "OSGeo.MapGuide.PlatformBase" -or
+        $reference.Name -eq "OSGeo.MapGuide.Desktop" -or
+        $reference.Name -eq "OSGeo.MapGuide.Viewer" -or
+        $reference.Name -eq "OSGeo.MapGuide.Viewer.Desktop")
+    {
+        $reference.CopyLocal = $true
+    }
+}
+Write-Host "Set <Copy Local> = true for all mg-desktop references"
+
+. (Join-Path $toolsPath "GetMgDesktopPostBuildCmd.ps1")
+
+# Get the current Post Build Event cmd
+$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value
+
+# Append our post build command if it's not already there
+if (!$currentPostBuildCmd.Contains($MgDesktopPostBuildCmd)) {
+    $project.Properties.Item("PostBuildEvent").Value += $MgDesktopPostBuildCmd
+    Write-Host "Updated Post-Build event for project"
+}
\ No newline at end of file

Added: branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/uninstall.ps1
===================================================================
--- branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/uninstall.ps1	                        (rev 0)
+++ branches/2.4/MgDev/nuget/x64/api-desktop/tools/net40/uninstall.ps1	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,10 @@
+param($installPath, $toolsPath, $package, $project)
+
+. (Join-Path $toolsPath "GetMgDesktopPostBuildCmd.ps1")
+
+# Get the current Post Build Event cmd
+$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value
+
+# Remove our post build command from it (if it's there)
+$project.Properties.Item("PostBuildEvent").Value = $currentPostBuildCmd.Replace($MgDesktopPostBuildCmd, "")
+Write-Host "Removed mg-desktop post-build event"
\ No newline at end of file


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop-viewer
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop-viewer/lib
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop-viewer/lib/net40
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop-viewer/tools
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-desktop-viewer/tools/net40
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-web
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-web/content
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-web/content/net40
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-web/content/net40/mapguide-api-web
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-web/lib
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-web/lib/net40
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-web/tools
___________________________________________________________________
Added: bugtraq:number
   + true


Property changes on: branches/2.4/MgDev/nuget/x64/api-web/tools/net40
___________________________________________________________________
Added: bugtraq:number
   + true

Added: branches/2.4/MgDev/nuget/x64/api-web/tools/net40/GetMgWebApiPostBuildCmd.ps1
===================================================================
--- branches/2.4/MgDev/nuget/x64/api-web/tools/net40/GetMgWebApiPostBuildCmd.ps1	                        (rev 0)
+++ branches/2.4/MgDev/nuget/x64/api-web/tools/net40/GetMgWebApiPostBuildCmd.ps1	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,5 @@
+$solutionDir = [System.IO.Path]::GetDirectoryName($dte.Solution.FullName) + "\"
+$path = $installPath.Replace($solutionDir, "`$(SolutionDir)")
+
+$MgWebApiPostBuildCmd = "
+copy /y `"`$(ProjectDir)mapguide-api-web\*.dll`" `"`$(TargetDir)`""
\ No newline at end of file

Added: branches/2.4/MgDev/nuget/x64/api-web/tools/net40/install.ps1
===================================================================
--- branches/2.4/MgDev/nuget/x64/api-web/tools/net40/install.ps1	                        (rev 0)
+++ branches/2.4/MgDev/nuget/x64/api-web/tools/net40/install.ps1	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,23 @@
+param($installPath, $toolsPath, $package, $project)
+
+# Set Copy Local to false for all mg-desktop references
+foreach ($reference in $project.Object.References)
+{
+    if ($reference.Name -eq "OSGeo.MapGuide.MapGuideCommon" -or
+        $reference.Name -eq "OSGeo.MapGuide.Web")
+    {
+        $reference.CopyLocal = $true
+    }
+}
+Write-Host "Set <Copy Local> = true for all Web API references"
+
+. (Join-Path $toolsPath "GetMgWebApiPostBuildCmd.ps1")
+
+# Get the current Post Build Event cmd
+$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value
+
+# Append our post build command if it's not already there
+if (!$currentPostBuildCmd.Contains($MgWebApiPostBuildCmd)) {
+    $project.Properties.Item("PostBuildEvent").Value += $MgWebApiPostBuildCmd
+    Write-Host "Updated Post-Build event for project"
+}
\ No newline at end of file

Added: branches/2.4/MgDev/nuget/x64/api-web/tools/net40/uninstall.ps1
===================================================================
--- branches/2.4/MgDev/nuget/x64/api-web/tools/net40/uninstall.ps1	                        (rev 0)
+++ branches/2.4/MgDev/nuget/x64/api-web/tools/net40/uninstall.ps1	2012-10-07 12:11:31 UTC (rev 7087)
@@ -0,0 +1,10 @@
+param($installPath, $toolsPath, $package, $project)
+
+. (Join-Path $toolsPath "GetMgWebApiPostBuildCmd.ps1")
+
+# Get the current Post Build Event cmd
+$currentPostBuildCmd = $project.Properties.Item("PostBuildEvent").Value
+
+# Remove our post build command from it (if it's there)
+$project.Properties.Item("PostBuildEvent").Value = $currentPostBuildCmd.Replace($MgWebApiPostBuildCmd, "")
+Write-Host "Removed Web API post-build event"
\ No newline at end of file


Property changes on: branches/2.4/MgDev/nuget/x86
___________________________________________________________________
Added: bugtraq:number
   + true

Modified: branches/2.4/MgDev/nuget_pack.bat
===================================================================
--- branches/2.4/MgDev/nuget_pack.bat	2012-10-07 10:07:07 UTC (rev 7086)
+++ branches/2.4/MgDev/nuget_pack.bat	2012-10-07 12:11:31 UTC (rev 7087)
@@ -1,9 +1,11 @@
 @echo off
-SET EXTRA_NUGET_ARGS=
-IF NOT "%1" == "" SET EXTRA_NUGET_ARGS=-Version %1
 pushd nuget
-nuget pack mapguide-api-base.nuspec -BasePath api-base %EXTRA_NUGET_ARGS%
-nuget pack mg-desktop-net40.nuspec -BasePath api-desktop %EXTRA_NUGET_ARGS%
-nuget pack mg-desktop-viewer-net40.nuspec -BasePath api-desktop-viewer %EXTRA_NUGET_ARGS%
-nuget pack mapguide-api-web.nuspec -BasePath api-web %EXTRA_NUGET_ARGS%
+nuget pack mapguide-api-base-x86.nuspec -BasePath x86\api-base
+nuget pack mg-desktop-net40-x86.nuspec -BasePath x86\api-desktop
+nuget pack mg-desktop-viewer-net40-x86.nuspec -BasePath x86\api-desktop-viewer
+nuget pack mapguide-api-web-x86.nuspec -BasePath x86\api-web
+nuget pack mapguide-api-base-x64.nuspec -BasePath x64\api-base
+nuget pack mg-desktop-net40-x64.nuspec -BasePath x64\api-desktop
+nuget pack mg-desktop-viewer-net40-x64.nuspec -BasePath x64\api-desktop-viewer
+nuget pack mapguide-api-web-x64.nuspec -BasePath x64\api-web
 popd
\ No newline at end of file

Modified: branches/2.4/MgDev/nuget_prepare.bat
===================================================================
--- branches/2.4/MgDev/nuget_prepare.bat	2012-10-07 10:07:07 UTC (rev 7086)
+++ branches/2.4/MgDev/nuget_prepare.bat	2012-10-07 12:11:31 UTC (rev 7087)
@@ -5,8 +5,22 @@
 rem
 rem You must call setenvironment[64].bat first with any appropriate
 rem parameters before calling this script
+SET MG_VERSION=2.4.0.0
+SET MG_CPU=x86
+IF NOT "%1" == "" SET MG_VERSION=%1
+IF NOT "%2" == "" SET MG_CPU=%2
 
-SET NUGET_BASEDIR=%CD%\nuget
+echo Version: %MG_VERSION%
+echo CPU: %MG_CPU%
+
+IF "%MG_CPU%" == "x64" (
+    SET TYPEBUILD=release64
+) ELSE (
+    SET TYPEBUILD=release
+)
+
+SET NUGET_ROOT=%CD%\nuget
+SET NUGET_BASEDIR=%NUGET_ROOT%\%MG_CPU%
 SET NUGET_TARGET=net40
 SET NUGET_CONTENT_BASE=%NUGET_BASEDIR%\api-base\content\%NUGET_TARGET%\mapguide-api-base
 SET NUGET_LIB_BASE=%NUGET_BASEDIR%\api-base\lib\%NUGET_TARGET%
@@ -20,6 +34,25 @@
 SET DESKTOP_BASEDIR=%CD%\%TYPEBUILD%\Desktop
 SET SIGNER_ROOT=%CD%\Desktop\DesktopUnmanagedApi\DotNet
 
+IF NOT EXIST "%DESKTOP_BASEDIR%" (
+    echo mg-desktop base directory not found: %DESKTOP_BASEDIR%
+    goto error
+) ELSE (
+    echo mg-desktop base directory: %DESKTOP_BASEDIR%
+)
+IF NOT EXIST "%WEB_BASEDIR%" (
+    echo MapGuide Web base directory not found: %WEB_BASEDIR%
+    goto error
+) ELSE (
+    echo MapGuide Web base directory: %WEB_BASEDIR%
+)
+IF NOT EXIST "%SIGNER_ROOT%" (
+    echo Signer root directory not found: %SIGNER_ROOT%
+    goto error
+) ELSE (
+    echo Signer root directory: %SIGNER_ROOT%
+)
+
 echo [install]: Copy api-base files to nuget staging
 %XCOPY% "%DESKTOP_BASEDIR%\*" "%NUGET_CONTENT_BASE%" /EXCLUDE:package_excludes.txt+base_package_excludes.txt
 copy /y "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Foundation.dll" "%NUGET_LIB_BASE%"
@@ -55,10 +88,26 @@
 copy /y "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Viewer.xml" "%NUGET_LIB_VIEWER%"
 copy /y "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Viewer.dll" "%NUGET_LIB_VIEWER%"
 copy /y "%DESKTOP_BASEDIR%\OSGeo.MapGuide.Viewer.Desktop.dll" "%NUGET_LIB_VIEWER%"
+echo [prepare]: Nuspec files for %MG_VERSION% (%MG_CPU%)
+REM prep nuspec files
+pushd "%NUGET_ROOT%"
+echo [prepare]: mapguide-api-base
+call BatchSubstitute.bat MG_CPU %MG_CPU% mapguide-api-base.nuspec.tpl > temp.txt
+call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mapguide-api-base-%MG_CPU%.nuspec
+echo [prepare]: mapguide-api-web
+call BatchSubstitute.bat MG_CPU %MG_CPU% mapguide-api-web.nuspec.tpl > temp.txt
+call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mapguide-api-web-%MG_CPU%.nuspec
+echo [prepare]: mg-desktop-net40
+call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop-net40.nuspec.tpl > temp.txt
+call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-net40-%MG_CPU%.nuspec
+echo [prepare]: mg-desktop-viewer-net40
+call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop-viewer-net40.nuspec.tpl > temp.txt
+call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-viewer-net40-%MG_CPU%.nuspec
+del temp.txt
+popd
 echo mg-desktop is ready for nuget packaging and publishing
 goto quit
 
-
 :error
 echo [ERROR]: There was an error building the component
 exit /B 1

Modified: branches/2.4/MgDev/package_excludes.txt
===================================================================
--- branches/2.4/MgDev/package_excludes.txt	2012-10-07 10:07:07 UTC (rev 7086)
+++ branches/2.4/MgDev/package_excludes.txt	2012-10-07 12:11:31 UTC (rev 7087)
@@ -2,6 +2,9 @@
 .exp
 .lib
 MgMapGuideCommon.dll
+OSGeo.MapGuide.Foundation.xml
+OSGeo.MapGuide.Geometry.xml
+OSGeo.MapGuide.PlatformBase.xml
 OSGeo.FDO.dll
 OSGeo.FDO.Common.dll
 OSGeo.FDO.Geometry.dll

Deleted: branches/2.4/MgDev/samples_exclude.txt
===================================================================
--- branches/2.4/MgDev/samples_exclude.txt	2012-10-07 10:07:07 UTC (rev 7086)
+++ branches/2.4/MgDev/samples_exclude.txt	2012-10-07 12:11:31 UTC (rev 7087)
@@ -1,6 +0,0 @@
-bin
-obj
-Lib
-.svn
-_svn
-.suo
\ No newline at end of file

