Move Microsoft.NETCore.App to top of dependencies section

aspnet · Apr 26, 2016 · 1a8c062 · 1a8c062
1 parent 53f174b
commit 1a8c062
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 87 deletions.
diff --git a/src/BaseTemplates/EmptyWeb/project.json b/src/BaseTemplates/EmptyWeb/project.json
@@ -1,11 +1,11 @@
 {
-  "dependencies": {
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"$if$ ($context$ == WebCore),
+  "dependencies": {$if$ ($context$ == WebCore)
     "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    }$endif$
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },$endif$
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
 
   "tools": {

diff --git a/src/BaseTemplates/StarterWeb/project.json b/src/BaseTemplates/StarterWeb/project.json
@@ -1,8 +1,12 @@
 {
   "dependencies": {$if$ ($context$ == WebCore)
+    "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },
     "dotnet-razor-tooling": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },$endif$
     "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -14,11 +18,7 @@
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    },$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "__VSVER__.0-*"
   },
 

diff --git a/src/BaseTemplates/WebAPI/project.json b/src/BaseTemplates/WebAPI/project.json
@@ -1,17 +1,17 @@
 {
-  "dependencies": {
+  "dependencies": {$if$ ($context$ == WebCore)
+    "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },$endif$
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*",
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*"$if$ ($context$ == WebCore),
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    }$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*"
   },
 
   "tools": {

diff --git a/src/Rules/StarterWeb/AI/IndividualAuth/project.json b/src/Rules/StarterWeb/AI/IndividualAuth/project.json
@@ -2,17 +2,21 @@
   "userSecretsId": "aspnet-$safeprojectname$-$guid2$",
 
   "dependencies": {$if$ ($context$ == WebCore)
+    "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },
     "dotnet-aspnet-codegenerator": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },
     "dotnet-ef": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },
     "dotnet-razor-tooling": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },$endif$
     "Microsoft.ApplicationInsights.AspNetCore": "__ApplicationInsightsPackageVersion__",
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
@@ -33,11 +37,7 @@
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    },$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "__VSVER__.0-*"
   },
 

diff --git a/src/Rules/StarterWeb/AI/NoAuth/project.json b/src/Rules/StarterWeb/AI/NoAuth/project.json
@@ -1,8 +1,12 @@
 {
   "dependencies": {$if$ ($context$ == WebCore)
+    "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },
     "dotnet-razor-tooling": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },$endif$
     "Microsoft.ApplicationInsights.AspNetCore": "__ApplicationInsightsPackageVersion__",
     "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
@@ -16,11 +20,7 @@
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    },$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "__VSVER__.0-*"
   },
 

diff --git a/src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json b/src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json
@@ -2,9 +2,13 @@
   "userSecretsId": "aspnet-$safeprojectname$-$guid2$",
 
   "dependencies": {$if$ ($context$ == WebCore)
+    "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },
     "dotnet-razor-tooling": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },$endif$
     "Microsoft.ApplicationInsights.AspNetCore": "__ApplicationInsightsPackageVersion__",
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
@@ -20,11 +24,7 @@
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    },$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "__VSVER__.0-*"
   },
 

diff --git a/src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json b/src/Rules/StarterWeb/AI/OrganizationalAuth/Single/Common/project.json
@@ -2,9 +2,13 @@
   "userSecretsId": "aspnet-$safeprojectname$-$guid2$",
 
   "dependencies": {$if$ ($context$ == WebCore)
+    "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },
     "dotnet-razor-tooling": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },$endif$
     "Microsoft.ApplicationInsights.AspNetCore": "__ApplicationInsightsPackageVersion__",
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
@@ -20,11 +24,7 @@
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    },$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "__VSVER__.0-*"
   },
 

diff --git a/src/Rules/StarterWeb/IndividualAuth/project.json b/src/Rules/StarterWeb/IndividualAuth/project.json
@@ -2,17 +2,21 @@
   "userSecretsId": "aspnet-$safeprojectname$-$guid2$",
 
   "dependencies": {$if$ ($context$ == WebCore)
+    "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },
     "dotnet-aspnet-codegenerator": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },
     "dotnet-ef": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },
     "dotnet-razor-tooling": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },$endif$
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
     "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
@@ -32,11 +36,7 @@
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    },$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "__VSVER__.0-*"
   },
 

diff --git a/src/Rules/StarterWeb/OrganizationalAuth/Common/project.json b/src/Rules/StarterWeb/OrganizationalAuth/Common/project.json
@@ -2,9 +2,13 @@
   "userSecretsId": "aspnet-$safeprojectname$-$guid2$",
 
   "dependencies": {$if$ ($context$ == WebCore)
+    "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },
     "dotnet-razor-tooling": {
-      "type": "build",
-      "version": "__AspNetCorePlatformVersion__"
+      "version": "__AspNetCorePlatformVersion__",
+      "type": "build"
     },$endif$
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
     "Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-*",
@@ -19,11 +23,7 @@
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    },$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.VisualStudio.Web.BrowserLink.Loader": "__VSVER__.0-*"
   },
 

diff --git a/src/Rules/WebAPI/AI/NoAuth/project.json b/src/Rules/WebAPI/AI/NoAuth/project.json
@@ -1,5 +1,9 @@
 {
-  "dependencies": {
+  "dependencies": {$if$ ($context$ == WebCore)
+    "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },$endif$
     "Microsoft.ApplicationInsights.AspNetCore": "__ApplicationInsightsPackageVersion__",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
@@ -8,11 +12,7 @@
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    }$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*"
   },
 
   "tools": {

diff --git a/src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json b/src/Rules/WebAPI/AI/OrganizationalAuth/Single/project.json
@@ -1,7 +1,11 @@
 {
   "userSecretsId": "aspnet-$safeprojectname$-$guid2$",
 
-  "dependencies": {
+  "dependencies": {$if$ ($context$ == WebCore)
+      "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },$endif$
     "Microsoft.ApplicationInsights.AspNetCore": "__ApplicationInsightsPackageVersion__",
     "Microsoft.AspNetCore.Authentication.JwtBearer": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -12,11 +16,7 @@
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    }$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*"
   },
 
   "tools": {

diff --git a/src/Rules/WebAPI/OrganizationalAuth/Single/project.json b/src/Rules/WebAPI/OrganizationalAuth/Single/project.json
@@ -1,7 +1,11 @@
 {
   "userSecretsId": "aspnet-$safeprojectname$-$guid2$",
 
-  "dependencies": {
+  "dependencies": {$if$ ($context$ == WebCore)
+      "Microsoft.NETCore.App": {
+      "version": "__NetCorePlatformVersion__",
+      "type": "platform"
+    },$endif$
     "Microsoft.AspNetCore.Authentication.JwtBearer": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
@@ -11,11 +15,7 @@
     "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",$if$ ($context$ == WebCore)
-    "Microsoft.NETCore.App": {
-      "type": "platform",
-      "version": "__NetCorePlatformVersion__"
-    }$endif$
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*"
   },
 
   "tools": {