[mapguide-commits] r10189 - in branches/4.0/MgDev: Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase Bindings/src/Managed/DotNet/OSGeo.MapGuide.Portable Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/custom Portable/OSGeo.MapGuide.Viewer Portable/OSGeo.MapGuide.Viewer.Portable
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Sep 11 02:19:39 PDT 2025
Author: jng
Date: 2025-09-11 02:19:39 -0700 (Thu, 11 Sep 2025)
New Revision: 10189
Modified:
branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj
branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj
branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj
branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj
branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Portable/OSGeo.MapGuide.Portable.csproj
branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj
branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/custom/EntryPoint.cs
branches/4.0/MgDev/Portable/OSGeo.MapGuide.Viewer.Portable/OSGeo.MapGuide.Viewer.Portable.csproj
branches/4.0/MgDev/Portable/OSGeo.MapGuide.Viewer/OSGeo.MapGuide.Viewer.csproj
Log:
Fix bad license expr and add AppDomain hack to MapGuideApi.MgInitializeWebTier
Modified: branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj 2025-09-11 09:10:06 UTC (rev 10188)
+++ branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj 2025-09-11 09:19:39 UTC (rev 10189)
@@ -12,7 +12,7 @@
<PackageTags>MapGuide GIS Geospatial Maps</PackageTags>
<Authors>OSGeo</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <PackageLicenseExpression>LGPL-2.1</PackageLicenseExpression>
+ <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
Modified: branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj 2025-09-11 09:10:06 UTC (rev 10188)
+++ branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj 2025-09-11 09:19:39 UTC (rev 10189)
@@ -12,7 +12,7 @@
<PackageTags>MapGuide GIS Geospatial Maps</PackageTags>
<Authors>OSGeo</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <PackageLicenseExpression>LGPL-2.1</PackageLicenseExpression>
+ <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
Modified: branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj 2025-09-11 09:10:06 UTC (rev 10188)
+++ branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj 2025-09-11 09:19:39 UTC (rev 10189)
@@ -12,7 +12,7 @@
<PackageTags>MapGuide GIS Geospatial Maps</PackageTags>
<Authors>OSGeo</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <PackageLicenseExpression>LGPL-2.1</PackageLicenseExpression>
+ <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
Modified: branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj 2025-09-11 09:10:06 UTC (rev 10188)
+++ branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj 2025-09-11 09:19:39 UTC (rev 10189)
@@ -12,7 +12,7 @@
<PackageTags>MapGuide GIS Geospatial Maps</PackageTags>
<Authors>OSGeo</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <PackageLicenseExpression>LGPL-2.1</PackageLicenseExpression>
+ <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
Modified: branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Portable/OSGeo.MapGuide.Portable.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Portable/OSGeo.MapGuide.Portable.csproj 2025-09-11 09:10:06 UTC (rev 10188)
+++ branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Portable/OSGeo.MapGuide.Portable.csproj 2025-09-11 09:19:39 UTC (rev 10189)
@@ -12,7 +12,7 @@
<PackageTags>MapGuide GIS Geospatial Maps</PackageTags>
<Authors>OSGeo</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <PackageLicenseExpression>LGPL-2.1</PackageLicenseExpression>
+ <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<Description>A portable implementation of the MapGuide platform and APIs for use in console/desktop applications.</Description>
<Title>MapGuide Portable</Title>
<PackageReadmeFile>README.md</PackageReadmeFile>
Modified: branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj
===================================================================
--- branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj 2025-09-11 09:10:06 UTC (rev 10188)
+++ branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj 2025-09-11 09:19:39 UTC (rev 10189)
@@ -12,7 +12,7 @@
<PackageTags>MapGuide GIS Geospatial Maps</PackageTags>
<Authors>OSGeo</Authors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <PackageLicenseExpression>LGPL-2.1</PackageLicenseExpression>
+ <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
Modified: branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/custom/EntryPoint.cs
===================================================================
--- branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/custom/EntryPoint.cs 2025-09-11 09:10:06 UTC (rev 10188)
+++ branches/4.0/MgDev/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/custom/EntryPoint.cs 2025-09-11 09:19:39 UTC (rev 10189)
@@ -15,6 +15,8 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
+using System.Runtime.InteropServices;
+
namespace OSGeo.MapGuide
{
/// <summary>
@@ -27,6 +29,8 @@
}
+ static bool smLinuxAppDomainForced = false;
+
/// <summary>
/// Initializes the MapGuide Web Tier APIs. You must call this method before using any other class or method
/// in the MapGuide API
@@ -35,6 +39,20 @@
/// <remarks>Subsequent calls do nothing and return immediately</remarks>
public static void MgInitializeWebTier(string configFile)
{
+ if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+ {
+ if (!smLinuxAppDomainForced)
+ {
+ /*
+ * HACK: For non-Windows platforms at least, we need this line below to
+ * force the OSGeo.MapGuide.Geometry assembly to be loaded into the current
+ * AppDomain. Otherwise .net proxy class type resolution will break.
+ */
+ using (var csFactory = new MgCoordinateSystemFactory()) { }
+ smLinuxAppDomainForced = true;
+ }
+ }
+
WebUnmanagedApiPINVOKE.MgInitializeWebTier(configFile);
// The above call is a direct P/Invoke call and not a wrapper call, so we have to make
// sure to throw any pending exception if the native side stashed a pending exception
Modified: branches/4.0/MgDev/Portable/OSGeo.MapGuide.Viewer/OSGeo.MapGuide.Viewer.csproj
===================================================================
--- branches/4.0/MgDev/Portable/OSGeo.MapGuide.Viewer/OSGeo.MapGuide.Viewer.csproj 2025-09-11 09:10:06 UTC (rev 10188)
+++ branches/4.0/MgDev/Portable/OSGeo.MapGuide.Viewer/OSGeo.MapGuide.Viewer.csproj 2025-09-11 09:19:39 UTC (rev 10189)
@@ -12,7 +12,7 @@
<RepositoryUrl>https://mapguide.osgeo.org/</RepositoryUrl>
<PackageTags>MapGuide GIS Geospatial Maps</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <PackageLicenseExpression>LGPL-2.1</PackageLicenseExpression>
+ <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<Description>Base WinForms viewer component package for MapGuide</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
Modified: branches/4.0/MgDev/Portable/OSGeo.MapGuide.Viewer.Portable/OSGeo.MapGuide.Viewer.Portable.csproj
===================================================================
--- branches/4.0/MgDev/Portable/OSGeo.MapGuide.Viewer.Portable/OSGeo.MapGuide.Viewer.Portable.csproj 2025-09-11 09:10:06 UTC (rev 10188)
+++ branches/4.0/MgDev/Portable/OSGeo.MapGuide.Viewer.Portable/OSGeo.MapGuide.Viewer.Portable.csproj 2025-09-11 09:19:39 UTC (rev 10189)
@@ -11,7 +11,7 @@
<RepositoryUrl>https://mapguide.osgeo.org/</RepositoryUrl>
<PackageTags>MapGuide GIS Geospatial Maps</PackageTags>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
- <PackageLicenseExpression>LGPL-2.1</PackageLicenseExpression>
+ <PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<Description>Integrates the WinForms viewer package with MapGuide Portable</Description>
<PackageReadmeFile>README.md</PackageReadmeFile>
</PropertyGroup>
More information about the mapguide-commits
mailing list