[mapguide-commits] r8823 - in sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi: . Custom runtimes runtimes/win-x64 runtimes/win-x64/native runtimes/win-x86 runtimes/win-x86/native

svn_mapguide at osgeo.org svn_mapguide at osgeo.org
Sun Nov 8 10:05:13 PST 2015


Author: jng
Date: 2015-11-08 10:05:13 -0800 (Sun, 08 Nov 2015)
New Revision: 8823

Added:
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x64/
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x64/native/
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x64/native/readme.txt
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x86/
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x86/native/
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x86/native/readme.txt
Modified:
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/Custom/DnxCoreShims.cs
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/Custom/ManagedException.cs
   sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/project.json
Log:
- Remove stub serializable attribute
- Use the new packInclude property in project.json to include native MapGuide API binaries with the NuGet package when "dnu pack" is run


Property changes on: sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi
___________________________________________________________________
Added: svn:ignore
   + bin


Modified: sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/Custom/DnxCoreShims.cs
===================================================================
--- sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/Custom/DnxCoreShims.cs	2015-11-08 16:45:29 UTC (rev 8822)
+++ sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/Custom/DnxCoreShims.cs	2015-11-08 18:05:13 UTC (rev 8823)
@@ -18,14 +18,6 @@
 namespace System
 {
     #if DNXCORE50
-    /// <summary>
-    /// This is a stub attribute that has no effect on .net Core
-    /// </summary>
-    [AttributeUsageAttribute(AttributeTargets.Class|AttributeTargets.Struct|AttributeTargets.Enum|AttributeTargets.Delegate, Inherited = false)]
-    public sealed class SerializableAttribute : Attribute
-    {
-    }
-    
     public class SystemException : Exception
     {
         public SystemException() : base() { }

Modified: sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/Custom/ManagedException.cs
===================================================================
--- sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/Custom/ManagedException.cs	2015-11-08 16:45:29 UTC (rev 8822)
+++ sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/Custom/ManagedException.cs	2015-11-08 18:05:13 UTC (rev 8823)
@@ -28,7 +28,6 @@
     /// Although this class does not wrap any unmanaged class, it still holds a C++ pointer to
     /// the MgException that derives from it.
     /// </summary>
-    [Serializable]
     public class ManagedException : Exception
     {
         private bool mIsWrapper;

Modified: sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/project.json
===================================================================
--- sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/project.json	2015-11-08 16:45:29 UTC (rev 8822)
+++ sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/project.json	2015-11-08 18:05:13 UTC (rev 8823)
@@ -33,5 +33,9 @@
   },
   "sources": {
     "compile": ["*.cs", "Custom/*.cs"]
+  },
+  "packInclude": {
+    "runtimes/win-x64/native/": "runtimes/win-x64/native/*",
+    "runtimes/win-x86/native/": "runtimes/win-x86/native/*"
   }
 }
\ No newline at end of file

Added: sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x64/native/readme.txt
===================================================================
--- sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x64/native/readme.txt	                        (rev 0)
+++ sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x64/native/readme.txt	2015-11-08 18:05:13 UTC (rev 8823)
@@ -0,0 +1 @@
+This folder conatins the 64-bit unmanaged windows binaries for the MapGuide API
\ No newline at end of file

Added: sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x86/native/readme.txt
===================================================================
--- sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x86/native/readme.txt	                        (rev 0)
+++ sandbox/jng/aspnet50/Web/src/MapGuideDotNetCoreApi/runtimes/win-x86/native/readme.txt	2015-11-08 18:05:13 UTC (rev 8823)
@@ -0,0 +1 @@
+This folder conatins the 32-bit unmanaged windows binaries for the MapGuide API
\ No newline at end of file



More information about the mapguide-commits mailing list