[mapguide-commits] r8285 - in branches/2.6/MgDev: . nuget

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Fri Jul 4 06:05:17 PDT 2014


Author: jng
Date: 2014-07-04 06:05:17 -0700 (Fri, 04 Jul 2014)
New Revision: 8285

Added:
   branches/2.6/MgDev/nuget/mg-desktop-viewer.nuspec.tpl
   branches/2.6/MgDev/nuget/mg-desktop.nuspec.tpl
Removed:
   branches/2.6/MgDev/nuget/mg-desktop-net40.nuspec.tpl
   branches/2.6/MgDev/nuget/mg-desktop-viewer-net40.nuspec.tpl
Modified:
   branches/2.6/MgDev/nuget/NuGet.exe
   branches/2.6/MgDev/nuget/api-desktop-readme.txt
   branches/2.6/MgDev/nuget/api-desktop-viewer-readme.txt
   branches/2.6/MgDev/nuget/cs-map-dict-readme.txt
   branches/2.6/MgDev/nuget/mapguide-api-base.nuspec.tpl
   branches/2.6/MgDev/nuget/mapguide-api-web.nuspec.tpl
   branches/2.6/MgDev/nuget_pack.bat
   branches/2.6/MgDev/nuget_prepare.bat
Log:
NuGet package updates:
 - Remove the net40 designation from the mg-desktop packages.
 - Update nuget.exe to latest version.
 - Update package readmes.
 - Specify supported .net versions in the package description.

Modified: branches/2.6/MgDev/nuget/NuGet.exe
===================================================================
(Binary files differ)

Modified: branches/2.6/MgDev/nuget/api-desktop-readme.txt
===================================================================
--- branches/2.6/MgDev/nuget/api-desktop-readme.txt	2014-07-04 12:16:03 UTC (rev 8284)
+++ branches/2.6/MgDev/nuget/api-desktop-readme.txt	2014-07-04 13:05:17 UTC (rev 8285)
@@ -1,8 +1,10 @@
-mg-desktop-net40 README
-=======================
+mg-desktop README
+=================
 
-This is the NuGet package for the mg-desktop API. This does not include the WinForms-based map viewer control. Install the mg-desktop-viewer-net40 package if you require this component.
+This is the NuGet package for the mg-desktop API. This does not include the WinForms-based map viewer control. Install the mg-desktop-viewer package if you require this component.
 
+This package was formerly known as mg-desktop-net40. That package still exists on NuGet and should be considered a legacy package
+
 Dependencies
 ============
 

Modified: branches/2.6/MgDev/nuget/api-desktop-viewer-readme.txt
===================================================================
--- branches/2.6/MgDev/nuget/api-desktop-viewer-readme.txt	2014-07-04 12:16:03 UTC (rev 8284)
+++ branches/2.6/MgDev/nuget/api-desktop-viewer-readme.txt	2014-07-04 13:05:17 UTC (rev 8285)
@@ -1,13 +1,15 @@
-mg-desktop-viewer-net40 README
-==============================
+mg-desktop-viewer README
+========================
 
 This is the NuGet package for the mg-desktop viewer API.
 
+This package was formerly known as mg-desktop-viewer-net40. That package still exists on NuGet and should be considered a legacy package
+
 Dependencies
 ============
 
 - mapguide-api-base
-- mg-desktop-net40
+- mg-desktop
 
 Optional Dependencies
 =====================

Modified: branches/2.6/MgDev/nuget/cs-map-dict-readme.txt
===================================================================
--- branches/2.6/MgDev/nuget/cs-map-dict-readme.txt	2014-07-04 12:16:03 UTC (rev 8284)
+++ branches/2.6/MgDev/nuget/cs-map-dict-readme.txt	2014-07-04 13:05:17 UTC (rev 8285)
@@ -9,13 +9,13 @@
 
 If you are building normal web applications with the MapGuide Web API, this package is not necessary as your application will use the dictionary files specified in webconfig.ini (which normally point to dictionary files that come with your MapGuide Open Source installation)
 
-This package is only required if you are building a mg-desktop application (you installed the mg-desktop-net40 package), or you are building a non-standard application that uses the MgCoordinateSystem* classes in the MapGuide API.
+This package is only required if you are building a mg-desktop application (you installed the mg-desktop package), or you are building a non-standard application that uses the MgCoordinateSystem* classes in the MapGuide API.
 
 Installation Notes
 ==================
 
 This package will add a post-build step to copy the dictionary files to a "Dictionaries" subdirectory in the project's output directory.
 
-If you installed the mg-desktop-net40 package, it's Platform.ini expects the dictionary files to be copied to this location and thus does not require any further action on your part if you installed both packages.
+If you installed the mg-desktop package, it's Platform.ini expects the dictionary files to be copied to this location and thus does not require any further action on your part if you installed both packages.
 
 For non-standard applications that use the MgCoordinateSystem* classes, you must set the MENTOR_DICTIONARY_PATH environment variable to indicate the directory containing these dictionary files. You must do this before you access the MgCoordinateSystemFactory class.
\ No newline at end of file

Modified: branches/2.6/MgDev/nuget/mapguide-api-base.nuspec.tpl
===================================================================
(Binary files differ)

Modified: branches/2.6/MgDev/nuget/mapguide-api-web.nuspec.tpl
===================================================================
(Binary files differ)

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

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

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

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

Modified: branches/2.6/MgDev/nuget_pack.bat
===================================================================
--- branches/2.6/MgDev/nuget_pack.bat	2014-07-04 12:16:03 UTC (rev 8284)
+++ branches/2.6/MgDev/nuget_pack.bat	2014-07-04 13:05:17 UTC (rev 8285)
@@ -3,8 +3,8 @@
 IF NOT "%1" == "" SET MG_CPU=%1
 pushd nuget
 nuget pack mapguide-api-base-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-base
-nuget pack mg-desktop-net40-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop
-nuget pack mg-desktop-viewer-net40-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop-viewer
+nuget pack mg-desktop-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop
+nuget pack mg-desktop-viewer-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-desktop-viewer
 nuget pack mapguide-api-web-%MG_CPU%.nuspec -BasePath %MG_CPU%\api-web
 nuget pack cs-map-dictionaries.nuspec -BasePath cs-map-dicts
 popd
\ No newline at end of file

Modified: branches/2.6/MgDev/nuget_prepare.bat
===================================================================
--- branches/2.6/MgDev/nuget_prepare.bat	2014-07-04 12:16:03 UTC (rev 8284)
+++ branches/2.6/MgDev/nuget_prepare.bat	2014-07-04 13:05:17 UTC (rev 8285)
@@ -119,12 +119,12 @@
 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
+echo [prepare]: mg-desktop
+call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop.nuspec.tpl > temp.txt
+call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-%MG_CPU%.nuspec
+echo [prepare]: mg-desktop-viewer
+call BatchSubstitute.bat MG_CPU %MG_CPU% mg-desktop-viewer.nuspec.tpl > temp.txt
+call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > mg-desktop-viewer-%MG_CPU%.nuspec
 echo [prepare]: cs-map-dictionaries
 call BatchSubstitute.bat MG_CPU %MG_CPU% cs-map-dictionaries.nuspec.tpl > temp.txt
 call BatchSubstitute.bat MG_VERSION %MG_VERSION% temp.txt > cs-map-dictionaries.nuspec



More information about the mapguide-commits mailing list