Transition to netstandard.

- dotnet5.X => netstandard1.y (where y = x-1). - DNXCore50 => netstandardapp1.5. - Applied the same changes to ifdefs.
2016-03-01 13:36:28 -08:00 · 2016-03-01 13:36:28 -08:00 · be3c20cab4
parent abc2abb51b
commit be3c20cab4
21 changed files with 137 additions and 61 deletions
--- a/samples/DatabaseErrorPageSample/project.json
+++ b/samples/DatabaseErrorPageSample/project.json
@ -15,8 +15,11 @@
  },
  "frameworks": {
    "dnx451": {},
-    "dnxcore50": {
-      "imports": "portable-net451+win8"
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
    }
  }
 }
--- a/samples/DeveloperExceptionPageSample/project.json
+++ b/samples/DeveloperExceptionPageSample/project.json
@ -12,7 +12,11 @@
    "web": "DeveloperExceptionPageSample"
  },
  "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  }
-}
+}
--- a/samples/ElmPageSample/project.json
+++ b/samples/ElmPageSample/project.json
@ -14,6 +14,10 @@
  },
  "frameworks": {
    "dnx451": {},
-    "dnxcore50": {}
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  }
 }
--- a/samples/ExceptionHandlerSample/project.json
+++ b/samples/ExceptionHandlerSample/project.json
@ -14,7 +14,11 @@
    "web": "ExceptionHandlerSample"
  },
  "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  }
-}
+}
--- a/samples/MiddlewareAnalysisSample/project.json
+++ b/samples/MiddlewareAnalysisSample/project.json
@ -15,7 +15,11 @@
    "web": "MiddlewareAnalysisSample"
  },
  "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  }
-}
+}
--- a/samples/RuntimeInfoPageSample/project.json
+++ b/samples/RuntimeInfoPageSample/project.json
@ -14,6 +14,10 @@
  },
  "frameworks": {
    "dnx451": {},
-    "dnxcore50": {}
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  }
 }
--- a/samples/StatusCodePagesSample/project.json
+++ b/samples/StatusCodePagesSample/project.json
@ -13,7 +13,9 @@
  "compilationOptions": {
    "emitEntryPoint": true
  },
-  "commands": { "web": "StatusCodePagesSample" },
+  "commands": {
+    "web": "StatusCodePagesSample"
+  },
  "dependencies": {
    "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
@ -21,7 +23,11 @@
    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  }
-}
+}
--- a/samples/WelcomePageSample/project.json
+++ b/samples/WelcomePageSample/project.json
@ -13,6 +13,10 @@
  },
  "frameworks": {
    "dnx451": {},
-    "dnxcore50": {}
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  }
 }
--- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json
@ -8,15 +8,20 @@
  "compilationOptions": {
    "warningsAsErrors": true,
    "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
    "xmlDoc": true
  },
  "frameworks": {
    "net451": {},
-    "dotnet5.4": {
+    "netstandard1.3": {
      "dependencies": {
        "System.Resources.ResourceManager": "4.0.1-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
    }
  }
-}
+}
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
@ -4,7 +4,9 @@
  "compilationOptions": {
    "warningsAsErrors": true,
    "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
    "xmlDoc": true
  },
  "repository": {
@ -17,10 +19,13 @@
  },
  "frameworks": {
    "net451": {},
-    "dotnet5.4": {
+    "netstandard1.3": {
      "dependencies": {
        "System.Threading": "4.0.11-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
    }
  },
  "compileExclude": [
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DataStoreErrorLogger.cs
@ -6,7 +6,7 @@ using Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Utilities;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Logging;
 using System;
-#if DOTNET5_4
+#if NETSTANDARD1_3
 using System.Threading;
 #else
 using System.Runtime.Remoting.Messaging;
@ -16,7 +16,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
 {
    public class DataStoreErrorLogger : ILogger
    {
-#if DOTNET5_4
+#if NETSTANDARD1_3
        private readonly AsyncLocal<DataStoreErrorLog> _log = new AsyncLocal<DataStoreErrorLog>(); 
 #else
        private const string ContextName = "__DataStoreErrorLog";
@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
        {
            get
            {
-#if DOTNET5_4
+#if NETSTANDARD1_3
                return _log.Value; 
 #else
                return (DataStoreErrorLog)CallContext.LogicalGetData(ContextName);
@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore
            // it will not be available to code outside of the current async context. 
            // We create it ahead of time so that any cloning just clones the reference
            // to the object that will hold any errors.
-#if DOTNET5_4
+#if NETSTANDARD1_3
            _log.Value = new DataStoreErrorLog();
 #else
            CallContext.LogicalSetData(ContextName, new DataStoreErrorLog());
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/DatabaseErrorPageMiddleware.cs
@ -67,7 +67,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore

            try
            {
-#if !DOTNET5_4
+#if !NETSTANDARD1_3
                // TODO This probably isn't the correct place for this workaround, it
                //      needs to be called before anything is written to CallContext
                // http://msdn.microsoft.com/en-us/library/dn458353(v=vs.110).aspx
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
@ -8,7 +8,9 @@
  "compilationOptions": {
    "warningsAsErrors": true,
    "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
    "xmlDoc": true
  },
  "dependencies": {
@ -25,11 +27,14 @@
        "System.Threading.Tasks": ""
      }
    },
-    "dotnet5.4": {
+    "netstandard1.3": {
      "dependencies": {
        "System.Threading": "4.0.11-*"
      },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
    }
  }
 }
--- a/src/Microsoft.AspNetCore.Diagnostics/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics/project.json
@ -4,7 +4,9 @@
  "compilationOptions": {
    "warningsAsErrors": true,
    "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
    "xmlDoc": true
  },
  "repository": {
@ -22,11 +24,14 @@
    "System.Diagnostics.DiagnosticSource": "4.0.0-*"
  },
  "frameworks": {
-    "net451": { },
-    "dotnet5.4": {
+    "net451": {},
+    "netstandard1.3": {
      "dependencies": {
        "System.Reflection.Extensions": "4.0.1-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
    }
  },
  "compileExclude": [
@ -34,4 +39,4 @@
    "RuntimeInfo/Views/*.cshtml",
    "WelcomePage/Views/*.cshtml"
  ]
-}
+}
--- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
+++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json
@ -4,7 +4,9 @@
  "compilationOptions": {
    "warningsAsErrors": true,
    "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
    "xmlDoc": true
  },
  "repository": {
@ -16,9 +18,12 @@
    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-*",
    "System.Diagnostics.DiagnosticSource": "4.0.0-*"
  },
-
  "frameworks": {
-    "net451": { },
-    "dotnet5.4": { }
+    "net451": {},
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
  }
-}
+}
--- a/src/PageGenerator/project.json
+++ b/src/PageGenerator/project.json
@ -15,10 +15,13 @@
  },
  "frameworks": {
    "dnx451": {},
-    "dnxcore50": {
+    "netstandardapp1.5": {
      "dependencies": {
-        "System.Console": "4.0.0-*",
-      }
+        "System.Console": "4.0.0-*"
+      },
+      "imports": [
+        "dnxcore50"
+      ]
    }
  },
  "commands": {
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json
@ -10,11 +10,14 @@
  },
  "testRunner": "xunit",
  "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
      "dependencies": {
        "dotnet-test-xunit": "1.0.0-dev-*"
      },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
    },
    "net451": {
      "frameworkAssemblies": {
@ -29,4 +32,4 @@
  "compilationOptions": {
    "warningsAsErrors": true
  }
-}
+}
--- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json
@ -15,12 +15,15 @@
  ],
  "testRunner": "xunit",
  "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
      "dependencies": {
        "moq.netcore": "4.4.0-beta8",
        "dotnet-test-xunit": "1.0.0-dev-*"
      },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
    },
    "net451": {
      "frameworkAssemblies": {
@ -33,4 +36,4 @@
      }
    }
  }
-}
+}
--- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json
@ -22,8 +22,11 @@
    "bower_components"
  ],
  "frameworks": {
-    "dnxcore50": {
-      "imports": "portable-net451+win8",
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ],
      "dependencies": {
        "dotnet-test-xunit": "1.0.0-dev-*"
      }
@ -40,4 +43,4 @@
    "**.vspscc"
  ],
  "version": "1.0.0-*"
-}
+}
--- a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json
@ -14,12 +14,15 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
      "dependencies": {
        "moq.netcore": "4.4.0-beta8",
        "dotnet-test-xunit": "1.0.0-dev-*"
      },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
    },
    "net451": {
      "frameworkAssemblies": {
@ -39,4 +42,4 @@
  "resource": [
    "Resources/**"
  ]
-}
+}
--- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json
+++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json
@ -13,11 +13,14 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
      "dependencies": {
        "dotnet-test-xunit": "1.0.0-dev-*"
      },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
    },
    "net451": {
      "frameworkAssemblies": {
@ -30,4 +33,4 @@
    }
  },
  "testRunner": "xunit"
-}
+}