Skip to content

Commit d975872

Browse files
isaacrlevinjkotalikRyan Nowakbenaadamsdotnet-maestro[bot]
authored
merge (#2)
merge Co-authored-by: Justin Kotalik <[email protected]> Co-authored-by: Ryan Nowak <[email protected]> Co-authored-by: Ben Adams <[email protected]> Co-authored-by: null <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Stephen Halter <[email protected]> Co-authored-by: James Newton-King <[email protected]> Co-authored-by: Mikael Mengistu <[email protected]> Co-authored-by: Pranav K <[email protected]> Co-authored-by: Javier Calvarro Nelson <[email protected]> Co-authored-by: Artak <[email protected]> Co-authored-by: Brennan <[email protected]> Co-authored-by: Steve Sanderson <[email protected]> Co-authored-by: Marcel <[email protected]> Co-authored-by: Ryan Nowak <[email protected]> Co-authored-by: Ryan Brandenburg <[email protected]> Co-authored-by: Hao Kung <[email protected]> Co-authored-by: Doug Bunting <[email protected]> Co-authored-by: David Fowler <[email protected]> Co-authored-by: Artak Mkrtchyan <[email protected]> Co-authored-by: Andrew Stanton-Nurse <[email protected]> Co-authored-by: Alessio Franceschelli <[email protected]> Co-authored-by: Diego Vega <[email protected]> Co-authored-by: Hisham Bin Ateya <[email protected]> Co-authored-by: N. Taylor Mullen <[email protected]> Co-authored-by: John Luo <[email protected]> Co-authored-by: huysentruitw <[email protected]>
2 parents 598acac + 4921dc3 commit d975872

File tree

1,077 files changed

+20904
-14148
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,077 files changed

+20904
-14148
lines changed

‎.azure/pipelines/jobs/default-build.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ parameters:
6969
installJdk: true
7070
timeoutInMinutes: 180
7171

72+
# We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case).
73+
# This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build
74+
# timeout due to test hangs.
75+
cancelTimeoutInMinutes: 15
76+
7277
jobs:
7378
- job: ${{ coalesce(parameters.jobName, parameters.agentOs) }}
7479
displayName: ${{ coalesce(parameters.jobDisplayName, parameters.agentOs) }}

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
<IncludeSymbols>true</IncludeSymbols>
4545

46-
<DefaultNetCoreTargetFramework>netcoreapp$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
46+
<DefaultNetCoreTargetFramework>netcoreapp$(TFMNetCoreMajorVersion).$(TFMNetCoreMinorVersion)</DefaultNetCoreTargetFramework>
4747
</PropertyGroup>
4848

4949
<!-- Warnings and errors -->

‎THIRD-PARTY-NOTICES.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,3 +164,28 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
164164
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
165165
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
166166
SOFTWARE.
167+
168+
License notice for Angular v8.0
169+
--------------------------------------------
170+
The MIT License (MIT)
171+
=====================
172+
173+
Copyright (c) 2010-2019 Google LLC. http://angular.io/license
174+
175+
Permission is hereby granted, free of charge, to any person obtaining a copy
176+
of this software and associated documentation files (the "Software"), to deal
177+
in the Software without restriction, including without limitation the rights
178+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
179+
copies of the Software, and to permit persons to whom the Software is
180+
furnished to do so, subject to the following conditions:
181+
182+
The above copyright notice and this permission notice shall be included in
183+
all copies or substantial portions of the Software.
184+
185+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
186+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
187+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
188+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
189+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
190+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
191+
THE SOFTWARE.

‎docs/BuildErrors.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,12 @@ Similar to BUILD001, but this error is not suppressable. This error only appears
2222
2323
This repo uses a common output directory (artifacts/bin/$(ProjectName) and artifacts/obj/$(ProjectName)). To avoid confllicts in build output, each
2424
project file should have a unique name.
25+
26+
### Error MSB4236 / Unable to locate the .NET Core SDK
27+
28+
Executing `.\restore.cmd` or `.\build.cmd` may produce these errors:
29+
30+
> error : Unable to locate the .NET Core SDK. Check that it is installed and that the version specified in global.json (if any) matches the installed version.
31+
> error MSB4236: The SDK 'Microsoft.NET.Sdk' specified could not be found.
32+
33+
In most cases, this is because the option _Use previews of the .NET Core SDK_ in VS2019 is not checked. Start Visual Studio, go to _Tools > Options_ and check _Use previews of the .NET Core SDK_ under _Environment > Preview Features_.

‎docs/BuildFromSource.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,15 @@ The cause of this problem is that the solution you are using does not include th
9696
dotnet sln add C:\src\AspNetCore\src\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj
9797
```
9898
99+
### Common error: Unable to locate the .NET Core SDK
100+
101+
Executing `.\restore.cmd` or `.\build.cmd` may produce these errors:
102+
103+
> error : Unable to locate the .NET Core SDK. Check that it is installed and that the version specified in global.json (if any) matches the installed version.
104+
> error MSB4236: The SDK 'Microsoft.NET.Sdk' specified could not be found.
105+
106+
In most cases, this is because the option _Use previews of the .NET Core SDK_ in VS2019 is not checked. Start Visual Studio, go to _Tools > Options_ and check _Use previews of the .NET Core SDK_ under _Environment > Preview Features_.
107+
99108
## Building with Visual Studio Code
100109
101110
Using Visual Studio Code with this repo requires setting environment variables on command line first.

‎docs/DailyBuilds.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ If you want to download the latest daily build and use it in a project, then you
1616
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
1717
<add key="extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
1818
<add key="entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
19+
<add key="entityframework6" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json" />
1920
<add key="aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
2021
<add key="aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
2122
<add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />

‎eng/Dependencies.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,8 @@ and are generated based on the last package release.
185185
<LatestPackageReference Include="xunit.assert" Version="$(XunitAssertPackageVersion)" />
186186
<LatestPackageReference Include="xunit.extensibility.core" Version="$(XunitExtensibilityCorePackageVersion)" />
187187
<LatestPackageReference Include="xunit.extensibility.execution" Version="$(XunitExtensibilityExecutionPackageVersion)" />
188+
<LatestPackageReference Include="xunit.extensibility.execution" Version="$(XunitExtensibilityExecutionPackageVersion)" />
189+
<LatestPackageReference Include="Microsoft.Data.SqlClient" Version="$(MicrosoftDataSqlClientPackageVersion)" />
188190
</ItemGroup>
189191

190192
</Project>

‎eng/GenAPI.exclusions.txt‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,4 @@
22
T:Microsoft.AspNetCore.Components.RenderTree.RenderTreeFrame
33
# Manually implemented - https://github.com/dotnet/arcade/issues/2066
44
T:Microsoft.AspNetCore.Mvc.ApplicationModels.PageParameterModel
5-
T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel
6-
# Manually implemented - https://github.com/aspnet/AspNetCore/issues/8825
7-
T:Microsoft.AspNetCore.Components.AuthorizeView
8-
T:Microsoft.AspNetCore.Components.AuthorizeViewCore
9-
T:Microsoft.AspNetCore.Components.CascadingAuthenticationState
10-
T:Microsoft.AspNetCore.Components.CascadingValue`1
11-
T:Microsoft.AspNetCore.Components.Forms.DataAnnotationsValidator
12-
T:Microsoft.AspNetCore.Components.Forms.EditForm
13-
T:Microsoft.AspNetCore.Components.Forms.InputBase`1
14-
T:Microsoft.AspNetCore.Components.Forms.InputCheckbox
15-
T:Microsoft.AspNetCore.Components.Forms.InputDate`1
16-
T:Microsoft.AspNetCore.Components.Forms.InputNumber`1
17-
T:Microsoft.AspNetCore.Components.Forms.InputSelect`1
18-
T:Microsoft.AspNetCore.Components.Forms.InputText
19-
T:Microsoft.AspNetCore.Components.Forms.InputTextArea
20-
T:Microsoft.AspNetCore.Components.Forms.ValidationMessage`1
21-
T:Microsoft.AspNetCore.Components.Forms.ValidationSummary
22-
T:Microsoft.AspNetCore.Components.PageDisplay
23-
T:Microsoft.AspNetCore.Components.Routing.NavLink
24-
T:Microsoft.AspNetCore.Components.Routing.Router
5+
T:Microsoft.AspNetCore.Mvc.ApplicationModels.PagePropertyModel

‎eng/ProjectReferences.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@
101101
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Razor" ProjectPath="$(RepoRoot)src\Razor\Razor\src\Microsoft.AspNetCore.Razor.csproj" RefProjectPath="$(RepoRoot)src\Razor\Razor\ref\Microsoft.AspNetCore.Razor.csproj" />
102102
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Abstractions" ProjectPath="$(RepoRoot)src\Mvc\Mvc.Abstractions\src\Microsoft.AspNetCore.Mvc.Abstractions.csproj" RefProjectPath="$(RepoRoot)src\Mvc\Mvc.Abstractions\ref\Microsoft.AspNetCore.Mvc.Abstractions.csproj" />
103103
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.ApiExplorer" ProjectPath="$(RepoRoot)src\Mvc\Mvc.ApiExplorer\src\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj" RefProjectPath="$(RepoRoot)src\Mvc\Mvc.ApiExplorer\ref\Microsoft.AspNetCore.Mvc.ApiExplorer.csproj" />
104-
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Components.Prerendering" ProjectPath="$(RepoRoot)src\Mvc\Mvc.Components.Prerendering\src\Microsoft.AspNetCore.Mvc.Components.Prerendering.csproj" RefProjectPath="$(RepoRoot)src\Mvc\Mvc.Components.Prerendering\ref\Microsoft.AspNetCore.Mvc.Components.Prerendering.csproj" />
105104
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Core" ProjectPath="$(RepoRoot)src\Mvc\Mvc.Core\src\Microsoft.AspNetCore.Mvc.Core.csproj" RefProjectPath="$(RepoRoot)src\Mvc\Mvc.Core\ref\Microsoft.AspNetCore.Mvc.Core.csproj" />
106105
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.Cors" ProjectPath="$(RepoRoot)src\Mvc\Mvc.Cors\src\Microsoft.AspNetCore.Mvc.Cors.csproj" RefProjectPath="$(RepoRoot)src\Mvc\Mvc.Cors\ref\Microsoft.AspNetCore.Mvc.Cors.csproj" />
107106
<ProjectReferenceProvider Include="Microsoft.AspNetCore.Mvc.DataAnnotations" ProjectPath="$(RepoRoot)src\Mvc\Mvc.DataAnnotations\src\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj" RefProjectPath="$(RepoRoot)src\Mvc\Mvc.DataAnnotations\ref\Microsoft.AspNetCore.Mvc.DataAnnotations.csproj" />

‎eng/SharedFramework.Local.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Razor" />
7474
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Abstractions" />
7575
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.ApiExplorer" />
76-
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Components.Prerendering" />
7776
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Core" />
7877
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.Cors" />
7978
<AspNetCoreAppReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" />

0 commit comments

Comments
 (0)