From d6821faebdb0332ee5a3ed2225ccb86aa7176157 Mon Sep 17 00:00:00 2001 From: Doug Bunting <6431421+dougbu@users.noreply.github.com> Date: Sun, 5 Apr 2020 15:29:17 -0700 Subject: [PATCH 1/2] [5.0-preview3] Remove Code_check job from publish-build-assets.yml `dependsOn` (#20559) - re-enable the "Build SiteExtension" build step! - nit: remove redundant conditions for easier reading --- .azure/pipelines/ci.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 1c85f16acc2c..56ba9bcad7d6 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -76,6 +76,9 @@ variables: /p:DotNetPublishToBlobFeed=$(_DotNetPublishToBlobFeed) /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) /p:DotNetArtifactsCategory=$(_DotNetArtifactsCategory) + + # used for post-build phases, internal builds only + - group: DotNet-AspNet-SDLValidation-Params - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - name: _BuildArgs value: '' @@ -83,9 +86,6 @@ variables: value: test - name: _PublishArgs value: '' - # used for post-build phases, internal builds only - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: DotNet-AspNet-SDLValidation-Params stages: - stage: build @@ -176,8 +176,7 @@ stages: -noBuildDeps $(_BuildArgs) $(_InternalRuntimeDownloadArgs) - # Disabled until 3.1.3 is released - condition: false + condition: ne(variables['Build.Reason'], 'PullRequest') displayName: Build SiteExtension # This runs code-signing on all packages, zips, and jar files as defined in build/CodeSign.targets. If https://github.com/dotnet/arcade/issues/1957 is resolved, @@ -798,7 +797,6 @@ stages: - CodeSign_Xplat_Linux_musl_x64 - CodeSign_Xplat_Linux_musl_arm64 # In addition to the dependencies above, ensure the build was successful overall. - - Code_check - Linux_Test - MacOS_Test - Source_Build From 905f5801d8cc4760afefd244c324449b090430e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 6 Apr 2020 23:21:04 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/aspnetcore-tooling build 20200405.2 (#20582) - Microsoft.AspNetCore.Mvc.Razor.Extensions - 5.0.0-preview.3.20205.2 - Microsoft.AspNetCore.Razor.Language - 5.0.0-preview.3.20205.2 - Microsoft.CodeAnalysis.Razor - 5.0.0-preview.3.20205.2 - Microsoft.NET.Sdk.Razor - 5.0.0-preview.3.20205.2 Dependency coherency updates - Microsoft.AspNetCore.Analyzer.Testing - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Abstractions - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.Memory - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.SqlServer - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Caching.StackExchangeRedis - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Abstractions - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Binder - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.CommandLine - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.EnvironmentVariables - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.FileExtensions - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Ini - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Json - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.UserSecrets - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration.Xml - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Configuration - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection.Abstractions - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DependencyInjection - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.DiagnosticAdapter - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Abstractions - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Composite - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileProviders.Physical - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.FileSystemGlobbing - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting.Abstractions - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Hosting - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Http - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Abstractions - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.AzureAppServices - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Configuration - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Console - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Debug - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventSource - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.EventLog - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.TraceSource - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging.Testing - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.ConfigurationExtensions - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options.DataAnnotations - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Options - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Primitives - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Internal.Extensions.Refs - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Microsoft.Extensions.Logging - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) - Internal.AspNetCore.Analyzers - 5.0.0-preview.3.20204.4 (parent: Microsoft.AspNetCore.Razor.Language) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 180 ++++++++++++++++++++-------------------- eng/Versions.props | 90 ++++++++++---------- 2 files changed, 135 insertions(+), 135 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02b66c22f13c..e50792046394 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,21 +13,21 @@ https://github.com/dotnet/blazor dd7fb4d3931d556458f62642c2edfc59f6295bfb - + https://github.com/dotnet/aspnetcore-tooling - 54d7e2616d22ccb45b0d52a84931ba56aa3c9e65 + 8587529296124ad1d7e2a9b75f536e2a2c301e48 - + https://github.com/dotnet/aspnetcore-tooling - 54d7e2616d22ccb45b0d52a84931ba56aa3c9e65 + 8587529296124ad1d7e2a9b75f536e2a2c301e48 - + https://github.com/dotnet/aspnetcore-tooling - 54d7e2616d22ccb45b0d52a84931ba56aa3c9e65 + 8587529296124ad1d7e2a9b75f536e2a2c301e48 - + https://github.com/dotnet/aspnetcore-tooling - 54d7e2616d22ccb45b0d52a84931ba56aa3c9e65 + 8587529296124ad1d7e2a9b75f536e2a2c301e48 https://github.com/dotnet/efcore @@ -57,165 +57,165 @@ https://github.com/dotnet/efcore 7a6aa0a4f513c28b5a0501a2db8880885def2236 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 https://github.com/dotnet/runtime @@ -324,9 +324,9 @@ https://github.com/dotnet/runtime 2b487f31064fe07d3b3398a7432edd1fa5777796 - + https://github.com/dotnet/extensions - ec073cff7d938e94cea1b239e9d8934627239a8a + bdc30606a08a10db8fb6909b75e9ebf6f9f482d4 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index f0edfac88e55..c499646ad11b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -96,47 +96,47 @@ 3.2.0-preview1.20067.1 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 - 5.0.0-preview.3.20202.8 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 + 5.0.0-preview.3.20204.4 5.0.0-preview.3.20181.2 5.0.0-preview.3.20181.2 @@ -146,10 +146,10 @@ 5.0.0-preview.3.20181.2 5.0.0-preview.3.20181.2 - 5.0.0-preview.3.20204.5 - 5.0.0-preview.3.20204.5 - 5.0.0-preview.3.20204.5 - 5.0.0-preview.3.20204.5 + 5.0.0-preview.3.20205.2 + 5.0.0-preview.3.20205.2 + 5.0.0-preview.3.20205.2 + 5.0.0-preview.3.20205.2