Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/aspnetcore.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>2020-05-15 03:17:02 +0300
committerGitHub <noreply@github.com>2020-05-15 03:17:02 +0300
commitd5849f3534403caf665157c4e1045432a35e3951 (patch)
treeb387b3513f022e1f34328026e87d8897daf8c3fe /src/ProjectTemplates/Web.ProjectTemplates/content
parentb02cce809ab92d41e18111970d8f33451d97f3d5 (diff)
[master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling (#21630)
* Update dependencies from https://github.com/dotnet/arcade build 20200511.9 - Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20228.4 => 5.0.0-beta.20261.9 - Microsoft.DotNet.GenAPI: 5.0.0-beta.20228.4 => 5.0.0-beta.20261.9 - Microsoft.DotNet.Helix.Sdk: 5.0.0-beta.20228.4 => 5.0.0-beta.20261.9 * Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200514.6 Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Language , Microsoft.CodeAnalysis.Razor , Microsoft.NET.Sdk.Razor From Version 5.0.0-preview.5.20261.4 -> To Version 5.0.0-preview.6.20264.6 * Pre-emptively take -nobl change * Disable binlogs in CI * Fix build.sh to know about -nobl * Align build.ps1|sh with latest Arcade parameters - do not enable binary logs by default in CI builds - leave `-binaryLog` and `-excludeCIBinaryLog` handling to eng/common/tools.ps1|sh - was unnecessary since `-bl /bl:{some name}` worked fine, ignoring OOMs nit: document `-excludeCIBinarylog` a bit more * Do not pass unknown options into CodeCheck.ps1 * Pass `-ci -nobl` into remaining CI build jobs * Switch default TFM to `net5.0` * Update missing project templates tfms * Add more `-ci -nobl` - needed because _all_ builds in the pipeline are implicitly CI builds - default-build.yml adds `-ci` when script wasn't explicit * Default templates to net5.0 * PR feedback * Update TFMs in explicit .nuspec files * Update TFMs in test projects * Update TFMs in test C# code * Update TFMs in infrastructure files * Future-proof a check for `net5.0` or later - avoid comparisons involving `$(TargetFramework)` in .targets files - fine to compare it with `''` or `$(DefaultNetCoreTargetFramework)` * !fixup! Undo a couple of earlier fixes - remove a duplicate `$()` setting - correct the one remaining versioned `#if` define - did not make it `#if NETCOREAPP` because benchmarks test numerous .NET Core TFMs * Disable binary logs in CodeCheck.ps1 * Specify `-ci -nobl` just once when using `parameters.buildArgs` * Restore `$binaryLog` default logic Co-authored-by: Doug Bunting <6431421+dougbu@users.noreply.github.com> Co-authored-by: Will Godbe <wigodbe@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Diffstat (limited to 'src/ProjectTemplates/Web.ProjectTemplates/content')
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json8
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json8
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json8
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json6
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json6
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json8
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json8
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json8
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json8
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json8
-rw-r--r--src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json8
11 files changed, 42 insertions, 42 deletions
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json
index 66bfdc777b..484e81863c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/.template.config/template.json
@@ -337,12 +337,12 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "replaces": "netcoreapp5.0",
- "defaultValue": "netcoreapp5.0"
+ "replaces": "net5.0",
+ "defaultValue": "net5.0"
},
"copyrightYear": {
"type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
index caf1ab80e6..9964a3ae5a 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json
@@ -86,12 +86,12 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "replaces": "netcoreapp5.0",
- "defaultValue": "netcoreapp5.0"
+ "replaces": "net5.0",
+ "defaultValue": "net5.0"
},
"copyrightYear": {
"type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
index df7b62a169..9f436eba9c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json
@@ -82,12 +82,12 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "replaces": "netcoreapp5.0",
- "defaultValue": "netcoreapp5.0"
+ "replaces": "net5.0",
+ "defaultValue": "net5.0"
},
"copyrightYear": {
"type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json
index 0ca933164a..7c9acda73b 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json
@@ -41,11 +41,11 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "defaultValue": "netcoreapp5.0"
+ "defaultValue": "net5.0"
},
"ExcludeLaunchSettings": {
"type": "parameter",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
index 543e0bdd5d..5a6a957a2c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json
@@ -47,11 +47,11 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "defaultValue": "netcoreapp5.0"
+ "defaultValue": "net5.0"
},
"HostIdentifier": {
"type": "bind",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
index 81aacfa7e7..a98d4dcf6c 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json
@@ -316,12 +316,12 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "replaces": "netcoreapp5.0",
- "defaultValue": "netcoreapp5.0"
+ "replaces": "net5.0",
+ "defaultValue": "net5.0"
},
"copyrightYear": {
"type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
index d846394fa9..9fabeb1cc4 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json
@@ -306,12 +306,12 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "replaces": "netcoreapp5.0",
- "defaultValue": "netcoreapp5.0"
+ "replaces": "net5.0",
+ "defaultValue": "net5.0"
},
"copyrightYear": {
"type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
index 779cf7d82c..6988370f4e 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json
@@ -87,12 +87,12 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "replaces": "netcoreapp5.0",
- "defaultValue": "netcoreapp5.0"
+ "replaces": "net5.0",
+ "defaultValue": "net5.0"
},
"copyrightYear": {
"type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
index 9c560017be..731fcbcb0f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json
@@ -209,12 +209,12 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "replaces": "netcoreapp5.0",
- "defaultValue": "netcoreapp5.0"
+ "replaces": "net5.0",
+ "defaultValue": "net5.0"
},
"copyrightYear": {
"type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
index b3f4e81300..d9d9cf8193 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json
@@ -82,12 +82,12 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "replaces": "netcoreapp5.0",
- "defaultValue": "netcoreapp5.0"
+ "replaces": "net5.0",
+ "defaultValue": "net5.0"
},
"copyrightYear": {
"type": "generated",
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json
index fa3775c564..fdffe3815f 100644
--- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json
+++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json
@@ -47,12 +47,12 @@
"datatype": "choice",
"choices": [
{
- "choice": "netcoreapp5.0",
- "description": "Target netcoreapp5.0"
+ "choice": "net5.0",
+ "description": "Target net5.0"
}
],
- "replaces": "netcoreapp5.0",
- "defaultValue": "netcoreapp5.0"
+ "replaces": "net5.0",
+ "defaultValue": "net5.0"
},
"copyrightYear": {
"type": "generated",