Merge preview8 branch to public #25280

wtgodbe · 2020-08-26T19:07:51Z

Preserves linear history from preview8 to rc1

This is a cherry pick of the 3.1 PR. https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/pullrequest/9042 The only change was to remove a questionable call to Abort after catching the exception. There are some less severe issues in Kestrel and MVC that we'll follow up on publicly after this releases.

Create the GCHandle per operation and Free it when resetting the ValueTaskSource for re-use. Cherry-picked change from 3.1

…rom dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:2f3f3ff0-d34f-49bd-50aa-08d828f9655f) ## From https://github.com/dotnet/runtime - **Subscription**: 2f3f3ff0-d34f-49bd-50aa-08d828f9655f - **Build**: 20200722.7 - **Date Produced**: 7/23/2020 12:04 AM - **Commit**: 3cab6dd440a5f3763bfbd2d582b36fe51095686a - **Branch**: refs/heads/internal/release/5.0-preview8 [DependencyUpdate]: <> (Begin) - **Updates**: - **System.Diagnostics.DiagnosticSource**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.Diagnostics.EventLog**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.Drawing.Common**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.IO.Pipelines**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **System.ComponentModel.Annotations**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Configuration**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Console**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.Debug**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.EventLog**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.EventSource**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging.TraceSource**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Options**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Options.ConfigurationExtensions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Options.DataAnnotations**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Primitives**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Logging**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Internal.Transport**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Hosting.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Caching.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Caching.Memory**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration.Abstractions**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration.Binder**: from 5.0.0-preview.8.20361.2 to 5.0.0-preview.8.20372.7 - **Microsoft.Extensions.Configuration.CommandLine**: from 5.0.0-preview.8.203...

…Blazor WASM Revive support for globalization and localization in Blazor WASM * Load icu and timezone data files * Unskip tests Fixes #24174 Fixes #22975 Fixes #23260

…nal/dotnet-runtime

…nal/dotnet-efcore - Updates: - Microsoft.EntityFrameworkCore.Tools: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore.SqlServer: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - dotnet-ef: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore.Relational: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore.Sqlite: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2 - Microsoft.EntityFrameworkCore.InMemory: from 5.0.0-preview.8.20360.8 to 5.0.0-preview.8.20379.2

…nal/dotnet-runtime

eng/helix/content/runtests.cmd

wtgodbe · 2020-08-27T20:16:42Z

/azp run

azure-pipelines · 2020-08-27T20:17:00Z

Azure Pipelines successfully started running 2 pipeline(s).

…netcore into wtgodbe/MergePreview8

dougbu · 2020-08-28T22:49:50Z

Blocked on dotnet/arcade#6060 or maybe dotnet/core-eng#10578 (suspect this makes -noPath unnecessary but I'm not 💯% sure).

wtgodbe · 2020-09-01T22:51:36Z

@dougbu @MattGal I manually applied the fix from dotnet/arcade#6092, so that we can get this in for rc1. Would be good to make sure git history is preserved for that, and the next Arcade update won't "unfix" us

dougbu

I wasn't in a big rush to get this into other branches. But, sure, the Arcade feature should be coming in the next couple of days and we can hold off dep updates from there 'til the feature is include.

eng/helix/content/runtests.cmd

dougbu · 2020-09-01T23:28:53Z

eng/targets/Helix.targets

@@ -28,6 +28,15 @@
  <ItemGroup Condition="$(BuildHelixPayload)">
    <Content Include="@(HelixContent)" />
    <Content Include="$(RepoRoot)eng\scripts\Download.ps1" />
+    <Content Include="$(RepoRoot)NuGet.config" />


Plz file follow-up issue(s) to

Remove TestRunner NuGet source additions that should already be in this file (copied from the build and, likely enhanced in the case of internal builds)

Reduce the duplication between TestRunner and the runtests.* scripts if possible

might be more there than just environment variables

