[mapguide-commits] r8302 - in trunk/MgDev: . Web/src

[svn_mapguide at osgeo.org]

Author: jng
Date: 2014-07-10 19:17:44 -0700 (Thu, 10 Jul 2014)
New Revision: 8302

Modified:
   trunk/MgDev/
   trunk/MgDev/Web/src/WebTier.sln
Log:
Merged revision(s) 8301 from branches/2.6/MgDev:
#2468: Fix random MSB3073 errors. This is due to situations like WebApi project being built before MapGuideCommonApi project causing the SWIG generation step to fail because the upstream MapGuideCommon SWIG interface file does not exist (as it has not been built yet).

This submissions explicitly defines such project dependencies (in addition to their existing dependencies) so that such SWIG generation steps to not fail again.

 - FoundationApi
    - None
 - GeometryApi
    - FoundationApi
 - PlatformBaseApi
    - FoundationApi
    - GeometryApi
 - MapGuideCommonApi
    - FoundationApi
    - GeometryApi
    - PlatformBaseApi
 - WebApi
    - FoundationApi
    - GeometryApi
    - PlatformBaseApi
    - MapGuideCommonApi
........



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
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212,8214,8217,8220-8221,8223-8225
/sandbox/rfc94:5099-5163
   + /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
/sandbox/jng/convenience_apis:8263
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/v30:8212,8214,8217,8220-8221,8223-8225
/sandbox/rfc94:5099-5163

Modified: trunk/MgDev/Web/src/WebTier.sln
===================================================================
--- trunk/MgDev/Web/src/WebTier.sln	2014-07-11 02:15:42 UTC (rev 8301)
+++ trunk/MgDev/Web/src/WebTier.sln	2014-07-11 02:17:44 UTC (rev 8302)
@@ -43,12 +43,30 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FoundationApi", "DotNetUnmanagedApi\Foundation\FoundationApi.vcxproj", "{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GeometryApi", "DotNetUnmanagedApi\Geometry\GeometryApi.vcxproj", "{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}"
+	ProjectSection(ProjectDependencies) = postProject
+		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2} = {A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MapGuideCommonApi", "DotNetUnmanagedApi\MapGuideCommon\MapGuideCommonApi.vcxproj", "{FD5CC86A-D557-4D59-AFC2-6C562E67A596}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2} = {7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}
+		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2} = {A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PlatformBaseApi", "DotNetUnmanagedApi\PlatformBase\PlatformBaseApi.vcxproj", "{CB91F23F-4882-433B-961B-15946BA8B965}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2} = {7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}
+		{D954DAAC-E305-40CE-B3F3-C229A0BEF4F0} = {D954DAAC-E305-40CE-B3F3-C229A0BEF4F0}
+		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2} = {A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebApi", "DotNetUnmanagedApi\Web\WebApi.vcxproj", "{1B43CC8A-7A76-4A2C-97E4-DE3CDB53C99A}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CB91F23F-4882-433B-961B-15946BA8B965} = {CB91F23F-4882-433B-961B-15946BA8B965}
+		{FD5CC86A-D557-4D59-AFC2-6C562E67A596} = {FD5CC86A-D557-4D59-AFC2-6C562E67A596}
+		{7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2} = {7A6EFE8B-A2F8-4C47-87A3-B7D1C4385AC2}
+		{A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2} = {A8D4FED3-0AA1-4AE6-B734-A4499A4BB4F2}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FoundationDotNetApi", "DotNetApi\Foundation\FoundationDotNetApi.vcxproj", "{5FE54BF6-2939-46BB-A811-277D46C901C4}"
 EndProject