#22: Target netstandard1.6 for test projects and fix various DNXCORE-…

…isms that are no longer relevant
jumpinjackie · Jun 16, 2017 · 087b1e6 · 087b1e6
1 parent f5b399c
commit 087b1e6
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 180 deletions.
diff --git a/build.cmd b/build.cmd
@@ -14,7 +14,7 @@ popd
 pushd src\Bindings\DotNet\MapGuideDotNetApi
 call dotnet restore
 if errorlevel 1 goto error
-call dotnet pack --configuration Release
+call dotnet pack --configuration Release --include-source --include-symbols /p:PackageVersion=%MG_VER_TRIPLET%
 if errorlevel 1 goto error
 popd
 goto end

diff --git a/envsetupsdk.cmd b/envsetupsdk.cmd
@@ -4,6 +4,7 @@ SET MG_VER_MINOR=%2
 SET MG_VER_REV=%3
 SET MG_VER_BUILD=%4
 SET MG_VERSION=%1.%2
+SET MG_VER_TRIPLET=%1.%2.%3
 SET SWIG_TOOL_PATH=D:\swigwin-3.0.12
 
 SET MG_SDK_DIR=sdk/%MG_VERSION%

diff --git a/src/Test/Dnx/src/TestCommon/Assert.cs b/src/Test/Dnx/src/TestCommon/Assert.cs
@@ -1,25 +1,13 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace OSGeo.MapGuide.Test.Common
 {
-#if !DNXCORE50
-    [Serializable]
-#endif
     public class AssertException : Exception
     {
         public AssertException() { }
         public AssertException(string message) : base(message) { }
         public AssertException(string message, Exception inner) : base(message, inner) { }
-#if !DNXCORE50
-        protected AssertException(
-          System.Runtime.Serialization.SerializationInfo info,
-          System.Runtime.Serialization.StreamingContext context)
-            : base(info, context)
-        { }
-#endif
     }
 
     public class Assert

diff --git a/src/Test/Dnx/src/TestCommon/TestCommon.csproj b/src/Test/Dnx/src/TestCommon/TestCommon.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>TestCommon Class Library</Description>
     <Authors>OSGeo</Authors>
-    <TargetFrameworks>dnx451;dnxcore50</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6</TargetFrameworks>
     <AssemblyName>TestCommon</AssemblyName>
     <PackageId>TestCommon</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
@@ -14,37 +14,4 @@
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.0.0" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.0.0" />
-    <PackageReference Include="System.Globalization" Version="4.0.11" />
-    <PackageReference Include="System.IO" Version="4.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'dnx451' ">
-    <PackageReference Include="System.Xml.ReaderWriter" Version="4.0.11" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="1.0.1" />
-    <PackageReference Include="MapGuideDotNetApi" Version="3.1.0" />
-    <Reference Include="mscorlib" />
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Runtime" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'dnxcore50' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
-    <PackageReference Include="System.Console" Version="4.0.0" />
-    <PackageReference Include="System.Collections" Version="4.0.11" />
-    <PackageReference Include="System.Collections.Specialized" Version="4.0.1" />
-    <PackageReference Include="System.Linq" Version="4.1.0" />
-    <PackageReference Include="System.Runtime" Version="4.1.0" />
-    <PackageReference Include="System.Threading" Version="4.0.11" />
-    <PackageReference Include="System.Reflection" Version="4.1.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.1.0" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.0.1" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="1.0.1" />
-    <PackageReference Include="MapGuideDotNetApi" Version="3.1.0" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Test/Dnx/src/TestMapGuide/Program.cs b/src/Test/Dnx/src/TestMapGuide/Program.cs
diff --git a/src/Test/Dnx/src/TestMapGuide/Properties/AssemblyInfo.cs b/src/Test/Dnx/src/TestMapGuide/Properties/AssemblyInfo.cs
diff --git a/src/Test/Dnx/src/TestMapGuide/TestMapGuide.xproj b/src/Test/Dnx/src/TestMapGuide/TestMapGuide.xproj
diff --git a/src/Test/Dnx/src/TestMapGuide/project.json b/src/Test/Dnx/src/TestMapGuide/project.json
diff --git a/src/Test/Dnx/src/TestMapGuideApi/TestMapGuideApi.csproj b/src/Test/Dnx/src/TestMapGuideApi/TestMapGuideApi.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>TestMapGuideApi Class Library</Description>
     <Authors>OSGeo</Authors>
-    <TargetFrameworks>dnx451;dnxcore50</TargetFrameworks>
+    <TargetFrameworks>netstandard1.6</TargetFrameworks>
     <AssemblyName>TestMapGuideApi</AssemblyName>
     <PackageId>TestMapGuideApi</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
@@ -19,26 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Reflection" Version="4.1.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'dnx451' ">
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="1.0.1" />
-    <PackageReference Include="MapGuideDotNetApi" Version="3.1.0" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'dnxcore50' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
-    <PackageReference Include="System.Collections" Version="4.0.11" />
-    <PackageReference Include="System.Linq" Version="4.1.0" />
-    <PackageReference Include="System.Runtime" Version="4.1.0" />
-    <PackageReference Include="System.Threading" Version="4.0.11" />
-    <PackageReference Include="Microsoft.Data.Sqlite" Version="1.0.1" />
-    <PackageReference Include="System.Threading.Thread" Version="4.0.0" />
-    <PackageReference Include="MapGuideDotNetApi" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Data.Sqlite" Version="1.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Test/Dnx/src/TestRunner/Program.cs b/src/Test/Dnx/src/TestRunner/Program.cs
@@ -51,11 +51,7 @@ public MgLayerBase CreateLayer(MgResourceIdentifier resId)
         }
 
         //Usage: MgTestRunner.exe <webconfig.ini path> <MENTOR_DICTIONARY_PATH> [test log path]
-#if DNXCORE50
-        static int Main(string[] args)
-#else
         static void Main(string[] args)
-#endif
         {
             if (args.Length >= 2 && args.Length <= 3)
             {

diff --git a/src/Test/Dnx/src/TestRunner/TestRunner.csproj b/src/Test/Dnx/src/TestRunner/TestRunner.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>TestRunner Console Application</Description>
     <Authors>OSGeo</Authors>
-    <TargetFrameworks>dnx451;dnxcore50</TargetFrameworks>
+    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
     <AssemblyName>TestRunner</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>TestRunner</PackageId>
@@ -19,21 +19,4 @@
     <ProjectReference Include="..\TestCommon\TestCommon.csproj" />
     <ProjectReference Include="..\TestMapGuideApi\TestMapGuideApi.csproj" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'dnx451' ">
-    <PackageReference Include="MapGuideDotNetApi" Version="3.1.0" />
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'dnxcore50' ">
-    <PackageReference Include="Microsoft.CSharp" Version="4.0.1" />
-    <PackageReference Include="System.Collections" Version="4.0.11" />
-    <PackageReference Include="System.Console" Version="4.0.0" />
-    <PackageReference Include="System.Linq" Version="4.1.0" />
-    <PackageReference Include="System.Threading" Version="4.0.11" />
-    <PackageReference Include="System.Runtime.Extensions" Version="4.1.0" />
-    <PackageReference Include="MapGuideDotNetApi" Version="3.1.0" />
-  </ItemGroup>
-
 </Project>