Skip to content

[automated] Merge branch 'release/5.0-rc2' => 'master' #25774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jkotalik merged 68 commits into from
Sep 15, 2020
Merged

[automated] Merge branch 'release/5.0-rc2' => 'master' #25774

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
14a3862
Add Public API baselines for Security (#25651)
Pilchie Sep 10, 2020
6828192
Add public API baselines for Servers (#25652)
Pilchie Sep 10, 2020
70725b5
[release/5.0-rc2] Update dependencies from dotnet/efcore (#25748)
dotnet-maestro[bot] Sep 10, 2020
2228c98
Use ICU sharding (#25521)
pranavkm Sep 10, 2020
0637599
Update DfaMatcherBuilder to use the correct behavior (#25616)
javiercn Sep 10, 2020
31fcc8b
Update error page (#25706)
javiercn Sep 10, 2020
dda1d33
Enable ARM64 installers build. (#25579)
hoyosjs Sep 10, 2020
158401f
Add public API baselines to SignalR (#25653)
Pilchie Sep 10, 2020
848f42d
Add public API baselines for SiteExtensions, Testing, WebEncoders (#2…
Pilchie Sep 10, 2020
09160a7
Use JsonSerializerDefaults instead of specifying individual options (…
pranavkm Sep 10, 2020
0811b3c
Point to the correct directory for SDK test assets (#25734)
pranavkm Sep 10, 2020
3692e12
Add Public API baselines for Razor (#25637)
Pilchie Sep 10, 2020
cc0665c
TypeReference usage clarification (#25719)
kenegozi Sep 10, 2020
fa2a507
Add option to specify hostname in BrowserRefreshServer (#25572)
zbecknell Sep 10, 2020
690c717
Update to latest SDK (#25421)
pranavkm Sep 10, 2020
36f8642
Use T? for unconstrained nullable types (#25261)
pranavkm Sep 10, 2020
18d261b
Use T? for unconstrained nullable types (#25772)
pranavkm Sep 10, 2020
ce475cb
[release/5.0-rc2] Update dependencies from dotnet/arcade dotnet/runti…
dotnet-maestro[bot] Sep 10, 2020
5aa4a7c
Avoid using PATH to find dotnet.exe in RazorSDK tasks (#25750)
pranavkm Sep 10, 2020
327d55d
Prevent ODE when response body isn't reset (#25779)
halter73 Sep 11, 2020
970d0f5
[SignalR] Copy cookies from negotiate to WebSockets (#24572)
BrennanConroy Sep 11, 2020
c18f74d
[release/5.0-rc2] Update dependencies from dotnet/efcore dotnet/runti…
dotnet-maestro[bot] Sep 11, 2020
118d6b2
Updating titles in project templates because in Visual Studio the (#2…
sayedihashimi Sep 11, 2020
11b85eb
Add Windows.10.Amd64.Server20H1.Open helix queue (#25627)
Tratcher Sep 11, 2020
7a74a1b
[release/5.0-rc2] Update dependencies from dotnet/efcore (#25800)
dotnet-maestro[bot] Sep 11, 2020
5f04dfc
Bundle latest 2.2 and 3.1 site extension packages (#25778)
dougbu Sep 11, 2020
f9a18fd
[release/5.0-rc2] Update dependencies from dotnet/runtime dotnet/efco…
dotnet-maestro[bot] Sep 11, 2020
e03d8e7
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 11, 2020
5971498
Condition VS.Redist.* to PostBuildSign (#25793)
Sep 11, 2020
a7d129c
Send CloseMessage in more cases (#25693)
BrennanConroy Sep 11, 2020
2ab6436
Set ShutdownTimeout in Kestrel tests (#25743)
BrennanConroy Sep 11, 2020
c32089a
Add SignalR Client on WASM smoke test (#25526)
BrennanConroy Sep 11, 2020
8496266
Strip duplicates from BuiltProjectOutputGroupOutput (#25785)
wtgodbe Sep 11, 2020
77be06a
Support primitive type/classes in HubConnection.on() (#25773)
wtgodbe Sep 11, 2020
f7a7617
Re-enable Helix tests for signalR java client (#25783)
wtgodbe Sep 11, 2020
83e3134
[Kestrel] Deflake app abort test (#25484)
BrennanConroy Sep 11, 2020
4383118
IIS: Identify if a request has a body (#25381)
Tratcher Sep 11, 2020
9eb9de6
[Java] Catch errors from user callbacks (#25513)
BrennanConroy Sep 11, 2020
a1276de
[release/5.0-rc2] Update dependencies from dotnet/runtime dotnet/efco…
dotnet-maestro[bot] Sep 11, 2020
3932156
Improve Http1ContentLengthMessageBody's reset logic (#25799)
halter73 Sep 11, 2020
004cd1a
PR feedback for platform compatibility update (#25815)
pranavkm Sep 11, 2020
c1b0fb5
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 11, 2020
b5515a8
IIS: Identify if a request has a body (#25381)
Tratcher Sep 11, 2020
326507b
Correct `$(SharedFxVersion)` and `$(TargetingPackVersion)` values (#2…
dougbu Sep 12, 2020
340ee72
Update gRPC version in template to 2.32.0-pre1 (#25587)
JamesNK Sep 12, 2020
a17842a
[Mvc] Add support for order in dynamic controller routes (#25073)
javiercn Aug 25, 2020
b1e1aab
[Mvc] Fix global state in controller and action endpoint data sources.
javiercn Sep 8, 2020
f0c9f60
[release/5.0-rc2] Update dependencies from dotnet/runtime dotnet/efco…
dotnet-maestro[bot] Sep 13, 2020
99496b4
Nullability feedback for public types in Components (#25821)
pranavkm Sep 13, 2020
b760d35
Support override of PlatformManifest.txt content in servicing (#25849)
dougbu Sep 13, 2020
8453a07
Pass `$(MicrosoftNETCoreAppInternalPackageVersion)` to Helix jobs (#2…
dougbu Sep 13, 2020
bfc1ec6
Remove package version pinning for ref/ assemblies in servicing (#25851)
dougbu Sep 13, 2020
ab5dfe5
Allow dotnet-watch to look for changes to .razor.css files (#25792)
pranavkm Sep 13, 2020
e3b6328
Fix Helix testing issues with stable versions and local builds (#25865)
dougbu Sep 14, 2020
4d5b315
V3 publishing (#25784)
epananth Sep 14, 2020
472e829
Update identity web templates (#25834)
Sep 14, 2020
ccbc46c
Fix RCL template to have correct filename for scoped CSS (#25870)
SteveSandersonMS Sep 14, 2020
6b8ce80
Revert 2.2 site extension version update (#25879)
BrennanConroy Sep 14, 2020
6c29f44
Reduce references to Microsoft.AspNetCore.App.Runtime.csproj (#25836)
dougbu Sep 14, 2020
a0ede85
Fix MSB4109 (#25880)
martincostello Sep 14, 2020
a6f667b
Add SkipAnalyzers=true to component declaration compilation (#25736)
pranavkm Sep 14, 2020
7f1ca16
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 14, 2020
e3a52ee
Merge pull request #25881 from dotnet-maestro-bot/merge/release/5.0-t…
Pilchie Sep 14, 2020
45dade2
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 15, 2020
d14e273
[5.0.0-rc2] Backport Fix chrome/selenium tests (#25330) (#25840)
Sep 15, 2020
38c9fe7
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Sep 15, 2020
17e04b7
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Sep 15, 2020
2b6cd9f
Merge branch 'release/5.0-rc2' into master
jkotalik Sep 15, 2020
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
Prev Previous commit
Next Next commit
Update error page (#25706)
  • Loading branch information
@javiercn
javiercn authored Sep 10, 2020
commit 31fcc8bd26f0edc290704f69b892b4ebe966676a
50 changes: 38 additions & 12 deletions src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,42 @@
@page
@model BlazorServerWeb_CSharp.Pages.ErrorModel

<!DOCTYPE html>
<html>

<h1 class="text-danger">Error.</h1>
<h2 class="text-danger">An error occurred while processing your request.</h2>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>Error</title>
<link href="~/css/bootstrap/bootstrap.min.css" rel="stylesheet" />
<link href="~/css/app.css" rel="stylesheet" />
</head>

<h3>Development Mode</h3>
<p>
Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
</p>
<p>
<strong>The Development environment shouldn't be enabled for deployed applications.</strong>
It can result in displaying sensitive information from exceptions to end users.
For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
and restarting the app.
</p>
<body>
<div class="main">
<div class="content px-4">
<h1 class="text-danger">Error.</h1>
<h2 class="text-danger">An error occurred while processing your request.</h2>

@if (Model.ShowRequestId)
{
<p>
<strong>Request ID:</strong> <code>@Model.RequestId</code>
</p>
}

<h3>Development Mode</h3>
<p>
Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred.
</p>
<p>
<strong>The Development environment shouldn't be enabled for deployed applications.</strong>
It can result in displaying sensitive information from exceptions to end users.
For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
and restarting the app.
</p>
</div>
</div>
</body>

</html>
32 changes: 32 additions & 0 deletions ...rojectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/Error.cshtml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Microsoft.Extensions.Logging;

namespace BlazorServerWeb_CSharp.Pages
{
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
[IgnoreAntiforgeryToken]
public class ErrorModel : PageModel
{
public string RequestId { get; set; }

public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);

private readonly ILogger<ErrorModel> _logger;

public ErrorModel(ILogger<ErrorModel> logger)
{
_logger = logger;
}

public void OnGet()
{
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
}
}
}
59 changes: 37 additions & 22 deletions ...lates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/Server/Pages/Error.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,42 @@
@page
@model ComponentsWebAssembly_CSharp.Server.Pages.ErrorModel
@{
Layout = "_Layout";
ViewData["Title"] = "Error";
}

<h1 class="text-danger">Error.</h1>
<h2 class="text-danger">An error occurred while processing your request.</h2>
<!DOCTYPE html>
<html>

@if (Model.ShowRequestId)
{
<p>
<strong>Request ID:</strong> <code>@Model.RequestId</code>
</p>
}
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>Error</title>
<link href="~/css/bootstrap/bootstrap.min.css" rel="stylesheet" />
<link href="~/css/app.css" rel="stylesheet" />
</head>

<h3>Development Mode</h3>
<p>
Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred.
</p>
<p>
<strong>The Development environment shouldn't be enabled for deployed applications.</strong>
It can result in displaying sensitive information from exceptions to end users.
For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
and restarting the app.
</p>
<body>
<div class="main">
<div class="content px-4">
<h1 class="text-danger">Error.</h1>
<h2 class="text-danger">An error occurred while processing your request.</h2>

@if (Model.ShowRequestId)
{
<p>
<strong>Request ID:</strong> <code>@Model.RequestId</code>
</p>
}

<h3>Development Mode</h3>
<p>
Swapping to the <strong>Development</strong> environment displays detailed information about the error that occurred.
</p>
<p>
<strong>The Development environment shouldn't be enabled for deployed applications.</strong>
It can result in displaying sensitive information from exceptions to end users.
For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
and restarting the app.
</p>
</div>
</div>
</body>

</html>