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:53 -08:00 · 2016-03-01 13:36:53 -08:00 · e3979fd3fe
parent 9a57f8116d
commit e3979fd3fe
19 changed files with 113 additions and 49 deletions
--- a/samples/CookieSample/project.json
+++ b/samples/CookieSample/project.json
@ -14,7 +14,11 @@
    "web": "CookieSample"
  },
  "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  }
-}
+}
--- a/samples/CookieSessionSample/project.json
+++ b/samples/CookieSessionSample/project.json
@ -15,7 +15,11 @@
    "web": "CookieSessionSample"
  },
  "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  }
-}
+}
--- a/samples/JwtBearerSample/project.json
+++ b/samples/JwtBearerSample/project.json
@ -15,8 +15,12 @@
    "web": "JwtBearerSample"
  },
  "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  },
  "exclude": [
    "wwwroot",
@ -27,4 +31,4 @@
    "**.vspscc"
  ],
  "userSecretsId": "aspnet5-JwtBearerSample-20151210102827"
-}
+}
--- a/samples/OpenIdConnectSample/project.json
+++ b/samples/OpenIdConnectSample/project.json
@ -10,7 +10,11 @@
  },
  "frameworks": {
    "dnx451": {},
-    "dnxcore50": {}
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  },
  "compilationOptions": {
    "emitEntryPoint": true
--- a/samples/SocialSample/project.json
+++ b/samples/SocialSample/project.json
@ -19,8 +19,12 @@
    "web": "SocialSample"
  },
  "frameworks": {
-    "dnx451": { },
-    "dnxcore50": { }
+    "dnx451": {},
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
  },
  "userSecretsId": "aspnet5-SocialSample-20151210111056"
-}
+}
--- a/src/Microsoft.AspNetCore.Authentication.Cookies/project.json
+++ b/src/Microsoft.AspNetCore.Authentication.Cookies/project.json
@ -16,6 +16,10 @@
  },
  "frameworks": {
    "net451": {},
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
  }
 }
--- a/src/Microsoft.AspNetCore.Authentication.Facebook/project.json
+++ b/src/Microsoft.AspNetCore.Authentication.Facebook/project.json
@ -14,8 +14,11 @@
  },
  "frameworks": {
    "net451": {},
-    "dotnet5.4": {
-      "imports": "portable-net451+win8"
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
    }
  }
 }
--- a/src/Microsoft.AspNetCore.Authentication.Google/project.json
+++ b/src/Microsoft.AspNetCore.Authentication.Google/project.json
@ -14,8 +14,11 @@
  },
  "frameworks": {
    "net451": {},
-    "dotnet5.4": {
-      "imports": "portable-net451+win8"
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
    }
  }
 }
--- a/src/Microsoft.AspNetCore.Authentication.JwtBearer/project.json
+++ b/src/Microsoft.AspNetCore.Authentication.JwtBearer/project.json
@ -14,9 +14,12 @@
    "Microsoft.IdentityModel.Protocols.OpenIdConnect": "2.0.0-*"
  },
  "frameworks": {
-    "net451": { },
-    "dotnet5.4": {
-      "imports": "portable-net451+win8"
+    "net451": {},
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
    }
  }
-}
+}
--- a/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/project.json
+++ b/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/project.json
@ -14,8 +14,11 @@
  },
  "frameworks": {
    "net451": {},
-    "dotnet5.4": {
-      "imports": "portable-net451+win8"
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
    }
  }
 }
--- a/src/Microsoft.AspNetCore.Authentication.OAuth/project.json
+++ b/src/Microsoft.AspNetCore.Authentication.OAuth/project.json
@ -19,11 +19,14 @@
        "System.Net.Http": ""
      }
    },
-    "dotnet5.4": {
+    "netstandard1.3": {
      "dependencies": {
        "System.Net.Http": "4.0.1-*"
      },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
    }
  }
-}
+}
--- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/project.json
+++ b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/project.json
@ -15,8 +15,11 @@
  },
  "frameworks": {
    "net451": {},
-    "dotnet5.4": {
-      "imports": "portable-net451+win8"
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4",
+        "portable-net451+win8"
+      ]
    }
  }
 }
--- a/src/Microsoft.AspNetCore.Authentication.Twitter/project.json
+++ b/src/Microsoft.AspNetCore.Authentication.Twitter/project.json
@ -18,10 +18,13 @@
        "System.Net.Http": ""
      }
    },
-    "dotnet5.4": {
+    "netstandard1.3": {
      "dependencies": {
        "System.Net.Http": "4.0.1-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
    }
  }
-}
+}
--- a/src/Microsoft.AspNetCore.Authentication/project.json
+++ b/src/Microsoft.AspNetCore.Authentication/project.json
@ -27,11 +27,14 @@
        "System.Net.Http": ""
      }
    },
-    "dotnet5.4": {
+    "netstandard1.3": {
      "dependencies": {
        "System.Net.Http": "4.0.1-*"
      },
-      "imports": "portable-net451"
+      "imports": [
+        "dotnet5.4",
+        "portable-net451"
+      ]
    }
  }
-}
+}
--- a/src/Microsoft.AspNetCore.Authorization/project.json
+++ b/src/Microsoft.AspNetCore.Authorization/project.json
@ -14,11 +14,14 @@
    "Microsoft.Extensions.Options": "1.0.0-*"
  },
  "frameworks": {
-    "net451": { },
-    "dotnet5.4": {
+    "net451": {},
+    "netstandard1.3": {
      "dependencies": {
        "System.Security.Claims": "4.0.1-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
    }
  }
 }
--- a/src/Microsoft.AspNetCore.CookiePolicy/project.json
+++ b/src/Microsoft.AspNetCore.CookiePolicy/project.json
@ -15,6 +15,10 @@
  },
  "frameworks": {
    "net451": {},
-    "dotnet5.4": {}
+    "netstandard1.3": {
+      "imports": [
+        "dotnet5.4"
+      ]
+    }
  }
 }
--- a/test/Microsoft.AspNetCore.Authentication.Test/project.json
+++ b/test/Microsoft.AspNetCore.Authentication.Test/project.json
@ -16,11 +16,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": {
@ -33,4 +36,4 @@
    }
  },
  "testRunner": "xunit"
-}
+}
--- a/test/Microsoft.AspNetCore.Authorization.Test/project.json
+++ b/test/Microsoft.AspNetCore.Authorization.Test/project.json
@ -11,11 +11,14 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
      "dependencies": {
-        "dotnet-test-xunit": "1.0.0-dev-*" 
+        "dotnet-test-xunit": "1.0.0-dev-*"
      },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
    },
    "net451": {
      "frameworkAssemblies": {
@ -28,4 +31,4 @@
    }
  },
  "testRunner": "xunit"
-}
+}
--- a/test/Microsoft.AspNetCore.CookiePolicy.Test/project.json
+++ b/test/Microsoft.AspNetCore.CookiePolicy.Test/project.json
@ -10,11 +10,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": {
@ -28,4 +31,4 @@
    }
  },
  "testRunner": "xunit"
-}
+}