Skip to content

[automated] Merge branch 'release/2.1' => 'main' #32605

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 48 commits into from
May 14, 2021
Merged

[automated] Merge branch 'release/2.1' => 'main' #32605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
639a606
Merge in 'release/3.1' changes
dotnet-bot Apr 7, 2021
41531ab
Merge in 'release/3.1' changes
dotnet-bot Apr 7, 2021
4bc10a2
Merge in 'release/2.1' changes
dotnet-bot Apr 9, 2021
51f863a
Merge in 'release/3.1' changes
dotnet-bot Apr 9, 2021
65f78c0
Merge in 'release/3.1' changes
dotnet-bot Apr 12, 2021
ef80650
Merge in 'release/2.1' changes
dotnet-bot Apr 12, 2021
fc284ae
Merge in 'release/3.1' changes
dotnet-bot Apr 12, 2021
1deebca
Merge in 'release/3.1' changes
dotnet-bot Apr 13, 2021
4c00455
Merge in 'release/3.1' changes
dotnet-bot Apr 13, 2021
2b32e7d
Merge in 'release/2.1' changes
dotnet-bot Apr 14, 2021
c6516ad
Merge in 'release/3.1' changes
dotnet-bot Apr 14, 2021
e4704f7
Merged PR 14006: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Apr 15, 2021
c5665ed
Merged PR 14041: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Apr 15, 2021
b467b1f
Merged PR 14341: [internal/release/3.1] Update dependencies from dnce…
dotnet-bot Apr 15, 2021
8ca3954
[internal/release/3.1] Update dependencies from dnceng/internal/dotne…
dotnet-bot Apr 15, 2021
b71cfb5
Merge commit '8ca3954ca335343ce6dd1d14d8d1c6c3369710b7' into wtgodbe/…
wtgodbe May 11, 2021
68e6e22
Internal->public code merge, update baseline & SDK
wtgodbe May 11, 2021
dbdec83
Merge pull request #32583 from dotnet/wtgodbe/3116Merge
wtgodbe May 11, 2021
487614e
Merge branch 'main' into merge/release/3.1-to-main
captainsafia May 11, 2021
6985a54
Merge tag 'v2.1.28' into release/2.1
May 11, 2021
710361c
Branch merge
May 12, 2021
30ee0b6
Merge pull request #32603 from dotnet/johluo/2.1
May 12, 2021
990e060
Sync shared code from runtime (#32573)
github-actions[bot] May 12, 2021
b2f392b
Fix Microsoft.AspNetCore.Testing not writing to output in VS
JamesNK May 12, 2021
2078ab4
Use dotnet certificate (#32584)
mmitche May 12, 2021
bb3bdd7
Update Selenium.WebDriver.ChromeDriver version (#32578)
captainsafia May 12, 2021
a7a6cdd
Quarantine ComponentDiscovery_CanFindComponent_WithTypeParameter (#32…
captainsafia May 12, 2021
a14d768
Clear caches from more places on a hot reload event (#32509)
pranavkm May 12, 2021
7952eae
Update JS dependencies to latest version in semver range (#32577)
captainsafia May 12, 2021
c6f7970
Undo bad merge to fix up Helix builds (#32618)
captainsafia May 12, 2021
ea2895d
Unquarantine CanSendAndReceiveBytes (#32281)
TanayParikh May 12, 2021
badf48e
[main] Update dependencies from dotnet/runtime dotnet/emsdk (#32613)
dotnet-maestro[bot] May 12, 2021
350cf6b
SkipLocalsInit on methods with stackalloc (#32567)
JamesNK May 12, 2021
bc5960e
Fix commands for opening browsers on macOS (#32627)
captainsafia May 13, 2021
9fa86b3
Make trailers safer in TestHost (#32633)
JamesNK May 13, 2021
d8906c8
Enable Redis unit tests (#32601)
BrennanConroy May 13, 2021
302246d
Update required version of VS for repo build (#32624)
captainsafia May 13, 2021
44116a9
Fix web root for WebApplication (#32604)
halter73 May 13, 2021
3ea6071
Update HotReloadAgent.cs (#32657)
pranavkm May 13, 2021
ade3d6e
Removing CancelableAsyncEnumerable (#32090)
ladeak May 13, 2021
537ed0f
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] May 13, 2021
f4cf302
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] May 14, 2021
29e3752
Update yarn.lock files (#32654)
halter73 May 14, 2021
c53700b
Clean up `$(RepoRoot)` consistently (#32664)
dougbu May 14, 2021
90b9d80
Updated build.sh (#32665)
ShreyasJejurkar May 14, 2021
b58a528
[main] Update dependencies from dotnet/efcore dotnet/runtime (#32663)
dotnet-maestro[bot] May 14, 2021
8674585
Merge pull request #32597 from dotnet-maestro-bot/merge/release/3.1-t…
jkotalik May 14, 2021
8ec28f8
Merge branch 'release/2.1' into main
jkotalik May 14, 2021
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 Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<!-- $(RepoRoot) is normally set globally and Arcade overrides it to ensure a trailing slash. -->
<RepoRoot Condition=" '$(RepoRoot)' == '' ">$([MSBuild]::EnsureTrailingSlash('$(MSBuildThisFileDirectory)'))</RepoRoot>
<RepoRoot Condition=" '$(RepoRoot)' == '' OR !HasTrailingSlash('$(RepoRoot)') ">$(MSBuildThisFileDirectory)</RepoRoot>

<RepositoryUrl>https://github.com/dotnet/aspnetcore</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand Down
2 changes: 1 addition & 1 deletion docs/BuildFromSource.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Building ASP.NET Core on Windows (10, version 1803 or newer) requires that you h

#### [Visual Studio 2019](https://visualstudio.com)

Visual Studio 2019 (16.8) is required to build the repo locally. If you don't have visual studio installed you can run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1) to install the exact required dependencies.
Visual Studio 2019 (16.10 Preview 3) is required to build the repo locally. If you don't have visual studio installed you can run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1) to install the exact required dependencies.

> :bulb: By default, the script will install Visual Studio Enterprise Edition, however you can use a different edition by passing the `-Edition` flag.
> :bulb: To install Visual Studio from the preview channel, you can use the `-Channel` flag to set the channel (`-Channel Preview`).
Expand Down
3 changes: 2 additions & 1 deletion eng/CodeGen.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

<PropertyGroup>
<BuildManaged>true</BuildManaged>
<RepoRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..'))</RepoRoot>
<RepoRoot
Condition=" '$(RepoRoot)' == '' OR !HasTrailingSlash('$(RepoRoot)') ">$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..'))</RepoRoot>
<BuildMainlyReferenceProviders>true</BuildMainlyReferenceProviders>
</PropertyGroup>

Expand Down
35 changes: 20 additions & 15 deletions eng/Signing.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
<FileExtensionSignInfo Remove="@(FileExtensionSignInfo)" />
</ItemGroup>

<PropertyGroup>
<!-- Use the dotnet certificate for any remaining defaults (e.g. StrongNameSignInfo) -->
<UseDotNetCertificate>true</UseDotNetCertificate>
</PropertyGroup>

<!-- Files that should be always be signed between in-build and post-build signing -->
<ItemGroup Label="Common Files to Sign">
<CommonFilesToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
Expand Down Expand Up @@ -52,30 +57,30 @@
"None" means don't sign the file itself, but still scan the contents for signable files.
-->
<FileExtensionSignInfo Include=".jar" CertificateName="MicrosoftJARSHA2" />
<FileExtensionSignInfo Include=".ps1;.psd1;.psm1;.psc1" CertificateName="Microsoft400" />
<FileExtensionSignInfo Include=".dll;.exe" CertificateName="Microsoft400" />
<FileExtensionSignInfo Include=".ps1;.psd1;.psm1;.psc1" CertificateName="MicrosoftDotNet500" />
<FileExtensionSignInfo Include=".dll;.exe" CertificateName="MicrosoftDotNet500" />
<FileExtensionSignInfo Include=".nupkg" CertificateName="NuGet" />
<FileExtensionSignInfo Include=".vsix" CertificateName="VsixSHA2" />
<FileExtensionSignInfo Include=".zip" CertificateName="None" />
<FileExtensionSignInfo Include=".cab" CertificateName="None" />
<!-- If doing post build sign, explicitly give MSIs a cert. If doing in build signing,
this is handled by the wix targets, and .msi should be "None" -->
<FileExtensionSignInfo Include=".msi" CertificateName="Microsoft400" Condition="'$(PostBuildSign)' == 'true'" />
<FileExtensionSignInfo Include=".msi" CertificateName="MicrosoftDotNet500" Condition="'$(PostBuildSign)' == 'true'" />
<FileExtensionSignInfo Include=".msi" CertificateName="None" Condition="'$(PostBuildSign)' != 'true'" />

<!-- Native .dll's. These don't have a public key token, but are from Microsoft and should be signed. -->
<FileSignInfo Include="aspnetcore.dll" CertificateName="Microsoft400" />
<FileSignInfo Include="aspnetcorev2_inprocess.dll" CertificateName="Microsoft400" />
<FileSignInfo Include="aspnetcorev2_outofprocess.dll" CertificateName="Microsoft400" />
<FileSignInfo Include="aspnetcorev2.dll" CertificateName="Microsoft400" />
<FileSignInfo Include="blazor-devserver.exe" CertificateName="Microsoft400" />
<FileSignInfo Include="dotnet-dev-certs.exe" CertificateName="Microsoft400" />
<FileSignInfo Include="dotnet-sql-cache.exe" CertificateName="Microsoft400" />
<FileSignInfo Include="dotnet-user-secrets.exe" CertificateName="Microsoft400" />
<FileSignInfo Include="dotnet-watch.exe" CertificateName="Microsoft400" />
<FileSignInfo Include="dotnet-openapi.exe" CertificateName="Microsoft400" />
<FileSignInfo Include="Microsoft.AspNetCore.Blazor.Build.exe" CertificateName="Microsoft400" />
<FileSignInfo Include="sni.dll" CertificateName="Microsoft400" />
<FileSignInfo Include="aspnetcore.dll" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="aspnetcorev2_inprocess.dll" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="aspnetcorev2_outofprocess.dll" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="aspnetcorev2.dll" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="blazor-devserver.exe" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="dotnet-dev-certs.exe" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="dotnet-sql-cache.exe" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="dotnet-user-secrets.exe" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="dotnet-watch.exe" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="dotnet-openapi.exe" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="Microsoft.AspNetCore.Blazor.Build.exe" CertificateName="MicrosoftDotNet500" />
<FileSignInfo Include="sni.dll" CertificateName="MicrosoftDotNet500" />

<!-- Third-party components which should be signed. -->
<FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
Expand Down
Loading