Skip to content
This repository has been archived by the owner on Sep 21, 2018. It is now read-only.

React to project.json schema changes and tooling package renames #536

Merged
merged 3 commits into from
May 4, 2016
Merged

React to project.json schema changes and tooling package renames #536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
14824f6
Rename compilationOptions -> buildOptions
phenning Apr 29, 2016
aa31cb9
React to project.json schema changes and tooling package renames
phenning May 3, 2016
53b562e
Remove exclude section from publishOptions
phenning May 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/BaseTemplates/ConsoleApp/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true
},

Expand Down
20 changes: 8 additions & 12 deletions src/BaseTemplates/EmptyWeb/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,25 +26,21 @@
"$netframeworkversion$": { }$endif$
},

"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},
$if$ ($context$ == WebCore)
"runtimeOptions": {
"configProperties": {
"System.GC.Server": true
}
"gcServer": true
},
$endif$
"content": [
"wwwroot",
"web.config"
],

"exclude": [
"node_modules"
],
"publishOptions": {
"include": [
"wwwroot",
"web.config"
]
},

"scripts": {$if$ ($aspnet_useplatformhandler$ == false)$else$
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]$endif$
Expand Down
34 changes: 15 additions & 19 deletions src/BaseTemplates/StarterWeb/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"version": "__NetCorePlatformVersion__",
"type": "platform"
},$endif$
"dotnet-razor-tooling": {
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Tools": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",$if$ ($aspnet_useplatformhandler$ == false)$else$
},$if$ ($aspnet_useplatformhandler$ == false)$else$
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",$endif$
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
Expand All @@ -22,7 +22,7 @@
},

"tools": {
"dotnet-razor-tooling": {
"Microsoft.AspNetCore.Razor.Tools": {
"version": "__AspNetCorePlatformVersion__",
"imports": "portable-net45+win8+dnxcore50"
}$if$ ($aspnet_useplatformhandler$ == false)$else$,
Expand All @@ -43,27 +43,23 @@
"$netframeworkversion$": { }$endif$
},

"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},
$if$ ($context$ == WebCore)
"runtimeOptions": {
"configProperties": {
"System.GC.Server": true
}
"gcServer": true
},
$endif$
"content": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
],

"exclude": [
"node_modules"
],
"publishOptions": {
"include": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
]
},

"scripts": {
"prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ]$if$ ($aspnet_useplatformhandler$ == false)$else$,
Expand Down
24 changes: 10 additions & 14 deletions src/BaseTemplates/WebAPI/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,27 +33,23 @@
"$netframeworkversion$": { }$endif$
},

"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},
$if$ ($context$ == WebCore)
"runtimeOptions": {
"configProperties": {
"System.GC.Server": true
}
"gcServer": true
},
$endif$
"content": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
],

"exclude": [
"node_modules"
],
"publishOptions": {
"include": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
]
},

"scripts": {$if$ ($aspnet_useplatformhandler$ == false)$else$
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]$endif$
Expand Down
62 changes: 31 additions & 31 deletions src/Rules/StarterWeb/AI/IndividualAuth/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,16 @@
"version": "__NetCorePlatformVersion__",
"type": "platform"
},$endif$
"dotnet-aspnet-codegenerator": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},
"dotnet-razor-tooling": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},
"Microsoft.ApplicationInsights.AspNetCore": "__ApplicationInsightsPackageVersion__",
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-*",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",$if$ ($aspnet_useplatformhandler$ == false)$else$
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Tools": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},$if$ ($aspnet_useplatformhandler$ == false)$else$
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",$endif$
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
Expand All @@ -28,6 +24,14 @@
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},
"Microsoft.Extensions.CodeGeneration.Tools": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},
"Microsoft.Extensions.CodeGenerators.Mvc": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},
"Microsoft.Extensions.CodeGenerators.Mvc": "1.0.0-*",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
"Microsoft.Extensions.Configuration.Json": "1.0.0-*",
Expand All @@ -39,14 +43,7 @@
},

