[mapguide-commits] r10010 - in trunk/MgDev/Bindings/src: Bindings Bindings/DotNet/Foundation Bindings/DotNet/Geometry Bindings/DotNet/MapGuideCommon Bindings/DotNet/PlatformBase Bindings/DotNet/Web Managed/DotNet/Common Tools/ClassMapGen/Data/Templates
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Nov 11 01:48:11 PST 2022
Author: jng
Date: 2022-11-11 01:48:10 -0800 (Fri, 11 Nov 2022)
New Revision: 10010
Modified:
trunk/MgDev/Bindings/src/Bindings/Bindings.sln
trunk/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj
trunk/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj
trunk/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj
trunk/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj
trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
trunk/MgDev/Bindings/src/Managed/DotNet/Common/MgClassMap.cs
trunk/MgDev/Bindings/src/Tools/ClassMapGen/Data/Templates/dotnet.txt
Log:
#2852: Fix up debug configuration for more binding projects. Also fix missing return on MgClassMap.TryResolveConstructor()
Modified: trunk/MgDev/Bindings/src/Bindings/Bindings.sln
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/Bindings.sln 2022-11-11 09:19:40 UTC (rev 10009)
+++ trunk/MgDev/Bindings/src/Bindings/Bindings.sln 2022-11-11 09:48:10 UTC (rev 10010)
@@ -141,6 +141,7 @@
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.ActiveCfg = Debug|x64
+ {B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x64.Build.0 = Debug|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Debug|x86.ActiveCfg = Debug|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.ActiveCfg = Release|x64
{B601F04C-0D42-4AFC-A092-B31185E2EA8C}.Release|x64.Build.0 = Release|x64
Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj 2022-11-11 09:19:40 UTC (rev 10009)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/Foundation/FoundationApi.vcxproj 2022-11-11 09:48:10 UTC (rev 10010)
@@ -14,6 +14,7 @@
<ProjectGuid>{73C62FF2-C188-4A61-929E-2F112D7E17AA}</ProjectGuid>
<RootNamespace>FoundationUnmanagedApi</RootNamespace>
<Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -38,7 +39,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">bin\$(Configuration)64\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\win-x64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\$(Configuration)64\FoundationUnmanagedApi\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\win-x64\</OutDir>
@@ -81,9 +82,9 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\win-x64\native\FoundationUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\win-x64\native\FoundationUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -123,7 +124,7 @@
<Link>
<AdditionalDependencies>MgFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\win-x64\native\FoundationUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\Release64;..\..\..\..\..\..\Web\lib\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Foundation\runtimes\win-x64\native\FoundationUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj 2022-11-11 09:19:40 UTC (rev 10009)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/Geometry/GeometryApi.vcxproj 2022-11-11 09:48:10 UTC (rev 10010)
@@ -14,6 +14,7 @@
<ProjectGuid>{B994F673-EB8E-4C65-8884-B56AB8783115}</ProjectGuid>
<RootNamespace>GeometryUnmanagedApi</RootNamespace>
<Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -38,7 +39,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">bin\$(Configuration)64\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\win-x64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\$(Configuration)64\GeometryUnmanagedApi\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\win-x64\</OutDir>
@@ -77,9 +78,9 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundationd.lib;MgGeometryd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\win-x64\native\GeometryUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\win-x64\native\GeometryUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -117,7 +118,7 @@
<Link>
<AdditionalDependencies>MgFoundation.lib;MgGeometry.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\win-x64\native\GeometryUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\Release64;..\..\..\..\..\..\Web\lib\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Geometry\runtimes\win-x64\native\GeometryUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj 2022-11-11 09:19:40 UTC (rev 10009)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/MapGuideCommon/MapGuideCommonApi.vcxproj 2022-11-11 09:48:10 UTC (rev 10010)
@@ -14,6 +14,7 @@
<ProjectGuid>{42FC41FD-742B-4AED-816E-C211F1B07F3F}</ProjectGuid>
<RootNamespace>MapGuideCommonUnmanagedApi</RootNamespace>
<Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -38,7 +39,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">bin\$(Configuration)64\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\win-x64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\$(Configuration)64\MapGuideCommonUnmanagedApi\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\win-x64\</OutDir>
@@ -78,9 +79,9 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundationd.lib;MgPlatformBased.lib;MgMapGuideCommond.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\win-x64\native\MapGuideCommonUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\win-x64\native\MapGuideCommonUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -117,7 +118,7 @@
<Link>
<AdditionalDependencies>MgFoundation.lib;MgPlatformBase.lib;MgMapGuideCommon.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\win-x64\native\MapGuideCommonUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\Release64;..\..\..\..\..\..\Web\lib\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.MapGuideCommon\runtimes\win-x64\native\MapGuideCommonUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj 2022-11-11 09:19:40 UTC (rev 10009)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/PlatformBase/PlatformBaseApi.vcxproj 2022-11-11 09:48:10 UTC (rev 10010)
@@ -14,6 +14,7 @@
<ProjectGuid>{3BAE3F0E-8F3F-404B-B29B-5881C16BD33B}</ProjectGuid>
<RootNamespace>PlatformBaseUnmanagedApi</RootNamespace>
<Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -38,7 +39,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">bin\$(Configuration)64\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\win-x64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\$(Configuration)64\PlatformBaseUnmanagedApi\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\win-x64\</OutDir>
@@ -79,9 +80,9 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundationd.lib;MgPlatformBased.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\win-x64\native\PlatformBaseUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\win-x64\native\PlatformBaseUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -119,7 +120,7 @@
<Link>
<AdditionalDependencies>MgFoundation.lib;MgPlatformBase.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\win-x64\native\PlatformBaseUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\Release64;..\..\..\..\..\..\Web\lib\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.PlatformBase\runtimes\win-x64\native\PlatformBaseUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj
===================================================================
--- trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj 2022-11-11 09:19:40 UTC (rev 10009)
+++ trunk/MgDev/Bindings/src/Bindings/DotNet/Web/WebApi.vcxproj 2022-11-11 09:48:10 UTC (rev 10010)
@@ -14,6 +14,7 @@
<ProjectGuid>{C83BF842-ABB1-4870-8003-11EF860E6741}</ProjectGuid>
<RootNamespace>WebUnmanagedApi</RootNamespace>
<Keyword>Win32Proj</Keyword>
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
@@ -38,7 +39,7 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">bin\$(Configuration)64\</OutDir>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\win-x64\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">obj\$(Configuration)64\WebUnmanagedApi\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\win-x64\</OutDir>
@@ -65,8 +66,7 @@
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgHttpHandler*.*" "$(TargetDir)\native\"
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebApp*.*" "$(TargetDir)\native\"
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebSupport*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Oem\jsoncpp\lib64\$(Configuration)\lib_json.dll" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Oem\jsoncpp\lib64\$(Configuration)\lib_json.pdb" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\lib_json*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
@@ -82,9 +82,9 @@
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
- <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>MgFoundationd.lib;HttpHandlerd.lib;WebAppd.lib;WebSupportd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\win-x64\native\WebUnmanagedApid.dll</OutputFile>
- <AdditionalLibraryDirectories>$(MG_SDK_LIB64);$(MG_OEM_ACE_LIB_ROOT)\lib64\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\win-x64\native\WebUnmanagedApid.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
@@ -107,8 +107,7 @@
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgHttpHandler*.*" "$(TargetDir)\native\"
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebApp*.*" "$(TargetDir)\native\"
copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\MgWebSupport*.*" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Oem\jsoncpp\lib64\$(Configuration)\lib_json.dll" "$(TargetDir)\native\"
-copy /Y "$(ProjectDir)..\..\..\..\..\Oem\jsoncpp\lib64\$(Configuration)\lib_json.pdb" "$(TargetDir)\native\"
+copy /Y "$(ProjectDir)..\..\..\..\..\Web\bin\$(Configuration)64\lib_json*.*" "$(TargetDir)\native\"
</Command>
</PreBuildEvent>
<ClCompile>
@@ -125,7 +124,7 @@
<Link>
<AdditionalDependencies>MgFoundation.lib;HttpHandler.lib;WebApp.lib;WebSupport.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\win-x64\native\WebUnmanagedApi.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\Release64;..\..\..\..\..\Web\lib\Release64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\..\..\..\Common\lib\$(Configuration)64;..\..\..\..\..\Web\lib\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(ProjectDir)..\..\..\Managed\DotNet\OSGeo.MapGuide.Web\runtimes\win-x64\native\WebUnmanagedApi.pdb</ProgramDatabaseFile>
<SubSystem>Windows</SubSystem>
Modified: trunk/MgDev/Bindings/src/Managed/DotNet/Common/MgClassMap.cs
===================================================================
--- trunk/MgDev/Bindings/src/Managed/DotNet/Common/MgClassMap.cs 2022-11-11 09:19:40 UTC (rev 10009)
+++ trunk/MgDev/Bindings/src/Managed/DotNet/Common/MgClassMap.cs 2022-11-11 09:48:10 UTC (rev 10010)
@@ -355,6 +355,8 @@
return ctor;
}
+
+ return null;
}
}
}
\ No newline at end of file
Modified: trunk/MgDev/Bindings/src/Tools/ClassMapGen/Data/Templates/dotnet.txt
===================================================================
--- trunk/MgDev/Bindings/src/Tools/ClassMapGen/Data/Templates/dotnet.txt 2022-11-11 09:19:40 UTC (rev 10009)
+++ trunk/MgDev/Bindings/src/Tools/ClassMapGen/Data/Templates/dotnet.txt 2022-11-11 09:48:10 UTC (rev 10010)
@@ -124,6 +124,8 @@
return ctor;
}
+
+ return null;
}
}
}
\ No newline at end of file
More information about the mapguide-commits
mailing list