[mapguide-commits] r9069 - in trunk/MgDev: . nuget/MapGuideNuget nuget/MapGuideNuget/CoordSysEnumTest nuget/MapGuideNuget/CoordSysEnumTest64 nuget/MapGuideNuget/DesktopConsoleTest nuget/MapGuideNuget/DesktopConsoleTest64 nuget/MapGuideNuget/DesktopViewerTest nuget/MapGuideNuget/DesktopViewerTest64

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Tue Oct 11 06:46:56 PDT 2016 

Author: jng
Date: 2016-10-11 06:46:56 -0700 (Tue, 11 Oct 2016)
New Revision: 9069

Added:
   trunk/MgDev/nuget/MapGuideNuget/WebApiTest/
   trunk/MgDev/nuget/MapGuideNuget/WebApiTest64/
Removed:
   trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget/
   trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64/
   trunk/MgDev/nuget/MapGuideNuget/Web.sln
   trunk/MgDev/nuget/MapGuideNuget/Web64.sln
Modified:
   trunk/MgDev/
   trunk/MgDev/nuget/MapGuideNuget/
   trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest/
   trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64/
   trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest/
   trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64/
   trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest/
   trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64/
   trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget.sln
   trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64.sln
   trunk/MgDev/release64_excludes.txt
   trunk/MgDev/release_excludes.txt
Log:
Merged revision(s) 9067-9068 from branches/3.1/MgDev:
Update nuget package verification solution/projects. Remove the web projects (as this requires a specific VS2012 express SKU) and replace with a console app that exercises some MapGuide Web-specific APIs.
........
Fix #2749: Add .iobj and .ipdb to release output exclusion lists
........



Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8869-8871
   + /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8658,8705,8710
/branches/3.1/MgDev:9026,9058-9059,9067-9068
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/adsk/3.1n:8871,8895,8901,8912-8913,8921-8922,8942,9019-9020
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/php56x:8975-8985
/sandbox/jng/rfc155:8872-8884
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
/trunk/MgDev:8869-8871


Property changes on: trunk/MgDev/nuget/MapGuideNuget
___________________________________________________________________
Added: svn:ignore
   + *.suo
.vs
packages



Property changes on: trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest
___________________________________________________________________
Added: svn:ignore
   + bin
obj



Property changes on: trunk/MgDev/nuget/MapGuideNuget/CoordSysEnumTest64
___________________________________________________________________
Added: svn:ignore
   + bin
obj



Property changes on: trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest
___________________________________________________________________
Added: svn:ignore
   + bin
obj



Property changes on: trunk/MgDev/nuget/MapGuideNuget/DesktopConsoleTest64
___________________________________________________________________
Added: svn:ignore
   + bin
obj



Property changes on: trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest
___________________________________________________________________
Added: svn:ignore
   + bin
obj



Property changes on: trunk/MgDev/nuget/MapGuideNuget/DesktopViewerTest64
___________________________________________________________________
Added: svn:ignore
   + bin
obj


