Skip to content

[automated] Merge branch 'release/5.0' => 'master' #25219

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
merged 28 commits into from
Aug 28, 2020
Merged

[automated] Merge branch 'release/5.0' => 'master' #25219

Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
f2c3c11
Minor typos (#25140)
ar0311 Aug 24, 2020
db77380
Java client connection state part 1 (#24166)
BrennanConroy Aug 24, 2020
29cbf6e
Make PropertySetter a concrete type (#25054)
pranavkm Aug 25, 2020
0050ece
[release/5.0] Update dependencies from dotnet/runtime dotnet/efcore (…
dotnet-maestro[bot] Aug 25, 2020
8a2f29b
JSObjectReference (#25028)
MackinnonBuck Aug 25, 2020
aa1646b
Update dependencies from https://github.com/dotnet/runtime build 2020…
dotnet-maestro[bot] Aug 25, 2020
e409c97
Allow suppressing the use of environment variables (#25136)
Tratcher Aug 25, 2020
a01f9eb
[release/5.0] Update dependencies from dotnet/efcore dotnet/runtime (…
dotnet-maestro[bot] Aug 25, 2020
0ff360d
[release/5.0] Update dependencies from dotnet/efcore (#25237)
dotnet-maestro[bot] Aug 25, 2020
3f81caa
[release/5.0] Update dependencies from dotnet/runtime dotnet/efcore (…
dotnet-maestro[bot] Aug 25, 2020
6333040
Fix MaxRequestBodySize in IIS (#25096)
jkotalik Aug 25, 2020
64c47b7
Support custom validation class names (#24835)
SteveSandersonMS Aug 25, 2020
a9b596e
Prevent @import in scoped CSS (#25196)
SteveSandersonMS Aug 25, 2020
78a587b
Guard against client disconnect exceptions that appear when reading b…
pranavkm Aug 25, 2020
402dc41
[Blazor] Render Blazor Webassembly components from MVC (#25203)
javiercn Aug 25, 2020
70ea49f
Update dependencies from https://github.com/dotnet/efcore build 20200…
dotnet-maestro[bot] Aug 25, 2020
b0530a6
Do not include the shared framework in the packages (#24816)
pranavkm Aug 25, 2020
c2f0331
Include project file in F# Worker Service template (#25180)
dougbu Aug 25, 2020
098be5f
Use LDAP support from DirectoryServices.Protocols for RBAC claim reso…
Aug 25, 2020
e2dd296
Set SameSiteMode for cookies in authentication tests (#25281)
captainsafia Aug 26, 2020
2916f4b
Fixed server interop reliability tests (#25244)
MackinnonBuck Aug 26, 2020
f2b72b0
Fix SignalR typescript tests with Chrome SameSite reaction (#25283)
BrennanConroy Aug 26, 2020
826b5ba
Merge branch 'release/5.0'
ajaybhargavb Aug 26, 2020
bb769fe
[release/5.0] Reduce job timeouts in aspnetcore-quarantined-pr pipeli…
dougbu Aug 27, 2020
7b8fe53
Disable failing/hanging tests due to Chrome/Selenium issue (#25323)
Aug 27, 2020
e9a564d
[master] Reduce job timeouts in aspnetcore-quarantined-pr pipeline (#…
dougbu Aug 27, 2020
78271cf
Disable failing/hanging tests due to Chrome/Selenium issue (#25323)
Aug 27, 2020
81ed8a4
Merge branch 'release/5.0' into merge/release/5.0-to-master
Aug 27, 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
4 changes: 2 additions & 2 deletions ...ates/content/ComponentsWebAssembly-CSharp/Server/Controllers/WeatherForecastController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class WeatherForecastController : ControllerBase

private readonly ILogger<WeatherForecastController> _logger;

// The Web API will only accept tokens 1) for users, and 2) having the access_as_user scope for this API
// The Web API will only accept tokens 1) for users, and 2) having the api-scope scope for this API
static readonly string[] scopeRequiredByApi = new string[] { "api-scope" };

#if (GenerateApi)
Expand Down Expand Up @@ -75,7 +75,7 @@ public WeatherForecastController(ILogger<WeatherForecastController> logger,
{
_logger = logger;
_graphServiceClient = graphServiceClient;
}
}

[HttpGet]
public async Task<IEnumerable<WeatherForecast>> Get()
Expand Down