From cba2275799aba49c4ab66b8879c6ddef46d8c045 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 26 Jul 2020 05:49:09 +0000 Subject: [PATCH] Merged PR 9296: [internal/release/5.0-preview8] Update dependencies from 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... --- .azure/pipelines/ci.yml | 9 +- NuGet.config | 3 - eng/Version.Details.xml | 252 +++++++++--------- eng/Versions.props | 128 +++++---- eng/helix/content/InstallDotNet.ps1 | 35 --- eng/helix/content/runtests.cmd | 12 +- eng/helix/content/runtests.sh | 63 ++--- eng/scripts/ci-source-build.sh | 70 ++++- eng/targets/Helix.targets | 13 +- .../Web.JS/dist/Release/blazor.server.js | 6 +- .../Web.JS/dist/Release/blazor.webassembly.js | 2 +- .../Web.JS/src/Platform/Mono/MonoPlatform.ts | 1 + .../test/InteropTests/InteropTests.csproj | 3 + .../testassets/InteropClient/InteropClient.cs | 2 +- .../test/testassets/InteropWebsite/Program.cs | 2 +- src/Http/WebUtilities/src/FormPipeReader.cs | 2 +- .../clients/ts/FunctionalTests/Program.cs | 2 +- 17 files changed, 314 insertions(+), 291 deletions(-) delete mode 100644 eng/helix/content/InstallDotNet.ps1 diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 62a8e30dc9..554d8f331c 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -607,17 +607,18 @@ stages: timeoutInMinutes: 180 steps: # Build the shared framework - - script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log + - script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs) displayName: Build shared fx - - script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj + - script: ./build.cmd -ci -nobl -noBuildRepoTasks -restore -noBuild -noBuildNative -projects src/Grpc/**/*.csproj $(_InternalRuntimeDownloadArgs) displayName: Restore interop projects - script: ./build.cmd -ci -nobl -noBuildRepoTasks -noRestore -test -all -noBuildNative -projects eng\helix\helix.proj - /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true + /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true $(_InternalRuntimeDownloadArgs) /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log displayName: Run build.cmd helix target env: HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops + artifacts: - name: Helix_logs path: artifacts/log/ @@ -651,7 +652,7 @@ stages: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) - - script: ./eng/scripts/ci-source-build.sh --ci --nobl --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false + - script: ./eng/scripts/ci-source-build.sh --ci --nobl --configuration Release /p:BuildManaged=true /p:BuildNodeJs=false $(_InternalRuntimeDownloadArgs) displayName: Run ci-source-build.sh - task: PublishBuildArtifacts@1 displayName: Upload logs diff --git a/NuGet.config b/NuGet.config index 358177f770..94e12ce1b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -2,9 +2,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d8a192ba6..5f7f71da0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,264 +41,264 @@ https://github.com/dotnet/efcore 58abc390e0e3eb849b5773da3f5ed2982ade521d - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a - + https://github.com/dotnet/runtime - f37dd6fc8595e130909dcb3085a56342d04aa20c + 3cab6dd440a5f3763bfbd2d582b36fe51095686a https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 924244aaba..516e8e1ae5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -64,70 +64,70 @@ 3.8.0-1.20361.1 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 + 5.0.0-preview.8.20372.7 - 5.0.0-preview.8.20361.2 + 5.0.0-preview.8.20372.7 3.2.0 @@ -155,7 +155,6 @@ --> $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.4.20180.4 diff --git a/eng/helix/content/InstallDotNet.ps1 b/eng/helix/content/InstallDotNet.ps1 deleted file mode 100644 index 7e87866433..0000000000 --- a/eng/helix/content/InstallDotNet.ps1 +++ /dev/null @@ -1,35 +0,0 @@ - <# - .SYNOPSIS - Installs dotnet sdk and runtime using https://dot.net/v1/dotnet-install.ps1 - .DESCRIPTION - Installs dotnet sdk and runtime using https://dot.net/v1/dotnet-install.ps1 -.PARAMETER arch - The architecture to install. -.PARAMETER sdkVersion - The sdk version to install -.PARAMETER runtimeVersion - The runtime version to install -.PARAMETER installDir - The directory to install to -#> -param( - [Parameter(Mandatory = $true)] - $arch, - - [Parameter(Mandatory = $true)] - $sdkVersion, - - [Parameter(Mandatory = $true)] - $runtimeVersion, - - [Parameter(Mandatory = $true)] - $installDir -) - -& $PSScriptRoot\Download.ps1 "https://dot.net/v1/dotnet-install.ps1" $PSScriptRoot\dotnet-install.ps1 -Write-Host "Download of dotnet-install.ps1 complete..." -Write-Host "Installing SDK...& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Version $sdkVersion -InstallDir $installDir" -Invoke-Expression "& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Version $sdkVersion -InstallDir $installDir" -Write-Host "Installing Runtime...& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Runtime dotnet -Version $runtimeVersion -InstallDir $installDir" -Invoke-Expression "& $PSScriptRoot\dotnet-install.ps1 -Architecture $arch -Runtime dotnet -Version $runtimeVersion -InstallDir $installDir" -Write-Host "InstallDotNet.ps1 complete..." \ No newline at end of file diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd index c1b27b1c89..d5d43bb8ff 100644 --- a/eng/helix/content/runtests.cmd +++ b/eng/helix/content/runtests.cmd @@ -15,6 +15,8 @@ set $aspnetref=%9 REM Batch only supports up to 9 arguments using the %# syntax, need to shift to get more shift set $helixTimeout=%9 +shift +set $feedCred=%9 set DOTNET_HOME=%HELIX_CORRELATION_PAYLOAD%\sdk set DOTNET_ROOT=%DOTNET_HOME%\%$arch% @@ -24,10 +26,16 @@ set DOTNET_CLI_HOME=%HELIX_CORRELATION_PAYLOAD%\home set PATH=%DOTNET_ROOT%;!PATH!;%HELIX_CORRELATION_PAYLOAD%\node\bin echo Set path to: %PATH% -echo "Invoking InstallDotNet.ps1 %$arch% %$sdkVersion% %$runtimeVersion% %DOTNET_ROOT%" -powershell.exe -NoProfile -ExecutionPolicy unrestricted -file InstallDotNet.ps1 %$arch% %$sdkVersion% %$runtimeVersion% %DOTNET_ROOT% + +powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$sdkVersion% %$arch% '' $true" +IF [%$feedCred%] == [] ( + powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$runtimeVersion% %$arch% dotnet $true" +) else ( + powershell.exe -noLogo -NoProfile -ExecutionPolicy unrestricted -command ". eng\common\tools.ps1; InstallDotNet %DOTNET_ROOT% %$runtimeVersion% %$arch% dotnet $true https://dotnetclimsrc.blob.core.windows.net/dotnet %$feedCred%" +) set exit_code=0 + echo "Restore: dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources..." dotnet restore RunTests\RunTests.csproj --source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json --source https://api.nuget.org/v3/index.json --ignore-failed-sources diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh index a1bf932706..90e6fca8a1 100644 --- a/eng/helix/content/runtests.sh +++ b/eng/helix/content/runtests.sh @@ -30,49 +30,24 @@ RED="\033[0;31m" YELLOW="\033[0;33m" MAGENTA="\033[0;95m" -curl -o dotnet-install.sh -sSL https://dot.net/v1/dotnet-install.sh -if [ $? -ne 0 ]; then - download_retries=3 - while [ $download_retries -gt 0 ]; do - curl -o dotnet-install.sh -sSL https://dot.net/v1/dotnet-install.sh - if [ $? -ne 0 ]; then - let download_retries=download_retries-1 - echo -e "${YELLOW}Failed to download dotnet-install.sh. Retries left: $download_retries.${RESET}" - else - download_retries=0 - fi - done -fi - -# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs) -chmod +x "dotnet-install.sh"; sync - -./dotnet-install.sh --version $dotnet_sdk_version --install-dir "$DOTNET_ROOT" -if [ $? -ne 0 ]; then - sdk_retries=3 - while [ $sdk_retries -gt 0 ]; do - ./dotnet-install.sh --version $dotnet_sdk_version --install-dir "$DOTNET_ROOT" - if [ $? -ne 0 ]; then - let sdk_retries=sdk_retries-1 - echo -e "${YELLOW}Failed to install .NET Core SDK $version. Retries left: $sdk_retries.${RESET}" - else - sdk_retries=0 - fi - done -fi - -./dotnet-install.sh --runtime dotnet --version $dotnet_runtime_version --install-dir "$DOTNET_ROOT" -if [ $? -ne 0 ]; then - runtime_retries=3 - while [ $runtime_retries -gt 0 ]; do - ./dotnet-install.sh --runtime dotnet --version $dotnet_runtime_version --install-dir "$DOTNET_ROOT" - if [ $? -ne 0 ]; then - let runtime_retries=runtime_retries-1 - echo -e "${YELLOW}Failed to install .NET Core runtime $version. Retries left: $runtime_retries.${RESET}" - else - runtime_retries=0 - fi - done +. eng/common/tools.sh +InstallDotNet $DOTNET_ROOT $dotnet_sdk_version "" "" true || { + exit_code=$? + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2 + ExitWithExitCode $exit_code +} +if [[ -z "${11:-}" ]]; then + InstallDotNet $DOTNET_ROOT $dotnet_runtime_version "" dotnet true || { + exit_code=$? + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2 + ExitWithExitCode $exit_code + } +else + InstallDotNet $DOTNET_ROOT $dotnet_runtime_version "" dotnet true https://dotnetclimsrc.blob.core.windows.net/dotnet ${11} || { + exit_code=$? + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2 + ExitWithExitCode $exit_code + } fi if [ -e /proc/self/coredump_filter ]; then @@ -82,7 +57,7 @@ if [ -e /proc/self/coredump_filter ]; then echo -n 0x3F > /proc/self/coredump_filter fi -# dontet-install.sh seems to affect the Linux filesystem and causes test flakiness unless we sync the filesystem before running tests +# dotnet-install.sh seems to affect the Linux filesystem and causes test flakiness unless we sync the filesystem before running tests sync exit_code=0 diff --git a/eng/scripts/ci-source-build.sh b/eng/scripts/ci-source-build.sh index 468f749751..d599fced8c 100755 --- a/eng/scripts/ci-source-build.sh +++ b/eng/scripts/ci-source-build.sh @@ -33,10 +33,76 @@ reporoot="$(dirname "$(dirname "$scriptroot")")" # mv "$reporoot/global.bak.json" "$reporoot/global.json" #}" EXIT +dotnet_runtime_source_feed='' +dotnet_runtime_source_feed_key='' +other_args=() + +# +# Functions +# +__usage() { + echo "Usage: $(basename "${BASH_SOURCE[0]}") [options] [[--] ...] + +Arguments: + ... Arguments passed to the command. Variable number of arguments allowed. + + --dotnet-runtime-source-feed Additional feed that can be used when downloading .NET runtimes + --dotnet-runtime-source-feed-key Key for feed that can be used when downloading .NET runtimes + +Description: + This script is meant for testing source build by imitating some of the input parameters and conditions. +" + + if [[ "${1:-}" != '--no-exit' ]]; then + exit 2 + fi +} + +__error() { + echo -e "${RED}error: $*${RESET}" 1>&2 +} + +# +# main +# + +while [[ $# -gt 0 ]]; do + opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')" + case "$opt" in + -\?|-h|-help) + __usage --no-exit + exit 0 + ;; + -dotnet-runtime-source-feed|-dotnetruntimesourcefeed) + shift + [ -z "${1:-}" ] && __error "Missing value for parameter --dotnet-runtime-source-feed" && __usage + dotnet_runtime_source_feed="${1:-}" + ;; + -dotnet-runtime-source-feed-key|-dotnetruntimesourcefeedkey) + shift + [ -z "${1:-}" ] && __error "Missing value for parameter --dotnet-runtime-source-feed-key" && __usage + dotnet_runtime_source_feed_key="${1:-}" + ;; + *) + other_args[${#other_args[*]}]="$1" + ;; + esac + shift +done + +# Set up additional runtime args +runtime_feed_args=() +if [ ! -z "$dotnet_runtime_source_feed$dotnet_runtime_source_feed_key" ]; then + runtimeFeedArg="/p:DotNetRuntimeSourceFeed=$dotnet_runtime_source_feed" + runtimeFeedKeyArg="/p:DotNetRuntimeSourceFeedKey=$dotnet_runtime_source_feed_key" + runtime_feed_args[${#runtime_feed_args[*]}]=$runtimeFeedArg + runtime_feed_args[${#runtime_feed_args[*]}]=$runtimeFeedKeyArg +fi + # Build repo tasks -"$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj +"$reporoot/eng/common/build.sh" --restore --build --ci --configuration Release /p:ProjectToBuild=$reporoot/eng/tools/RepoTasks/RepoTasks.csproj ${runtime_feed_args[@]+"${runtime_feed_args[@]}"} export DotNetBuildFromSource='true' # Build projects -"$reporoot/eng/common/build.sh" --restore --build --pack "$@" \ No newline at end of file +"$reporoot/eng/common/build.sh" --restore --build --pack ${other_args[@]+"${other_args[@]}"} ${runtime_feed_args[@]+"${runtime_feed_args[@]}"} diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets index 0743963a02..188b9b01bc 100644 --- a/eng/targets/Helix.targets +++ b/eng/targets/Helix.targets @@ -28,6 +28,15 @@ + + + + eng\common\%(Filename)%(Extension) + PreserveNewest + PreserveNewest + + false diff --git a/src/Grpc/test/testassets/InteropClient/InteropClient.cs b/src/Grpc/test/testassets/InteropClient/InteropClient.cs index 273bcd1950..d6b47ab241 100644 --- a/src/Grpc/test/testassets/InteropClient/InteropClient.cs +++ b/src/Grpc/test/testassets/InteropClient/InteropClient.cs @@ -97,7 +97,7 @@ namespace InteropTestsClient services.AddLogging(configure => { configure.SetMinimumLevel(Microsoft.Extensions.Logging.LogLevel.Trace); - configure.AddConsole(loggerOptions => + configure.AddSimpleConsole(loggerOptions => { loggerOptions.IncludeScopes = true; loggerOptions.DisableColors = true; diff --git a/src/Grpc/test/testassets/InteropWebsite/Program.cs b/src/Grpc/test/testassets/InteropWebsite/Program.cs index 0648004d95..3efd0d647c 100644 --- a/src/Grpc/test/testassets/InteropWebsite/Program.cs +++ b/src/Grpc/test/testassets/InteropWebsite/Program.cs @@ -37,7 +37,7 @@ namespace InteropTestsWebsite Host.CreateDefaultBuilder(args) .ConfigureLogging(builder => { - builder.AddConsole(o => o.DisableColors = true); + builder.AddSimpleConsole(o => o.DisableColors = true); builder.SetMinimumLevel(LogLevel.Trace); }) .ConfigureWebHostDefaults(webBuilder => diff --git a/src/Http/WebUtilities/src/FormPipeReader.cs b/src/Http/WebUtilities/src/FormPipeReader.cs index bcb553458d..6a41dcd95e 100644 --- a/src/Http/WebUtilities/src/FormPipeReader.cs +++ b/src/Http/WebUtilities/src/FormPipeReader.cs @@ -271,7 +271,7 @@ namespace Microsoft.AspNetCore.WebUtilities var keyValueReader = new SequenceReader(keyValuePair); ReadOnlySequence value; - if (keyValueReader.TryReadTo(out var key, equalsDelimiter)) + if (keyValueReader.TryReadTo(out ReadOnlySequence key, equalsDelimiter)) { if (key.Length > KeyLengthLimit) { diff --git a/src/SignalR/clients/ts/FunctionalTests/Program.cs b/src/SignalR/clients/ts/FunctionalTests/Program.cs index bc1cc0a323..358bba527e 100644 --- a/src/SignalR/clients/ts/FunctionalTests/Program.cs +++ b/src/SignalR/clients/ts/FunctionalTests/Program.cs @@ -35,7 +35,7 @@ namespace FunctionalTests webHostBuilder .ConfigureLogging(factory => { - factory.AddConsole(options => + factory.AddSimpleConsole(options => { options.IncludeScopes = true; options.TimestampFormat = "[HH:mm:ss] ";