[mapguide-commits] r9789 - in sandbox/jng/vanilla_swig/Bindings: . src/Managed/DotNet/MapGuideDotNetApi src/Managed/DotNet/OSGeo.MapGuide.Foundation src/Managed/DotNet/OSGeo.MapGuide.Foundation/build src/Managed/DotNet/OSGeo.MapGuide.Geometry src/Managed/DotNet/OSGeo.MapGuide.Geometry/build src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/build src/Managed/DotNet/OSGeo.MapGuide.PlatformBase src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/build src/Managed/DotNet/OSGeo.MapGuide.Web src/Managed/DotNet/OSGeo.MapGuide.Web/build src/Test/DotNet/src/TestCommonFull src/Test/DotNet/src/TestMapGuideApiFull src/Test/DotNet/src/TestMiscFull src/Test/DotNet/src/TestMiscFull/Properties src/Test/DotNet/src/TestRunnerFull src/Test/DotNet/src/TestRunnerFull/Properties src/Test/Java
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Thu Nov 19 01:51:20 PST 2020
Author: jng
Date: 2020-11-19 01:51:19 -0800 (Thu, 19 Nov 2020)
New Revision: 9789
Added:
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/build/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/build/OSGeo.MapGuide.Foundation.targets
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/build/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/build/OSGeo.MapGuide.Geometry.targets
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/build/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/build/OSGeo.MapGuide.MapGuideCommon.targets
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/build/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/build/OSGeo.MapGuide.PlatformBase.targets
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/build/
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/build/OSGeo.MapGuide.Web.targets
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull/Properties/launchSettings.json
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/Properties/launchSettings.json
Modified:
sandbox/jng/vanilla_swig/Bindings/TODO.txt
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj
sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull/
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull/TestCommonFull.csproj
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull/
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull/TestMapGuideApiFull.csproj
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull/
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull/TestMiscFull.csproj
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/
sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/TestRunnerFull.csproj
sandbox/jng/vanilla_swig/Bindings/src/Test/Java/
Log:
Add .targets file to our 5 .net projects to ensure native deps are copied out when said project is consumed form a legacy (full) .net framework project.
Modified: sandbox/jng/vanilla_swig/Bindings/TODO.txt
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/TODO.txt 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/TODO.txt 2020-11-19 09:51:19 UTC (rev 9789)
@@ -8,7 +8,9 @@
- [x] Consolidate Tools.sln into Bindings.sln
- [ ] Relocate/remove existing test code
- Split .net binding into the Foundation/Geometry/PlatformBase/MapGuideCommon/Web layout (https://github.com/jumpinjackie/mapguide-api-bindings/issues/18)
- - [ ] Add .targets files to each C# project so that native dlls are copied properly when consumed by legacy .net framework applications/libraries
+ - [x] Add .targets files to each C# project so that native dlls are copied properly when consumed by legacy .net framework applications/libraries
+ - [ ] Consolidate TestCommon and TestMapGuideApi .net projects to unified netstandard2.0 libraries
+ - [ ] Tidy mg_exception_callback to no longer take an exception class name argument (it is no longer used or necessary)
- [ ] Add CentOS 6 Dockerfile that
- Install SWIG and common libs tarball (from docker build system)
- Install same compilers/tools as the same docker image used to produce the common libs tarball
@@ -16,7 +18,7 @@
- Copy the compiled libs out of the docker container and into the same native library staging area for Java/.net
- [x] Refactor current .net test suite to reference these nuget packages
- [x] Verify test suite still passes (Windows)
- - [ ] Verify test suite still passes (Windows, legacy .net Framework)
+ - [x] Verify test suite still passes (Windows, legacy .net Framework)
- [ ] Verify test suite still passes (Linux)
- Automatic class id generation (https://github.com/jumpinjackie/mapguide-api-bindings/issues/34)
- [ ] Add SWIG preprocessor that controls whether the class id header should be included
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/MapGuideDotNetApi/MapGuideDotNetApi.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -4,6 +4,7 @@
<PackageId>MapGuideDotNetApi</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <DebugType>portable</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<Version>4.0.0.0</Version>
<PackageProjectUrl>https://mapguide.osgeo.org/</PackageProjectUrl>
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/OSGeo.MapGuide.Foundation.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<PackageId>OSGeo.MapGuide.Foundation</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <DebugType>portable</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<Version>4.0.0.0</Version>
<PackageProjectUrl>https://mapguide.osgeo.org/</PackageProjectUrl>
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/build/OSGeo.MapGuide.Foundation.targets
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/build/OSGeo.MapGuide.Foundation.targets (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Foundation/build/OSGeo.MapGuide.Foundation.targets 2020-11-19 09:51:19 UTC (rev 9789)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+ <!-- if ShouldIncludeNativeMapGuideApi == False then don't include the native libraries -->
+ <ShouldIncludeNativeMapGuideApi Condition=" '$(ShouldIncludeNativeMapGuideApi)' == '' ">True</ShouldIncludeNativeMapGuideApi>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(ShouldIncludeNativeMapGuideApi)' != 'False' ">
+ <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\**\*" Condition="$(TargetFrameworkVersion.StartsWith('net4')) And '$(OS)' == 'Windows_NT' And '$(Platform)' == 'x64'">
+ <Link>%(Filename)%(Extension)</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
+
+</Project>
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/OSGeo.MapGuide.Geometry.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -4,6 +4,7 @@
<PackageId>OSGeo.MapGuide.Geometry</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <DebugType>portable</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<Version>4.0.0.0</Version>
<PackageProjectUrl>https://mapguide.osgeo.org/</PackageProjectUrl>
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/build/OSGeo.MapGuide.Geometry.targets
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/build/OSGeo.MapGuide.Geometry.targets (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Geometry/build/OSGeo.MapGuide.Geometry.targets 2020-11-19 09:51:19 UTC (rev 9789)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+ <!-- if ShouldIncludeNativeMapGuideApi == False then don't include the native libraries -->
+ <ShouldIncludeNativeMapGuideApi Condition=" '$(ShouldIncludeNativeMapGuideApi)' == '' ">True</ShouldIncludeNativeMapGuideApi>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(ShouldIncludeNativeMapGuideApi)' != 'False' ">
+ <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\**\*" Condition="$(TargetFrameworkVersion.StartsWith('net4')) And '$(OS)' == 'Windows_NT' And '$(Platform)' == 'x64'">
+ <Link>%(Filename)%(Extension)</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
+
+</Project>
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/OSGeo.MapGuide.MapGuideCommon.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -4,6 +4,7 @@
<PackageId>OSGeo.MapGuide.MapGuideCommon</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <DebugType>portable</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<Version>4.0.0.0</Version>
<PackageProjectUrl>https://mapguide.osgeo.org/</PackageProjectUrl>
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/build/OSGeo.MapGuide.MapGuideCommon.targets
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/build/OSGeo.MapGuide.MapGuideCommon.targets (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.MapGuideCommon/build/OSGeo.MapGuide.MapGuideCommon.targets 2020-11-19 09:51:19 UTC (rev 9789)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+ <!-- if ShouldIncludeNativeMapGuideApi == False then don't include the native libraries -->
+ <ShouldIncludeNativeMapGuideApi Condition=" '$(ShouldIncludeNativeMapGuideApi)' == '' ">True</ShouldIncludeNativeMapGuideApi>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(ShouldIncludeNativeMapGuideApi)' != 'False' ">
+ <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\**\*" Condition="$(TargetFrameworkVersion.StartsWith('net4')) And '$(OS)' == 'Windows_NT' And '$(Platform)' == 'x64'">
+ <Link>%(Filename)%(Extension)</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
+
+</Project>
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/OSGeo.MapGuide.PlatformBase.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -4,6 +4,7 @@
<PackageId>OSGeo.MapGuide.PlatformBase</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <DebugType>portable</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<Version>4.0.0.0</Version>
<PackageProjectUrl>https://mapguide.osgeo.org/</PackageProjectUrl>
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/build/OSGeo.MapGuide.PlatformBase.targets
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/build/OSGeo.MapGuide.PlatformBase.targets (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.PlatformBase/build/OSGeo.MapGuide.PlatformBase.targets 2020-11-19 09:51:19 UTC (rev 9789)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+ <!-- if ShouldIncludeNativeMapGuideApi == False then don't include the native libraries -->
+ <ShouldIncludeNativeMapGuideApi Condition=" '$(ShouldIncludeNativeMapGuideApi)' == '' ">True</ShouldIncludeNativeMapGuideApi>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(ShouldIncludeNativeMapGuideApi)' != 'False' ">
+ <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\**\*" Condition="$(TargetFrameworkVersion.StartsWith('net4')) And '$(OS)' == 'Windows_NT' And '$(Platform)' == 'x64'">
+ <Link>%(Filename)%(Extension)</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
+
+</Project>
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/OSGeo.MapGuide.Web.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -4,6 +4,7 @@
<PackageId>OSGeo.MapGuide.Web</PackageId>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <DebugType>portable</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<Version>4.0.0.0</Version>
<PackageProjectUrl>https://mapguide.osgeo.org/</PackageProjectUrl>
Added: sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/build/OSGeo.MapGuide.Web.targets
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/build/OSGeo.MapGuide.Web.targets (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Managed/DotNet/OSGeo.MapGuide.Web/build/OSGeo.MapGuide.Web.targets 2020-11-19 09:51:19 UTC (rev 9789)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+ <!-- if ShouldIncludeNativeMapGuideApi == False then don't include the native libraries -->
+ <ShouldIncludeNativeMapGuideApi Condition=" '$(ShouldIncludeNativeMapGuideApi)' == '' ">True</ShouldIncludeNativeMapGuideApi>
+ </PropertyGroup>
+
+ <ItemGroup Condition=" '$(ShouldIncludeNativeMapGuideApi)' != 'False' ">
+ <None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\**\*" Condition="$(TargetFrameworkVersion.StartsWith('net4')) And '$(OS)' == 'Windows_NT' And '$(Platform)' == 'x64'">
+ <Link>%(Filename)%(Extension)</Link>
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
+
+</Project>
\ No newline at end of file
Index: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull 2020-11-19 09:51:19 UTC (rev 9789)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+obj
+bin
Modified: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull/TestCommonFull.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull/TestCommonFull.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestCommonFull/TestCommonFull.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>TestCommon Class Library (Full Framework)</Description>
<Authors>OSGeo</Authors>
- <TargetFramework>net461</TargetFramework>
+ <TargetFramework>net472</TargetFramework>
<AssemblyName>TestCommon</AssemblyName>
<PackageId>TestCommon</PackageId>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -16,6 +16,7 @@
<Compile Include="..\TestCommon\ExternalTests\CollectionTests.cs" Link="ExternalTests\CollectionTests.cs" />
<Compile Include="..\TestCommon\ExternalTests\ConvenienceTests.cs" Link="ExternalTests\ConvenienceTests.cs" />
<Compile Include="..\TestCommon\ExternalTests\PropertiesTest.cs" Link="ExternalTests\PropertiesTest.cs" />
+ <Compile Include="..\TestCommon\ExternalTests\StandardCatchTest.cs" Link="ExternalTests\StandardCatchTest.cs" />
<Compile Include="..\TestCommon\FeatureService\FeatureServiceOperationExecutor.cs" Link="FeatureService\FeatureServiceOperationExecutor.cs" />
<Compile Include="..\TestCommon\FeatureService\Operations.cs" Link="FeatureService\Operations.cs" />
<Compile Include="..\TestCommon\ITestExecutor.cs" Link="ITestExecutor.cs" />
@@ -36,5 +37,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SQLite" Version="2.0.1" />
+ <PackageReference Include="OSGeo.MapGuide.Foundation" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.Geometry" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.PlatformBase" Version="4.0.0" />
</ItemGroup>
</Project>
\ No newline at end of file
Index: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull 2020-11-19 09:51:19 UTC (rev 9789)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+obj
+bin
Modified: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull/TestMapGuideApiFull.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull/TestMapGuideApiFull.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMapGuideApiFull/TestMapGuideApiFull.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>TestMapGuideApi Class Library (Full Framework)</Description>
<Authors>OSGeo</Authors>
- <TargetFramework>net461</TargetFramework>
+ <TargetFramework>net472</TargetFramework>
<AssemblyName>TestMapGuideApi</AssemblyName>
<PackageId>TestMapGuideApi</PackageId>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
@@ -10,6 +10,7 @@
<ItemGroup>
<Compile Include="..\TestMapGuideApi\DrawingService\DrawingServiceOperationExecutor.cs" Link="DrawingService\DrawingServiceOperationExecutor.cs" />
<Compile Include="..\TestMapGuideApi\DrawingService\Operations.cs" Link="DrawingService\Operations.cs" />
+ <Compile Include="..\TestMapGuideApi\ExternalTests\ByteReaderReadByChunksTest.cs" Link="ExternalTests\ByteReaderReadByChunksTest.cs" />
<Compile Include="..\TestMapGuideApi\ExternalTests\CollectionTests.cs" Link="ExternalTests\CollectionTests.cs" />
<Compile Include="..\TestMapGuideApi\ExternalTests\MapTests.cs" Link="ExternalTests\MapTests.cs" />
<Compile Include="..\TestMapGuideApi\ExternalTests\RenderingServiceTests.cs" Link="ExternalTests\RenderingServiceTests.cs" />
@@ -31,5 +32,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SQLite" Version="2.0.1" />
+ <PackageReference Include="OSGeo.MapGuide.Foundation" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.Geometry" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.MapGuideCommon" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.Web" Version="4.0.0" />
+ <PackageReference Include="System.Buffers" Version="4.5.1" />
</ItemGroup>
</Project>
\ No newline at end of file
Index: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull 2020-11-19 09:51:19 UTC (rev 9789)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+obj
+bin
+Resources
Added: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull/Properties/launchSettings.json
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull/Properties/launchSettings.json (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull/Properties/launchSettings.json 2020-11-19 09:51:19 UTC (rev 9789)
@@ -0,0 +1,8 @@
+{
+ "profiles": {
+ "TestMiscFull": {
+ "commandName": "Project",
+ "commandLineArgs": "..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\Web\\src\\webconfig.ini ..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\Oem\\CsMap\\CsMapDev\\Dictionaries"
+ }
+ }
+}
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull/TestMiscFull.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull/TestMiscFull.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestMiscFull/TestMiscFull.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -2,12 +2,29 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
- <TargetFramework>net461</TargetFramework>
+ <TargetFramework>net472</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
- <Platforms>x64;x86</Platforms>
+ <Platforms>x64</Platforms>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\TestMisc\Program.cs" Link="Program.cs" />
</ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="OSGeo.MapGuide.Foundation" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.Geometry" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.MapGuideCommon" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.Web" Version="4.0.0" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Folder Include="Resources\" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <Content Include="..\..\..\..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" Link="Resources\mapguide_en.res">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
</Project>
Index: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull 2020-11-19 09:51:19 UTC (rev 9789)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,3 ##
+bin
+obj
+Resources
Added: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/Properties/launchSettings.json
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/Properties/launchSettings.json (rev 0)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/Properties/launchSettings.json 2020-11-19 09:51:19 UTC (rev 9789)
@@ -0,0 +1,8 @@
+{
+ "profiles": {
+ "TestRunnerFull": {
+ "commandName": "Project",
+ "commandLineArgs": "--web-config-path \"..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\Web\\src\\webconfig.ini\" --dictionary-path \"..\\..\\..\\..\\..\\..\\..\\..\\..\\..\\Oem\\CsMap\\CsMapDev\\Dictionaries\" --test-data-root \"..\\..\\..\\..\\..\\..\\..\\..\\TestData\""
+ }
+ }
+}
\ No newline at end of file
Modified: sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/TestRunnerFull.csproj
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/TestRunnerFull.csproj 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/DotNet/src/TestRunnerFull/TestRunnerFull.csproj 2020-11-19 09:51:19 UTC (rev 9789)
@@ -2,7 +2,7 @@
<PropertyGroup>
<Description>TestRunner Console Application (Full Framework)</Description>
<Authors>OSGeo</Authors>
- <TargetFramework>net461</TargetFramework>
+ <TargetFramework>net472</TargetFramework>
<AssemblyName>TestRunnerFull</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>TestRunnerFull</PackageId>
@@ -18,5 +18,16 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.2.1" />
+ <PackageReference Include="OSGeo.MapGuide.Foundation" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.Geometry" Version="4.0.0" />
+ <PackageReference Include="OSGeo.MapGuide.Web" Version="4.0.0" />
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="Resources\" />
+ </ItemGroup>
+ <ItemGroup>
+ <Content Include="..\..\..\..\..\..\Common\MapGuideCommon\Resources\mapguide_en.res" Link="Resources\mapguide_en.res">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Content>
+ </ItemGroup>
</Project>
\ No newline at end of file
Index: sandbox/jng/vanilla_swig/Bindings/src/Test/Java
===================================================================
--- sandbox/jng/vanilla_swig/Bindings/src/Test/Java 2020-11-17 09:52:25 UTC (rev 9788)
+++ sandbox/jng/vanilla_swig/Bindings/src/Test/Java 2020-11-19 09:51:19 UTC (rev 9789)
Property changes on: sandbox/jng/vanilla_swig/Bindings/src/Test/Java
___________________________________________________________________
Modified: svn:ignore
## -1 +1,2 ##
build
+lib
More information about the mapguide-commits
mailing list