Modified: trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget.sln
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget.sln	2016-10-11 13:42:31 UTC (rev 9068)
+++ trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget.sln	2016-10-11 13:46:56 UTC (rev 9069)
@@ -7,24 +7,58 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DesktopViewerTest", "DesktopViewerTest\DesktopViewerTest.csproj", "{A0DCC768-B341-426B-889A-0701A2399CE8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiTest", "WebApiTest\WebApiTest.csproj", "{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|x86.ActiveCfg = Debug|x86
 		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|x86.Build.0 = Debug|x86
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|Any CPU.ActiveCfg = Release|x86
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|Mixed Platforms.Build.0 = Release|x86
 		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|x86.ActiveCfg = Release|x86
 		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|x86.Build.0 = Release|x86
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|x86.ActiveCfg = Debug|x86
 		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|x86.Build.0 = Debug|x86
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|Any CPU.ActiveCfg = Release|x86
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|Mixed Platforms.Build.0 = Release|x86
 		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|x86.ActiveCfg = Release|x86
 		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|x86.Build.0 = Release|x86
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|Mixed Platforms.Build.0 = Debug|x86
 		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|x86.ActiveCfg = Debug|x86
 		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|x86.Build.0 = Debug|x86
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|Any CPU.ActiveCfg = Release|x86
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|Mixed Platforms.Build.0 = Release|x86
 		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|x86.ActiveCfg = Release|x86
 		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|x86.Build.0 = Release|x86
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B4DB8698-45CC-41EC-B8A6-7853A80ADC48}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64.sln
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64.sln	2016-10-11 13:42:31 UTC (rev 9068)
+++ trunk/MgDev/nuget/MapGuideNuget/MapGuideNuget64.sln	2016-10-11 13:46:56 UTC (rev 9069)
@@ -14,24 +14,58 @@
 		.nuget\NuGet.targets = .nuget\NuGet.targets
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApiTest64", "WebApiTest64\WebApiTest64.csproj", "{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
 		Debug|x64 = Debug|x64
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|x64.ActiveCfg = Debug|x64
 		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Debug|x64.Build.0 = Debug|x64
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|Any CPU.ActiveCfg = Release|x64
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|Mixed Platforms.Build.0 = Release|x64
 		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|x64.ActiveCfg = Release|x64
 		{1B74DF59-B3D2-49E8-80EF-9BC5A84552F3}.Release|x64.Build.0 = Release|x64
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|x64.ActiveCfg = Debug|x64
 		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Debug|x64.Build.0 = Debug|x64
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|Any CPU.ActiveCfg = Release|x64
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|Mixed Platforms.Build.0 = Release|x64
 		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|x64.ActiveCfg = Release|x64
 		{87BA0B9E-F36E-4D45-89EC-C1CD95C73B62}.Release|x64.Build.0 = Release|x64
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|Mixed Platforms.Build.0 = Debug|x64
 		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|x64.ActiveCfg = Debug|x64
 		{A0DCC768-B341-426B-889A-0701A2399CE8}.Debug|x64.Build.0 = Debug|x64
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|Any CPU.ActiveCfg = Release|x64
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|Mixed Platforms.ActiveCfg = Release|x64
+		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|Mixed Platforms.Build.0 = Release|x64
 		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|x64.ActiveCfg = Release|x64
 		{A0DCC768-B341-426B-889A-0701A2399CE8}.Release|x64.Build.0 = Release|x64
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{79A373CE-16CE-4064-A9F0-1BC15A98DC5A}.Release|x64.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Deleted: trunk/MgDev/nuget/MapGuideNuget/Web.sln
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/Web.sln	2016-10-11 13:42:31 UTC (rev 9068)
+++ trunk/MgDev/nuget/MapGuideNuget/Web.sln	2016-10-11 13:46:56 UTC (rev 9069)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Web
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapGuideNuget", "MapGuideNuget\MapGuideNuget.csproj", "{A4665445-2B49-4808-BD7A-8A6B6AAF5237}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A4665445-2B49-4808-BD7A-8A6B6AAF5237}.Debug|x86.ActiveCfg = Debug|x86
-		{A4665445-2B49-4808-BD7A-8A6B6AAF5237}.Debug|x86.Build.0 = Debug|x86
-		{A4665445-2B49-4808-BD7A-8A6B6AAF5237}.Release|x86.ActiveCfg = Release|x86
-		{A4665445-2B49-4808-BD7A-8A6B6AAF5237}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Deleted: trunk/MgDev/nuget/MapGuideNuget/Web64.sln
===================================================================
--- trunk/MgDev/nuget/MapGuideNuget/Web64.sln	2016-10-11 13:42:31 UTC (rev 9068)
+++ trunk/MgDev/nuget/MapGuideNuget/Web64.sln	2016-10-11 13:46:56 UTC (rev 9069)
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Web
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapGuideNuget", "MapGuideNuget64\MapGuideNuget.csproj", "{A4665445-2B49-4808-BD7A-8A6B6AAF5237}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A4665445-2B49-4808-BD7A-8A6B6AAF5237}.Debug|x64.ActiveCfg = Debug|x64
-		{A4665445-2B49-4808-BD7A-8A6B6AAF5237}.Debug|x64.Build.0 = Debug|x64
-		{A4665445-2B49-4808-BD7A-8A6B6AAF5237}.Release|x64.ActiveCfg = Release|x64
-		{A4665445-2B49-4808-BD7A-8A6B6AAF5237}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

Modified: trunk/MgDev/release64_excludes.txt
===================================================================
--- trunk/MgDev/release64_excludes.txt	2016-10-11 13:42:31 UTC (rev 9068)
+++ trunk/MgDev/release64_excludes.txt	2016-10-11 13:46:56 UTC (rev 9069)
@@ -1,3 +1,5 @@
 .pdb
 .exp
-.lib
\ No newline at end of file
+.lib
+.iobj
+.ipdb
\ No newline at end of file

Modified: trunk/MgDev/release_excludes.txt
===================================================================
--- trunk/MgDev/release_excludes.txt	2016-10-11 13:42:31 UTC (rev 9068)
+++ trunk/MgDev/release_excludes.txt	2016-10-11 13:46:56 UTC (rev 9069)
@@ -1,3 +1,5 @@
 .pdb
 .exp
-.lib
\ No newline at end of file
+.lib
+.iobj
+.ipdb
\ No newline at end of file

More information about the mapguide-commits mailing list