"tools": {
"dotnet-aspnet-codegenerator": {
"version": "__AspNetCorePlatformVersion__",
"imports": [
"portable-net45+win8+dnxcore50",
"portable-net45+win8"
]
},
"dotnet-razor-tooling": {
"Microsoft.AspNetCore.Razor.Tools": {
"version": "__AspNetCorePlatformVersion__",
"imports": "portable-net45+win8+dnxcore50"
},$if$ ($aspnet_useplatformhandler$ == false)$else$
Expand All @@ -61,6 +58,13 @@
"portable-net45+win8"
]
},
"Microsoft.Extensions.CodeGeneration.Tools": {
"version": "__AspNetCorePlatformVersion__",
"imports": [
"portable-net45+win8+dnxcore50",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we know why both of these imports are required here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, net45+win8+dnxcore50 is required to get the proper version of json.net, just specifying net45+win8 nets you a json.net that has a fx dependency on System.Runtime 2.0.5.0

net45+win8 is required for Ix.Async and Remotion

"portable-net45+win8"
]
},
"Microsoft.Extensions.SecretManager.Tools": {
"version": "__AspNetCorePlatformVersion__",
"imports": "portable-net45+win8+dnxcore50"
Expand All @@ -78,27 +82,23 @@
"$netframeworkversion$": { }$endif$
},

"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},
$if$ ($context$ == WebCore)
"runtimeOptions": {
"configProperties": {
"System.GC.Server": true
}
"gcServer": true
},
$endif$
"content": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
],

"exclude": [
"node_modules"
],
"publishOptions": {
"include": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
]
},

"scripts": {
"prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ]$if$ ($aspnet_useplatformhandler$ == false)$else$,
Expand Down
36 changes: 16 additions & 20 deletions src/Rules/StarterWeb/AI/NoAuth/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"version": "__NetCorePlatformVersion__",
"type": "platform"
},$endif$
"dotnet-razor-tooling": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},
"Microsoft.ApplicationInsights.AspNetCore": "__ApplicationInsightsPackageVersion__",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",$if$ ($aspnet_useplatformhandler$ == false)$else$
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Tools": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},$if$ ($aspnet_useplatformhandler$ == false)$else$
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",$endif$
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
Expand All @@ -23,7 +23,7 @@
},

"tools": {
"dotnet-razor-tooling": {
"Microsoft.AspNetCore.Razor.Tools": {
"version": "__AspNetCorePlatformVersion__",
"imports": "portable-net45+win8+dnxcore50"
}$if$ ($aspnet_useplatformhandler$ == false)$else$,
Expand All @@ -44,27 +44,23 @@
"$netframeworkversion$": { }$endif$
},

"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},
$if$ ($context$ == WebCore)
"runtimeOptions": {
"configProperties": {
"System.GC.Server": true
}
"gcServer": true
},
$endif$
"content": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
],

"exclude": [
"node_modules"
],
"publishOptions": {
"include": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
]
},

"scripts": {
"prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ]$if$ ($aspnet_useplatformhandler$ == false)$else$,
Expand Down
38 changes: 17 additions & 21 deletions src/Rules/StarterWeb/AI/OrganizationalAuth/Multiple/Common/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"version": "__NetCorePlatformVersion__",
"type": "platform"
},$endif$
"dotnet-razor-tooling": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},
"Microsoft.ApplicationInsights.AspNetCore": "__ApplicationInsightsPackageVersion__",
"Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
"Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-*",
"Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
"Microsoft.AspNetCore.Mvc": "1.0.0-*",$if$ ($aspnet_useplatformhandler$ == false)$else$
"Microsoft.AspNetCore.Mvc": "1.0.0-*",
"Microsoft.AspNetCore.Razor.Tools": {
"version": "__AspNetCorePlatformVersion__",
"type": "build"
},$if$ ($aspnet_useplatformhandler$ == false)$else$
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",$endif$
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
"Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
Expand All @@ -28,10 +28,10 @@
},

"tools": {
"dotnet-razor-tooling": {
"Microsoft.AspNetCore.Razor.Tools": {
"version": "__AspNetCorePlatformVersion__",
"imports": "portable-net45+win8+dnxcore50"
},$if$ ($aspnet_useplatformhandler$ == false)$else$
}$if$ ($aspnet_useplatformhandler$ == false)$else$,
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
"version": "__AspNetCorePlatformVersion__",
"imports": "portable-net45+win8+dnxcore50"
Expand All @@ -53,27 +53,23 @@
"$netframeworkversion$": { }$endif$
},

"compilationOptions": {
"buildOptions": {
"emitEntryPoint": true,
"preserveCompilationContext": true
},
$if$ ($context$ == WebCore)
"runtimeOptions": {
"configProperties": {
"System.GC.Server": true
}
"gcServer": true
},
$endif$
"content": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
],

"exclude": [
"node_modules"
],
"publishOptions": {
"include": [
"wwwroot",
"Views",
"appsettings.json",
"web.config"
]
},

"scripts": {
"prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ]$if$ ($aspnet_useplatformhandler$ == false)$else$,
Expand Down
Loading