Update aspnet50/aspnetcore50 => dnx451/dnxcore50.

2015-03-08 12:50:39 -07:00 · 2015-03-08 12:50:39 -07:00 · 0ad48b90b2
parent 9988d5205e
commit 0ad48b90b2
21 changed files with 54 additions and 54 deletions
--- a/src/Microsoft.AspNet.FeatureModel/project.json
+++ b/src/Microsoft.AspNet.FeatureModel/project.json
@ -1,11 +1,11 @@
-{
+{
  "version": "1.0.0-*",
  "description": "ASP.NET 5 HTTP feature infrastructure.",
  "dependencies": {
  },
  "frameworks": {
-    "aspnet50": {},
-    "aspnetcore50": {
+    "dnx451": {},
+    "dnxcore50": {
      "dependencies": {
        "System.Collections": "4.0.10-beta-*",
        "System.Linq": "4.0.0-beta-*",
--- a/src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs
+++ b/src/Microsoft.AspNet.Http.Core/ReferenceReadStream.cs
@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Http.Core
            _position += read;
            return read;
        }
-#if ASPNET50
+#if DNX451
        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
        {
            ThrowIfDisposed();
@ -159,7 +159,7 @@ namespace Microsoft.AspNet.Http.Core
        {
            throw new NotSupportedException();
        }
-#if ASPNET50
+#if DNX451
        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
        {
            throw new NotSupportedException();
@ -196,4 +196,4 @@ namespace Microsoft.AspNet.Http.Core
            }
        }
    }
-}
+}
--- a/src/Microsoft.AspNet.Http.Core/project.json
+++ b/src/Microsoft.AspNet.Http.Core/project.json
@ -1,4 +1,4 @@
-
+
 {
  "version": "1.0.0-*",
  "description": "ASP.NET 5 HTTP feature implementations.",
@ -11,8 +11,8 @@

  },
  "frameworks": {
-    "aspnet50": {},
-    "aspnetcore50": {
+    "dnx451": {},
+    "dnxcore50": {
      "dependencies": {
        "Microsoft.Net.WebSocketAbstractions": "1.0.0-*",
        "System.Collections": "4.0.10-beta-*",
--- a/src/Microsoft.AspNet.Http.Extensions/project.json
+++ b/src/Microsoft.AspNet.Http.Extensions/project.json
@ -1,4 +1,4 @@
-{
+{
    "version": "1.0.0-*",
    "description": "ASP.NET 5 common extension methods for HTTP abstractions and IApplicationBuilder.",
    "dependencies": {
@ -7,9 +7,9 @@
        "Microsoft.Net.Http.Headers": "1.0.0-*"
    },
    "frameworks" : {
-        "aspnet50" : {
+        "dnx451" : {
        },
-        "aspnetcore50" : {
+        "dnxcore50" : {
            "dependencies": {
                "System.Reflection.TypeExtensions": "4.0.0-beta-*",
                "System.Runtime": "4.0.20-beta-*"
--- a/src/Microsoft.AspNet.Http.Interfaces/project.json
+++ b/src/Microsoft.AspNet.Http.Interfaces/project.json
@ -1,9 +1,9 @@
-{
+{
  "version": "1.0.0-*",
  "description": "ASP.NET 5 HTTP feature interface definitions.",
  "frameworks": {
-    "aspnet50": {},
-    "aspnetcore50": {
+    "dnx451": {},
+    "dnxcore50": {
      "dependencies": {
        "Microsoft.Net.WebSocketAbstractions": "1.0.0-*",
        "System.Net.Primitives": "4.0.10-beta-*",
--- a/src/Microsoft.AspNet.Http/project.json
+++ b/src/Microsoft.AspNet.Http/project.json
@ -1,10 +1,10 @@
-{
+{
  "version": "1.0.0-*",
  "description": "ASP.NET 5 HTTP object model. HttpContext and family.",
  "dependencies": {},
  "frameworks": {
-    "aspnet50": {},
-    "aspnetcore50": {
+    "dnx451": {},
+    "dnxcore50": {
      "dependencies": {
        "Microsoft.Net.WebSocketAbstractions": "1.0.0-*",
        "System.Collections": "4.0.10-beta-*",
--- a/src/Microsoft.AspNet.Owin/project.json
+++ b/src/Microsoft.AspNet.Owin/project.json
@ -1,4 +1,4 @@
-{
+{
    "version": "1.0.0-*",
    "description": "ASP.NET 5 component for running OWIN middleware.",
    "dependencies": {
@ -7,8 +7,8 @@
        "Microsoft.AspNet.Http.Core": "1.0.0-*"
    },
    "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
            "dependencies": {
                "System.Collections": "4.0.10-beta-*",
                "System.ComponentModel": "4.0.0-beta-*",
--- a/src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs
+++ b/src/Microsoft.AspNet.WebUtilities/BufferedReadStream.cs
@ -144,7 +144,7 @@ namespace Microsoft.AspNet.WebUtilities
        {
            _inner.Write(buffer, offset, count);
        }
-#if ASPNET50
+#if DNX451
        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
        {
            return _inner.BeginWrite(buffer, offset, count, callback, state);
@ -193,7 +193,7 @@ namespace Microsoft.AspNet.WebUtilities

            return await _inner.ReadAsync(buffer, offset, count, cancellationToken);
        }
-#if ASPNET50
+#if DNX451
        // We only anticipate using ReadAsync
        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
        {
--- a/src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs
+++ b/src/Microsoft.AspNet.WebUtilities/FileBufferingReadStream.cs
@ -123,7 +123,7 @@ namespace Microsoft.AspNet.WebUtilities

            return read;
        }
-#if ASPNET50
+#if DNX451
        public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
        {
            ThrowIfDisposed();
@ -199,7 +199,7 @@ namespace Microsoft.AspNet.WebUtilities
        {
            throw new NotSupportedException();
        }
-#if ASPNET50
+#if DNX451
        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
        {
            throw new NotSupportedException();
@ -245,4 +245,4 @@ namespace Microsoft.AspNet.WebUtilities
            }
        }
    }
-}
+}
--- a/src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs
+++ b/src/Microsoft.AspNet.WebUtilities/MultipartReaderStream.cs
@ -109,7 +109,7 @@ namespace Microsoft.AspNet.WebUtilities
        {
            throw new NotSupportedException();
        }
-#if ASPNET50
+#if DNX451
        public override IAsyncResult BeginWrite(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
        {
            throw new NotSupportedException();
@ -147,7 +147,7 @@ namespace Microsoft.AspNet.WebUtilities
            }
            return read;
        }
-#if ASPNET50
+#if DNX451
        public override IAsyncResult BeginRead(byte[] buffer, int offset, int size, AsyncCallback callback, object state)
        {
            var tcs = new TaskCompletionSource<int>(state);
@ -317,4 +317,4 @@ namespace Microsoft.AspNet.WebUtilities
            return matchCount > 0;
        }
    }
-}
+}
--- a/src/Microsoft.AspNet.WebUtilities/project.json
+++ b/src/Microsoft.AspNet.WebUtilities/project.json
@ -1,11 +1,11 @@
-{
+{
    "version": "1.0.0-*",
    "description": "ASP.NET 5 common helper methods.",
    "dependencies": {
    },
    "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
            "dependencies": {
                "System.Collections": "4.0.10-beta-*",
                "System.Diagnostics.Debug": "4.0.10-beta-*",
--- a/src/Microsoft.Framework.WebEncoders/project.json
+++ b/src/Microsoft.Framework.WebEncoders/project.json
@ -1,4 +1,4 @@
-{
+{
    "version": "1.0.0-*",
    "description": "Contains encoders for HTML, JavaScript, and URLs.",
    "compilationOptions": {
@ -11,8 +11,8 @@
    },
    "frameworks": {
        "net45": { },
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
            "dependencies": {
                "System.Diagnostics.Debug": "4.0.10-beta-*",
                "System.IO": "4.0.10-beta-*",
--- a/src/Microsoft.Net.Http.Headers/project.json
+++ b/src/Microsoft.Net.Http.Headers/project.json
@ -4,8 +4,8 @@
    },
    "frameworks" : {
        "net45" : { },
-        "aspnet50" : { },
-        "aspnetcore50" : {
+        "dnx451" : { },
+        "dnxcore50" : {
            "dependencies": {
                "System.Collections": "4.0.10-beta-*",
                "System.Diagnostics.Contracts": "4.0.0-beta-*",
--- a/test/Microsoft.AspNet.FeatureModel.Tests/project.json
+++ b/test/Microsoft.AspNet.FeatureModel.Tests/project.json
@ -1,4 +1,4 @@
-{
+{
  "dependencies": {
    "Microsoft.AspNet.FeatureModel": "1.0.0-*",
    "Microsoft.AspNet.Http": "1.0.0-*",
@ -9,7 +9,7 @@
    "test": "xunit.runner.kre"
  },
  "frameworks": {
-    "aspnet50": { 
+    "dnx451": { 
      "dependencies": {
        "Shouldly": "1.1.1.1"
      }
--- a/test/Microsoft.AspNet.Http.Core.Tests/project.json
+++ b/test/Microsoft.AspNet.Http.Core.Tests/project.json
@ -1,4 +1,4 @@
-{
+{
    "dependencies": {
        "Microsoft.AspNet.FeatureModel": "1.0.0-*",
        "Microsoft.AspNet.Http": "1.0.0-*",
@ -10,7 +10,7 @@
        "test": "xunit.runner.kre"
    },
    "frameworks": {
-        "aspnet50": {
+        "dnx451": {
            "dependencies": {
                "Moq": "4.2.1312.1622"
            },
--- a/test/Microsoft.AspNet.Http.Extensions.Tests/project.json
+++ b/test/Microsoft.AspNet.Http.Extensions.Tests/project.json
@ -1,4 +1,4 @@
-{
+{
  "dependencies": {
    "Microsoft.AspNet.Http": "1.0.0-*",
    "Microsoft.AspNet.Http.Extensions": "1.0.0-*",
@ -10,7 +10,7 @@
    "test": "xunit.runner.kre"
  },
  "frameworks": {
-    "aspnet50": {
+    "dnx451": {
      "dependencies": {
        "Shouldly": "1.1.1.1"
      }
--- a/test/Microsoft.AspNet.Http.Tests/project.json
+++ b/test/Microsoft.AspNet.Http.Tests/project.json
@ -1,4 +1,4 @@
-{
+{
  "dependencies": {
    "Microsoft.AspNet.Http": "1.0.0-*",
    "Microsoft.AspNet.Http.Interfaces": "1.0.0-*",
@ -10,7 +10,7 @@
    "test": "xunit.runner.kre"
  },
  "frameworks": {
-    "aspnet50": { 
+    "dnx451": { 
      "dependencies": {
        "Shouldly": "1.1.1.1"
      }
--- a/test/Microsoft.AspNet.Owin.Tests/project.json
+++ b/test/Microsoft.AspNet.Owin.Tests/project.json
@ -1,4 +1,4 @@
-{
+{
  "dependencies": {
    "Microsoft.AspNet.FeatureModel": "1.0.0-*",
    "Microsoft.AspNet.Http": "1.0.0-*",
@ -11,7 +11,7 @@
    "test": "xunit.runner.kre"
  },
  "frameworks": {
-    "aspnet50": {
+    "dnx451": {
      "dependencies": {
        "Shouldly": "1.1.1.1"
      }
--- a/test/Microsoft.AspNet.WebUtilities.Tests/project.json
+++ b/test/Microsoft.AspNet.WebUtilities.Tests/project.json
@ -1,4 +1,4 @@
-{
+{
    "dependencies": {
        "Microsoft.AspNet.Http": "1.0.0-*",
        "Microsoft.AspNet.WebUtilities": "1.0.0-*",
@ -9,7 +9,7 @@
        "test": "xunit.runner.kre"
    },
    "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": { }
+        "dnx451": { },
+        "dnxcore50": { }
    }
 }
--- a/test/Microsoft.Framework.WebEncoders.Tests/project.json
+++ b/test/Microsoft.Framework.WebEncoders.Tests/project.json
@ -1,4 +1,4 @@
-{
+{
    "dependencies": {
        "Microsoft.Framework.DependencyInjection": "1.0.0-*",
        "Microsoft.Framework.WebEncoders": "1.0.0-*",
@ -13,7 +13,7 @@
        "allowUnsafe": true
    },
    "frameworks": {
-        "aspnet50": { }
+        "dnx451": { }
    },
    "resources": "..\\..\\unicode\\UnicodeData.txt"
 }
--- a/test/Microsoft.Net.Http.Headers.Tests/project.json
+++ b/test/Microsoft.Net.Http.Headers.Tests/project.json
@ -8,8 +8,8 @@
        "test": "xunit.runner.kre"
    },
    "frameworks": {
-        "aspnet50": { },
-        "aspnetcore50": {
+        "dnx451": { },
+        "dnxcore50": {
            "dependencies": {
                "System.Diagnostics.Debug": "4.0.10-beta-*"
            }