Add the new dotnet-install.* scripts from eng/common/dotnet-install-scripts/ to the Helix payload (placing them in a dotnet-install-scripts/ folder relative to where the tools.* files land

wtgodbe · 2020-09-02T16:33:07Z

d1ab8ef should resolve first comment @dougbu

dougbu · 2020-09-02T16:42:01Z

d1ab8ef should resolve first comment @dougbu

Agreed. Even better @MattGal's fix was promoted in Arcade this morning. There won't be a window in which your eng/common/ changes get reverted.

dougbu · 2020-09-04T17:48:46Z

Helix content is messed up. Need to include eng/common/dotnet-install-scripts/* and make sure they land in the right place relative to tools.*

cp: cannot stat '/datadisks/disk1/work/BCCD0A34/w/A714094D/e/eng/common/dotnet-install-scripts/dotnet-install.sh': No such file or directory
bash: /datadisks/disk1/work/BCCD0A34/w/A714094D/e/.dotnet30116/dotnet-install.sh: No such file or directory
Failed to install dotnet SDK from public location (exit code '127').
Failed to install dotnet SDK from public location (exit code '127').
+ export _commandExitCode=127

dougbu · 2020-09-04T19:22:28Z

/azp run

azure-pipelines · 2020-09-04T19:22:45Z

Azure Pipelines successfully started running 2 pipeline(s).

dougbu

/azp run

dougbu · 2020-09-04T17:55:44Z

eng/targets/Helix.targets

@@ -28,6 +28,15 @@
  <ItemGroup Condition="$(BuildHelixPayload)">
    <Content Include="@(HelixContent)" />
    <Content Include="$(RepoRoot)eng\scripts\Download.ps1" />
+    <Content Include="$(RepoRoot)NuGet.config" />


Addressed the third bullet in my commit to your branch @wtgodbe

dougbu · 2020-09-06T21:30:19Z

/azp run

azure-pipelines · 2020-09-06T21:30:49Z

Azure Pipelines successfully started running 2 pipeline(s).

Tratcher and others added 30 commits July 17, 2020 23:07

Merge in 'release/5.0-preview8' changes

609b55f

Merge in 'release/5.0-preview8' changes

77435c3

Merge in 'release/5.0-preview8' changes

3ad9e57

Merge in 'release/5.0-preview8' changes

869d8f5

Merged PR 9196: Modify WebSockets ValueTaskSource

542031b

Create the GCHandle per operation and Free it when resetting the ValueTaskSource for re-use. Cherry-picked change from 3.1

Merge in 'release/5.0-preview8' changes

6654c8f

Merge in 'release/5.0-preview8' changes

ab7a11f

Merge in 'release/5.0-preview8' changes

f437647

Merge in 'release/5.0-preview8' changes

c88efce

Merge in 'release/5.0-preview8' changes

2bac45c

Merge in 'release/5.0-preview8' changes

43b68e3

Merge in 'release/5.0-preview8' changes

dc3a864

Merge in 'release/5.0-preview8' changes

716598e

Merge in 'release/5.0-preview8' changes

2827037

Merge in 'release/5.0-preview8' changes

670f952

Merge in 'release/5.0-preview8' changes

4d23ec0

Merge in 'release/5.0-preview8' changes

21a5f39

Merge in 'release/5.0-preview8' changes

864a292

Merged PR 9371: Revive support for globalization and localization in …

3e7a106

…Blazor WASM Revive support for globalization and localization in Blazor WASM * Load icu and timezone data files * Unskip tests Fixes #24174 Fixes #22975 Fixes #23260

Merge in 'release/5.0-preview8' changes

6c665aa

[internal/release/5.0-preview8] Update dependencies from dnceng/inter…

f172d20

…nal/dotnet-runtime

Merge in 'release/5.0-preview8' changes

4581307

Merge in 'release/5.0-preview8' changes

c60c278

Merge in 'release/5.0-preview8' changes

f22aa71

[internal/release/5.0-preview8] Update dependencies from dnceng/inter…

5dc9931

…nal/dotnet-runtime

[internal/release/5.0-preview8] Update dependencies from dnceng/inter…

d2ccb49

…nal/dotnet-runtime

Merge in 'release/5.0-preview8' changes

06fbd7e

dougbu reviewed Aug 27, 2020

View reviewed changes

eng/helix/content/runtests.cmd Outdated Show resolved Hide resolved

dougbu mentioned this pull request Aug 27, 2020

Support -noPath in InstallDotNet function dotnet/arcade#6060

Closed

2 tasks

wtgodbe added 2 commits August 28, 2020 09:13

Fix InteropClient testasset

72a7635

Merge branch 'wtgodbe/MergePreview8' of https://github.com/dotnet/asp…

96b1c23

…netcore into wtgodbe/MergePreview8

wtgodbe added this to the 5.0.0-rc1 milestone Aug 28, 2020

dougbu added the blocked The work on this issue is blocked due to some dependency label Aug 28, 2020

wtgodbe added 3 commits September 1, 2020 09:47

Merge branch 'release/5.0' into wtgodbe/MergePreview8

e6a163b

Fix tools.ps1

08309b1

merge

b02309f

dougbu approved these changes Sep 1, 2020

View reviewed changes

wtgodbe changed the base branch from release/5.0 to release/5.0-rc2 September 2, 2020 16:26

Use -nopath

d1ab8ef

dougbu removed the blocked The work on this issue is blocked due to some dependency label Sep 2, 2020

pranavkm modified the milestones: 5.0.0-rc1, 5.0.0-rc2 Sep 2, 2020

Add dotnet-install-scripts files to Helix content

cd0ec1f

dougbu reviewed Sep 4, 2020

View reviewed changes

dougbu merged commit 918dfdc into release/5.0-rc2 Sep 6, 2020

dougbu deleted the wtgodbe/MergePreview8 branch September 6, 2020 23:36

Merge preview8 branch to public #25280

Merge preview8 branch to public #25280

Uh oh!

Conversation

wtgodbe commented Aug 26, 2020

Uh oh!

Uh oh!

wtgodbe commented Aug 27, 2020

Uh oh!

azure-pipelines bot commented Aug 27, 2020

Uh oh!

dougbu commented Aug 28, 2020

Uh oh!

wtgodbe commented Sep 1, 2020

Uh oh!

dougbu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dougbu Sep 1, 2020

Choose a reason for hiding this comment

Uh oh!

wtgodbe commented Sep 2, 2020

Uh oh!

dougbu commented Sep 2, 2020

Uh oh!

dougbu commented Sep 4, 2020

Uh oh!

dougbu commented Sep 4, 2020

Uh oh!

azure-pipelines bot commented Sep 4, 2020

Uh oh!

dougbu left a comment

Choose a reason for hiding this comment

Uh oh!

dougbu Sep 4, 2020

Choose a reason for hiding this comment

Uh oh!

dougbu commented Sep 6, 2020

Uh oh!

azure-pipelines bot commented Sep 6, 2020

Uh oh!

Uh oh!