From 3ac9604052b97ba45996b53efa6c01d5b625b1b0 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 14 May 2021 09:09:09 -0500 Subject: [PATCH 01/31] Add source-build ci leg --- .azure/pipelines/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index cfe4287e9f78..55d2321bc245 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -637,6 +637,14 @@ stages: - name: Linux_musl_arm64_Packages path: artifacts/packages/ + # Build Linux X64 source-build + - template: /eng/common/templates/job/source-build.yml + parameters: + platform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754' + buildScript: './eng/build.sh' + - ${{ if ne(variables['PostBuildSign'], 'true') }}: - template: jobs/codesign-xplat.yml parameters: From 06b0555a265d72da954c2f97c9c4bf0ccdae4f86 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 14 May 2021 09:45:52 -0500 Subject: [PATCH 02/31] Refactor to support custom publish arg --- .azure/pipelines/ci.yml | 66 ++----------------- eng/scripts/ci-source-build.sh | 113 --------------------------------- 2 files changed, 7 insertions(+), 172 deletions(-) delete mode 100755 eng/scripts/ci-source-build.sh diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 55d2321bc245..b9a11a2983a1 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -637,14 +637,6 @@ stages: - name: Linux_musl_arm64_Packages path: artifacts/packages/ - # Build Linux X64 source-build - - template: /eng/common/templates/job/source-build.yml - parameters: - platform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754' - buildScript: './eng/build.sh' - - ${{ if ne(variables['PostBuildSign'], 'true') }}: - template: jobs/codesign-xplat.yml parameters: @@ -757,56 +749,12 @@ stages: includeForks: true # Source build - - job: Source_Build - displayName: 'Test: Linux Source Build' - container: centos:7 - pool: - vmImage: 'ubuntu-18.04' - variables: - LC_ALL: 'en_US.UTF-8' - LANG: 'en_US.UTF-8' - LANGUAGE: 'en_US.UTF-8' - DotNetCoreSdkDir: $(Agent.ToolsDirectory)/dotnet - # This isn't needed in the path because build does not need to _use_ global tools. - DOTNET_CLI_HOME: $(System.DefaultWorkingDirectory) - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true - steps: - - script: | - source eng/common/native/common-library.sh - mkdir -p $(System.DefaultWorkingDirectory)/.tools - GetFile https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 $(System.DefaultWorkingDirectory)/.tools/jq - chmod +x $(System.DefaultWorkingDirectory)/.tools/jq - echo "##vso[task.prependpath]$(System.DefaultWorkingDirectory)/.tools" - displayName: Install jq - - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - task: Bash@3 - displayName: Setup Private Feeds Credentials - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh - 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 $(_InternalRuntimeDownloadArgs) - displayName: Run ci-source-build.sh - - task: PublishBuildArtifacts@1 - displayName: Upload logs - condition: always() - continueOnError: true - inputs: - pathtoPublish: artifacts/log/ - artifactName: Source_Build_Logs - artifactType: Container - parallel: true - - task: PublishBuildArtifacts@1 - displayName: Upload package artifacts - # Only capture source build artifacts in PRs for the sake of inspecting - # changes that impact source-build. The artifacts from this build pipeline are never actually used. - condition: and(succeeded(), in(variables['Build.Reason'], 'PullRequest')) - inputs: - pathtoPublish: artifacts/packages/ - artifactName: Source_Build_Packages - artifactType: Container - parallel: true + - template: /eng/common/templates/job/source-build.yml + parameters: + platform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754' + buildScript: './eng/build.sh' # Publish to the BAR - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: @@ -835,7 +783,7 @@ stages: - Linux_musl_arm_build - Linux_musl_arm64_build # In addition to the dependencies above, ensure the build was successful overall. - - Source_Build + - Source_Build_Managed pool: vmImage: vs2017-win2016 publishUsingPipelines: ${{ variables._PublishUsingPipelines }} diff --git a/eng/scripts/ci-source-build.sh b/eng/scripts/ci-source-build.sh deleted file mode 100755 index 96516d187a60..000000000000 --- a/eng/scripts/ci-source-build.sh +++ /dev/null @@ -1,113 +0,0 @@ -#!/usr/bin/env bash - - # -# This script is meant for testing source build by imitating some of the input parameters and conditions. -# - -set -euo pipefail - -scriptroot="$( cd -P "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -reporoot="$(dirname "$(dirname "$scriptroot")")" - -# -# This commented out section is used for servicing branches -# -# For local development, make a backup copy of this file first -# if [ ! -f "$reporoot/global.bak.json" ]; then -# mv "$reporoot/global.json" "$reporoot/global.bak.json" -# fi - -# Detect the current version of .NET Core installed -# export SDK_VERSION=$(dotnet --version) -# echo "The ambient version of .NET Core SDK version = $SDK_VERSION" - -# Update the global.json file to match the current .NET environment -# cat "$reporoot/global.bak.json" | \ -# jq '.sdk.version=env.SDK_VERSION' | \ -# jq '.tools.dotnet=env.SDK_VERSION' | \ -# jq 'del(.tools.runtimes)' \ -# > "$reporoot/global.json" - -# Restore the original global.json file -#trap "{ -# mv "$reporoot/global.bak.json" "$reporoot/global.json" -#}" EXIT - -runtime_source_feed='' -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. - - --runtime-source-feed Additional feed that can be used when downloading .NET runtimes and SDKs - --runtime-source-feed-key Key for feed that can be used when downloading .NET runtimes and SDKs - -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|-runtime_source_feed|-runtimesourcefeed) - shift - [ -z "${1:-}" ] && __error "Missing value for parameter --runtime-source-feed" && __usage - runtime_source_feed="${1:-}" - ;; - -dotnet-runtime-source-feed-key|-dotnetruntimesourcefeedkey|-runtime_source_feed_key|-runtimesourcefeedkey) - shift - [ -z "${1:-}" ] && __error "Missing value for parameter --runtime-source-feed-key" && __usage - runtime_source_feed_key="${1:-}" - ;; - *) - other_args[${#other_args[*]}]="$1" - ;; - esac - shift -done - -# Set up additional runtime args -runtime_feed_args=() -if [ ! -z "$runtime_source_feed$runtime_source_feed_key" ]; then - runtime_feed_args[${#runtime_feed_args[*]}]="-runtimesourcefeed" - runtime_feed_args[${#runtime_feed_args[*]}]="$runtime_source_feed" - runtime_feed_args[${#runtime_feed_args[*]}]="-runtimesourcefeedKey" - runtime_feed_args[${#runtime_feed_args[*]}]="$runtime_source_feed_key" - - runtimeFeedArg="/p:DotNetRuntimeSourceFeed=$runtime_source_feed" - runtimeFeedKeyArg="/p:DotNetRuntimeSourceFeedKey=$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 ${runtime_feed_args[@]+"${runtime_feed_args[@]}"} - -export DotNetBuildFromSource='true' - -# Build projects -"$reporoot/eng/common/build.sh" --restore --build --ci --pack ${other_args[@]+"${other_args[@]}"} ${runtime_feed_args[@]+"${runtime_feed_args[@]}"} From 977e0dc61edeff13207f22fc27dece0eaf106228 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 17 May 2021 14:15:48 -0700 Subject: [PATCH 03/31] Add option for publish Keeping this hidden until I hear back what it's used for in source build --- eng/build.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/build.sh b/eng/build.sh index 4466bcce1128..b43cfa54b8c7 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -18,6 +18,7 @@ verbosity='minimal' run_restore='' run_build=true run_pack=false +run_publish=false run_tests=false build_all=false build_deps=true @@ -147,6 +148,9 @@ while [[ $# -gt 0 ]]; do -pack) run_pack=true ;; + -public) + run_publish=true + ;; -no-pack|-nopack) run_pack=false ;; From 67bd20cde98c654e37d02fdb985a36ed455f0b7e Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 17 May 2021 14:57:50 -0700 Subject: [PATCH 04/31] Typo --- eng/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.sh b/eng/build.sh index b43cfa54b8c7..f2f4ab3b84a3 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -148,7 +148,7 @@ while [[ $# -gt 0 ]]; do -pack) run_pack=true ;; - -public) + -publish) run_publish=true ;; -no-pack|-nopack) From 5adbdbf9cef81781f3c7078fb2fb11ef8d963bc4 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 10:52:08 -0700 Subject: [PATCH 05/31] Update patch content --- ...dependency-not-used-in-source-build.patch} | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) rename eng/source-build-patches/{0004-Remove-Yarn-dependency-not-used-in-source-build.patch => 0001-Remove-Yarn-dependency-not-used-in-source-build.patch} (82%) diff --git a/eng/source-build-patches/0004-Remove-Yarn-dependency-not-used-in-source-build.patch b/eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch similarity index 82% rename from eng/source-build-patches/0004-Remove-Yarn-dependency-not-used-in-source-build.patch rename to eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch index a047f721cf3e..872a702086d5 100644 --- a/eng/source-build-patches/0004-Remove-Yarn-dependency-not-used-in-source-build.patch +++ b/eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch @@ -1,23 +1,23 @@ -From 83c0f95c563fa6eb9b446f09166cac2c62ab6390 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 14 May 2020 16:29:28 +0000 -Subject: [PATCH 04/14] Remove Yarn dependency - not used in source-build +From b8957fc9b7a160717aaba88680ed654a2430262a Mon Sep 17 00:00:00 2001 +From: John Luo +Date: Tue, 18 May 2021 10:48:34 -0700 +Subject: [PATCH] Remove Yarn dependency - not used in source-build --- eng/targets/Npm.Common.targets | 3 --- global.json | 1 - .../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 2 -- ...oft.AspNetCore.Components.WebAssembly.Authentication.csproj | 2 -- - src/Shared/E2ETesting/E2ETesting.targets | 3 --- - 5 files changed, 11 deletions(-) + src/Shared/E2ETesting/E2ETesting.targets | 2 -- + 5 files changed, 10 deletions(-) diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets -index 696d23402b..6086dd0843 100644 +index 0604d1f0c0..6b5849c03a 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -1,8 +1,5 @@ - + - - - @@ -25,7 +25,7 @@ index 696d23402b..6086dd0843 100644 $(PackageId.Replace('@','').Replace('/','-')) $(NormalizedPackageId)-$(PackageVersion).tgz diff --git a/global.json b/global.json -index 501ba161bf..ee9dcaf4fa 100644 +index b84a06acea..06510aa9ea 100644 --- a/global.json +++ b/global.json @@ -29,7 +29,6 @@ @@ -33,45 +33,44 @@ index 501ba161bf..ee9dcaf4fa 100644 }, "msbuild-sdks": { - "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21167.3", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21167.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21261.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21261.2" } diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -index 939ba16f88..ea2c849ea3 100644 +index 1d260d7d3c..1e794f2265 100644 --- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj +++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj @@ -1,7 +1,5 @@ - + - - $(DefaultNetCoreTargetFramework) Authenticate your Blazor webassembly applications with Azure Active Directory and Azure Active Directory B2C diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -index 21a2efba4e..b4a6a75446 100644 +index 88bc97fb01..fcb613b38a 100644 --- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj +++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj @@ -1,7 +1,5 @@ - + - - $(DefaultNetCoreTargetFramework) Build client-side authentication for single-page applications (SPAs). diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets -index 76ced2cce9..eaecb913a9 100644 +index 76ced2cce9..0eb94aaf2e 100644 --- a/src/Shared/E2ETesting/E2ETesting.targets +++ b/src/Shared/E2ETesting/E2ETesting.targets -@@ -1,7 +1,4 @@ +@@ -1,6 +1,4 @@ - - -- + - --- -2.18.0 +-- +2.20.1.windows.1 From 93ec033c140fe5d7f313ee5ad942b8a743caff28 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 11:39:56 -0700 Subject: [PATCH 06/31] Update patch --- ...n-dependency-not-used-in-source-build.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch b/eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch index 872a702086d5..04c989761f49 100644 --- a/eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch +++ b/eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch @@ -1,4 +1,4 @@ -From b8957fc9b7a160717aaba88680ed654a2430262a Mon Sep 17 00:00:00 2001 +From 96bb56ea0ea0ce6ca21ffc58d7843d7ccfab3d9b Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 10:48:34 -0700 Subject: [PATCH] Remove Yarn dependency - not used in source-build @@ -17,7 +17,7 @@ index 0604d1f0c0..6b5849c03a 100644 +++ b/eng/targets/Npm.Common.targets @@ -1,8 +1,5 @@ - + - - - @@ -25,7 +25,7 @@ index 0604d1f0c0..6b5849c03a 100644 $(PackageId.Replace('@','').Replace('/','-')) $(NormalizedPackageId)-$(PackageVersion).tgz diff --git a/global.json b/global.json -index b84a06acea..06510aa9ea 100644 +index 5a2b8a613d..fa6d0c7954 100644 --- a/global.json +++ b/global.json @@ -29,7 +29,6 @@ @@ -33,8 +33,8 @@ index b84a06acea..06510aa9ea 100644 }, "msbuild-sdks": { - "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21261.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21261.2" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" } diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj index 1d260d7d3c..1e794f2265 100644 @@ -42,7 +42,7 @@ index 1d260d7d3c..1e794f2265 100644 +++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj @@ -1,7 +1,5 @@ - + - - @@ -54,7 +54,7 @@ index 88bc97fb01..fcb613b38a 100644 +++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj @@ -1,7 +1,5 @@ - + - - @@ -68,9 +68,9 @@ index 76ced2cce9..0eb94aaf2e 100644 - - - + --- +-- 2.20.1.windows.1 From 360d1c488322be4163dd90c61edd375c1c763ad8 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 12:04:20 -0700 Subject: [PATCH 07/31] Fixup another global.json patch --- ...Support-global.json-on-arm64-as-well.patch | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/eng/source-build-patches/0007-Support-global.json-on-arm64-as-well.patch b/eng/source-build-patches/0007-Support-global.json-on-arm64-as-well.patch index d54f0281c15a..dcf01314e50f 100644 --- a/eng/source-build-patches/0007-Support-global.json-on-arm64-as-well.patch +++ b/eng/source-build-patches/0007-Support-global.json-on-arm64-as-well.patch @@ -1,42 +1,31 @@ -From ca706cd8670d14fae05b36ee83de716fa19d95ba Mon Sep 17 00:00:00 2001 -From: Omair Majid -Date: Wed, 23 Oct 2019 15:43:57 -0400 -Subject: [PATCH 07/14] Support global.json on arm64 as well +From 2089c0c2851fabd5b44e3216e8a4a2e5e7293a12 Mon Sep 17 00:00:00 2001 +From: John Luo +Date: Tue, 18 May 2021 12:03:16 -0700 +Subject: [PATCH] Support global.json on arm64 as well -arcade uses the runtime section of global.json to decide which -architecture + runtime combination needs to be installed. - -With https://github.com/dotnet/arcade/pull/4132 arcade can install -foreign SDKs in separate locations correctly. - -This change, suggested by @dougbu, makes arcade always install the -runtime for the local architecture (which means it should work on arm64 -and x64) as well as the x86 architecture (skipped on Linux). - -This gets us a working SDK/Runtime combo on arm64. --- global.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/global.json b/global.json -index ee9dcaf4fa..053e92ebee 100644 +index 5a2b8a613d..951a5f9fe3 100644 --- a/global.json +++ b/global.json @@ -5,13 +5,10 @@ "tools": { - "dotnet": "6.0.100-preview.3.21168.19", + "dotnet": "6.0.100-preview.5.21264.3", "runtimes": { - "dotnet/x64": [ + "dotnet": [ - "2.1.25", + "2.1.27", "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" ], - "dotnet/x86": [ - "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" - ], "aspnetcore/x64": [ - "3.1.13" + "3.1.14" ] -- -2.18.0 +2.20.1.windows.1 From 36bfffa555e294240fc3e48e1a72270e56916b06 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 13:11:05 -0700 Subject: [PATCH 08/31] Path to remove WASM.Performance shouldn't be needed --- .../0011-Fix-a-couple-issues.patch | 96 ------------------- 1 file changed, 96 deletions(-) delete mode 100644 eng/source-build-patches/0011-Fix-a-couple-issues.patch diff --git a/eng/source-build-patches/0011-Fix-a-couple-issues.patch b/eng/source-build-patches/0011-Fix-a-couple-issues.patch deleted file mode 100644 index f32be5bebbd5..000000000000 --- a/eng/source-build-patches/0011-Fix-a-couple-issues.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 594c716ad8993df91b4cbade593b9bee7cacae47 Mon Sep 17 00:00:00 2001 -From: Chris Rummel -Date: Thu, 3 Sep 2020 06:29:25 -0500 -Subject: [PATCH 11/14] Fix a couple issues. - ---- - AspNetCore.sln | 2 - - src/Components/Components.slnf | 1 - - src/Components/ComponentsNoDeps.slnf | 1 - - .../Driver/Wasm.Performance.Driver.csproj | 37 ------------------- - 4 files changed, 41 deletions(-) - delete mode 100644 src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj - -diff --git a/AspNetCore.sln b/AspNetCore.sln -index 06f5b1b4c6..4a7c2e59a8 100644 ---- a/AspNetCore.sln -+++ b/AspNetCore.sln -@@ -475,8 +475,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarkapps", "benchmarka - EndProject - Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Wasm.Performance", "Wasm.Performance", "{6276A9A0-791B-49C1-AD8F-50AC47CDC196}" - EndProject --Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Performance.Driver", "src\Components\benchmarkapps\Wasm.Performance\Driver\Wasm.Performance.Driver.csproj", "{B81C7FA1-870F-4F21-A928-A5BE18754E6E}" --EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wasm.Performance.TestApp", "src\Components\benchmarkapps\Wasm.Performance\TestApp\Wasm.Performance.TestApp.csproj", "{2AEACF69-7F68-414A-B49D-2C627D37D0F6}" - EndProject - Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Components.WebAssembly.Server.Tests", "src\Components\WebAssembly\Server\test\Microsoft.AspNetCore.Components.WebAssembly.Server.Tests.csproj", "{0C610220-E00C-4752-98A0-44A3D4B96A21}" -diff --git a/src/Components/Components.slnf b/src/Components/Components.slnf -index d023481b95..a28aa122b1 100644 ---- a/src/Components/Components.slnf -+++ b/src/Components/Components.slnf -@@ -37,7 +37,6 @@ - "src\\Components\\WebAssembly\\testassets\\WasmLinkerTest.csproj", - "src\\Components\\Web\\src\\Microsoft.AspNetCore.Components.Web.csproj", - "src\\Components\\Web\\test\\Microsoft.AspNetCore.Components.Web.Tests.csproj", -- "src\\Components\\benchmarkapps\\Wasm.Performance\\Driver\\Wasm.Performance.Driver.csproj", - "src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj", - "src\\Components\\test\\E2ETest\\Microsoft.AspNetCore.Components.E2ETests.csproj", - "src\\Components\\test\\testassets\\BasicTestApp\\BasicTestApp.csproj", -diff --git a/src/Components/ComponentsNoDeps.slnf b/src/Components/ComponentsNoDeps.slnf -index 7cf830b329..82e51fba83 100644 ---- a/src/Components/ComponentsNoDeps.slnf -+++ b/src/Components/ComponentsNoDeps.slnf -@@ -39,7 +39,6 @@ - "src\\Components\\Web\\src\\Microsoft.AspNetCore.Components.Web.csproj", - "src\\Components\\Web\\test\\Microsoft.AspNetCore.Components.Web.Tests.csproj", - "src\\Components\\benchmarkapps\\Wasm.Performance\\ConsoleHost\\Wasm.Performance.ConsoleHost.csproj", -- "src\\Components\\benchmarkapps\\Wasm.Performance\\Driver\\Wasm.Performance.Driver.csproj", - "src\\Components\\benchmarkapps\\Wasm.Performance\\TestApp\\Wasm.Performance.TestApp.csproj", - "src\\Components\\test\\E2ETest\\Microsoft.AspNetCore.Components.E2ETests.csproj", - "src\\Components\\test\\testassets\\BasicTestApp\\BasicTestApp.csproj", -diff --git a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj b/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj -deleted file mode 100644 -index 346ddc48f1..0000000000 ---- a/src/Components/benchmarkapps/Wasm.Performance/Driver/Wasm.Performance.Driver.csproj -+++ /dev/null -@@ -1,37 +0,0 @@ -- -- -- -- $(DefaultNetCoreTargetFramework) -- exe -- -- false -- -- false -- true -- linux-x64 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- <_Parameter1>TestAppLocatiion -- <_Parameter2>$(MSBuildThisFileDirectory)..\TestApp\ -- -- -- -- -- --- -2.18.0 - From d63f4c14326c442976e17dd8d31f5b59fa48714f Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 13:43:23 -0700 Subject: [PATCH 09/31] Remove two patches --- eng/Versions.props | 2 + eng/build.sh | 1 + ...se-source-built-NuGet-for-repo-tasks.patch | 39 ------------------- .../0017-Emit-RepoTasks.binlog.patch | 25 ------------ eng/tools/RepoTasks/RepoTasks.csproj | 2 +- 5 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 eng/source-build-patches/0013-Use-source-built-NuGet-for-repo-tasks.patch delete mode 100644 eng/source-build-patches/0017-Emit-RepoTasks.binlog.patch diff --git a/eng/Versions.props b/eng/Versions.props index 8760793dcfbd..9ac012247f39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -260,6 +260,8 @@ 2.4.3 1.0.19249.1 6.0.0-preview.3.21167.1 + + 5.9.0 diff --git a/eng/build.sh b/eng/build.sh index f2f4ab3b84a3..53d2fdb581a4 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -371,6 +371,7 @@ if [ "$build_repo_tasks" = true ]; then -p:Configuration=Release \ -p:Restore=$run_restore \ -p:Build=true \ + -bl:RepoTasks.binlog \ -clp:NoSummary \ ${toolset_build_args[@]+"${toolset_build_args[@]}"} fi diff --git a/eng/source-build-patches/0013-Use-source-built-NuGet-for-repo-tasks.patch b/eng/source-build-patches/0013-Use-source-built-NuGet-for-repo-tasks.patch deleted file mode 100644 index 8c00f50d1be5..000000000000 --- a/eng/source-build-patches/0013-Use-source-built-NuGet-for-repo-tasks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1fa8097f1a6a49606c0aefad2763f3e0adf0e845 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Fri, 6 Nov 2020 10:41:33 -0600 -Subject: [PATCH 13/14] Use source-built NuGet for repo tasks - -This allows us to use the source-built version of NuGet when we -have it, to avoid prebuilts. ---- - eng/Versions.props | 1 + - eng/tools/RepoTasks/RepoTasks.csproj | 2 +- - 2 files changed, 2 insertion(+), 1 deletion(-) - -diff --git a/eng/Versions.props b/eng/Versions.props -index 90bb9be..20a4c8c 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -208,6 +208,7 @@ - 1.4.0 - 6.8.0 - 5.9.0 -+ 5.9.0 - 5.9.0 - 5.0.0-alpha.20560.6 - -diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj -index 2b09f16594..657974b2b0 100644 ---- a/eng/tools/RepoTasks/RepoTasks.csproj -+++ b/eng/tools/RepoTasks/RepoTasks.csproj -@@ -15,7 +15,7 @@ - - - -- -+ - - - --- -2.18.0 diff --git a/eng/source-build-patches/0017-Emit-RepoTasks.binlog.patch b/eng/source-build-patches/0017-Emit-RepoTasks.binlog.patch deleted file mode 100644 index 79cc2f7ab9e4..000000000000 --- a/eng/source-build-patches/0017-Emit-RepoTasks.binlog.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 8f63217ad54ec431e398753b2bf745a1eb565e36 Mon Sep 17 00:00:00 2001 -From: Davis Goodin -Date: Mon, 21 Dec 2020 14:37:58 -0600 -Subject: [PATCH] Emit RepoTasks.binlog - -Lets us diagnose errors that occur while building RepoTasks.csproj. ---- - eng/build.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eng/build.sh b/eng/build.sh -index 3c3cab39ce..029bb4f0c8 100755 ---- a/eng/build.sh -+++ b/eng/build.sh -@@ -363,6 +363,7 @@ if [ "$build_repo_tasks" = true ]; then - -p:Restore=$run_restore \ - -p:Build=true \ - -clp:NoSummary \ -+ -bl:RepoTasks.binlog \ - ${toolset_build_args[@]+"${toolset_build_args[@]}"} - fi - --- -2.25.4 - diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index 0b7444ffb22b..7f34bed7ee6f 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -15,7 +15,7 @@ - + From 83c0e6fee38adc4212c5f43feb11647b261ea90c Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 15:51:03 -0700 Subject: [PATCH 10/31] Remove some patches --- Directory.Build.props | 12 +++++- eng/Common.props | 1 + eng/Versions.props | 1 + ...lude-some-projects-from-source-build.patch | 27 ------------ ...nce-versions-of-source-built-package.patch | 42 ------------------- .../0006-Add-FreeBSD.patch | 37 ---------------- ...08-use-sourcebuildRID-to-find-clrjit.patch | 25 ----------- .../0012-Don-t-warn-on-CA1416.patch | 26 ------------ eng/tools/RepoTasks/RepoTasks.csproj | 6 +-- 9 files changed, 15 insertions(+), 162 deletions(-) delete mode 100644 eng/source-build-patches/0003-Exclude-some-projects-from-source-build.patch delete mode 100644 eng/source-build-patches/0005-Revert-to-reference-versions-of-source-built-package.patch delete mode 100644 eng/source-build-patches/0006-Add-FreeBSD.patch delete mode 100644 eng/source-build-patches/0008-use-sourcebuildRID-to-find-clrjit.patch delete mode 100644 eng/source-build-patches/0012-Don-t-warn-on-CA1416.patch diff --git a/Directory.Build.props b/Directory.Build.props index b6d0b7b7b775..ed795e78dd31 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,14 +28,21 @@ true - true + true true true false + true diff --git a/eng/Common.props b/eng/Common.props index 7c489b15a9dc..a9a69bde9f22 100644 --- a/eng/Common.props +++ b/eng/Common.props @@ -3,6 +3,7 @@ win osx linux + freebsd x64 $(TargetOsName)-$(TargetArchitecture) diff --git a/eng/Versions.props b/eng/Versions.props index 9ac012247f39..bb3b4e6ef226 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -262,6 +262,7 @@ 6.0.0-preview.3.21167.1 5.9.0 + 16.9.0 diff --git a/eng/source-build-patches/0003-Exclude-some-projects-from-source-build.patch b/eng/source-build-patches/0003-Exclude-some-projects-from-source-build.patch deleted file mode 100644 index f92f6fe3e98a..000000000000 --- a/eng/source-build-patches/0003-Exclude-some-projects-from-source-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6f903f6870011b6a11074d93a03481faac6a35dc Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 4 Feb 2021 15:18:11 +0000 -Subject: [PATCH] Exclude some projects from source-build - ---- - Directory.Build.props | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 50d30f12fd..85c2f2428b 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -27,7 +27,9 @@ - '$(IsTestAssetProject)' == 'true' OR - '$(IsBenchmarkProject)' == 'true' OR - '$(IsUnitTestProject)' == 'true'">false -- -+ true -+ true -+ - - 1.0.0 - 16.9.0 -+ 16.9.0 - 1.2.0 - 16.9.0 - 1.2.6 -diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj -index 7fa9957..3664366 100644 ---- a/eng/tools/RepoTasks/RepoTasks.csproj -+++ b/eng/tools/RepoTasks/RepoTasks.csproj -@@ -20,9 +20,9 @@ - - - -- -- -- -+ -+ -+ - - - --- -2.18.0 - diff --git a/eng/source-build-patches/0006-Add-FreeBSD.patch b/eng/source-build-patches/0006-Add-FreeBSD.patch deleted file mode 100644 index ea1212f66b78..000000000000 --- a/eng/source-build-patches/0006-Add-FreeBSD.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d67aa83be72cbb1ca37aba992633da87235f397b Mon Sep 17 00:00:00 2001 -From: Tomas Weinfurt -Date: Wed, 13 Nov 2019 22:32:02 -0800 -Subject: [PATCH 06/14] Add FreeBSD - ---- - Directory.Build.props | 1 + - eng/Common.props | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Directory.Build.props b/Directory.Build.props -index cd2dabcdba..53d90f2903 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -159,6 +159,7 @@ - win-arm64; - osx-x64; - osx-arm64; -+ freebsd-x64; - linux-musl-x64; - linux-musl-arm; - linux-musl-arm64; -diff --git a/eng/Common.props b/eng/Common.props -index 7c489b15a9..a9a69bde9f 100644 ---- a/eng/Common.props -+++ b/eng/Common.props -@@ -3,6 +3,7 @@ - win - osx - linux -+ freebsd - x64 - $(TargetOsName)-$(TargetArchitecture) - --- -2.18.0 - diff --git a/eng/source-build-patches/0008-use-sourcebuildRID-to-find-clrjit.patch b/eng/source-build-patches/0008-use-sourcebuildRID-to-find-clrjit.patch deleted file mode 100644 index 77f17bb5a972..000000000000 --- a/eng/source-build-patches/0008-use-sourcebuildRID-to-find-clrjit.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2ac4c152b5c4409025dcbaf473b89a6094453e97 Mon Sep 17 00:00:00 2001 -From: adaggarwal -Date: Sat, 8 Feb 2020 06:43:48 +0000 -Subject: [PATCH 08/14] use-sourcebuildRID-to-find-clrjit - ---- - .../App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -index 4199691fdb..6387557d8f 100644 ---- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj -@@ -411,7 +411,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - - - $(RuntimePackageRoot)runtimes\$(RuntimeIdentifier)\native\$(LibPrefix)clrjit$(LibExtension) -+ Condition="'$(CrossCompileDirectory)' == ''">$(RuntimePackageRoot)runtimes\$(SourceBuildRuntimeIdentifier)\native\$(LibPrefix)clrjit$(LibExtension) - $(RuntimePackageRoot)runtimes\$(CrossCompileDirectory)\native\$(LibPrefix)clrjit$(LibExtension) - --- -2.18.0 - diff --git a/eng/source-build-patches/0012-Don-t-warn-on-CA1416.patch b/eng/source-build-patches/0012-Don-t-warn-on-CA1416.patch deleted file mode 100644 index 87415782f670..000000000000 --- a/eng/source-build-patches/0012-Don-t-warn-on-CA1416.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 446691a345e68861bd653c1be4b9111aafad5613 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 8 Oct 2020 14:18:02 +0000 -Subject: [PATCH 12/14] Don't warn on CA1416 - ---- - Directory.Build.props | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 53d90f2903..72cee68b4e 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -102,6 +102,9 @@ - - - -+ -+ $(NoWarn);CA1416 - - $(NoWarn.Replace('1591', '')) - --- -2.18.0 - diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index 7f34bed7ee6f..8a75becf1db0 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -20,9 +20,9 @@ - - - + + + From b3419664f7eb8f686f85d46f7b7d475ee756f7de Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 16:00:03 -0700 Subject: [PATCH 11/31] Typo --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index ed795e78dd31..ced547d4960a 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -28,7 +28,7 @@ true true true From d005a527a13ca759c5e40385cd2be8f81bb6cbb6 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 16:08:04 -0700 Subject: [PATCH 12/31] Consolidate global.json patch --- ...-dependency-not-used-in-source-build.patch | 76 ------------------- ...lobal.json-updates-for-source-build.patch} | 20 +++-- 2 files changed, 14 insertions(+), 82 deletions(-) delete mode 100644 eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch rename eng/source-build-patches/{0007-Support-global.json-on-arm64-as-well.patch => 0001-global.json-updates-for-source-build.patch} (51%) diff --git a/eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch b/eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch deleted file mode 100644 index 04c989761f49..000000000000 --- a/eng/source-build-patches/0001-Remove-Yarn-dependency-not-used-in-source-build.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 96bb56ea0ea0ce6ca21ffc58d7843d7ccfab3d9b Mon Sep 17 00:00:00 2001 -From: John Luo -Date: Tue, 18 May 2021 10:48:34 -0700 -Subject: [PATCH] Remove Yarn dependency - not used in source-build - ---- - eng/targets/Npm.Common.targets | 3 --- - global.json | 1 - - .../src/Microsoft.Authentication.WebAssembly.Msal.csproj | 2 -- - ...oft.AspNetCore.Components.WebAssembly.Authentication.csproj | 2 -- - src/Shared/E2ETesting/E2ETesting.targets | 2 -- - 5 files changed, 10 deletions(-) - -diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets -index 0604d1f0c0..6b5849c03a 100644 ---- a/eng/targets/Npm.Common.targets -+++ b/eng/targets/Npm.Common.targets -@@ -1,8 +1,5 @@ - - -- -- -- - - $(PackageId.Replace('@','').Replace('/','-')) - $(NormalizedPackageId)-$(PackageVersion).tgz -diff --git a/global.json b/global.json -index 5a2b8a613d..fa6d0c7954 100644 ---- a/global.json -+++ b/global.json -@@ -29,7 +29,6 @@ - "xcopy-msbuild": "16.5.0-alpha" - }, - "msbuild-sdks": { -- "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" - } -diff --git a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -index 1d260d7d3c..1e794f2265 100644 ---- a/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -+++ b/src/Components/WebAssembly/Authentication.Msal/src/Microsoft.Authentication.WebAssembly.Msal.csproj -@@ -1,7 +1,5 @@ - - -- -- - - $(DefaultNetCoreTargetFramework) - Authenticate your Blazor webassembly applications with Azure Active Directory and Azure Active Directory B2C -diff --git a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -index 88bc97fb01..fcb613b38a 100644 ---- a/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -+++ b/src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj -@@ -1,7 +1,5 @@ - - -- -- - - $(DefaultNetCoreTargetFramework) - Build client-side authentication for single-page applications (SPAs). -diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets -index 76ced2cce9..0eb94aaf2e 100644 ---- a/src/Shared/E2ETesting/E2ETesting.targets -+++ b/src/Shared/E2ETesting/E2ETesting.targets -@@ -1,6 +1,4 @@ - -- -- - - - --- -2.20.1.windows.1 - diff --git a/eng/source-build-patches/0007-Support-global.json-on-arm64-as-well.patch b/eng/source-build-patches/0001-global.json-updates-for-source-build.patch similarity index 51% rename from eng/source-build-patches/0007-Support-global.json-on-arm64-as-well.patch rename to eng/source-build-patches/0001-global.json-updates-for-source-build.patch index dcf01314e50f..7049568b51e3 100644 --- a/eng/source-build-patches/0007-Support-global.json-on-arm64-as-well.patch +++ b/eng/source-build-patches/0001-global.json-updates-for-source-build.patch @@ -1,14 +1,14 @@ -From 2089c0c2851fabd5b44e3216e8a4a2e5e7293a12 Mon Sep 17 00:00:00 2001 +From d070c95637ba2c26f51588088b9c1e76deed9623 Mon Sep 17 00:00:00 2001 From: John Luo -Date: Tue, 18 May 2021 12:03:16 -0700 -Subject: [PATCH] Support global.json on arm64 as well +Date: Tue, 18 May 2021 16:08:50 -0700 +Subject: [PATCH] global.json updates for source-build --- - global.json | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) + global.json | 6 +----- + 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/global.json b/global.json -index 5a2b8a613d..951a5f9fe3 100644 +index 5a2b8a613d..43723053ce 100644 --- a/global.json +++ b/global.json @@ -5,13 +5,10 @@ @@ -26,6 +26,14 @@ index 5a2b8a613d..951a5f9fe3 100644 "aspnetcore/x64": [ "3.1.14" ] +@@ -29,7 +26,6 @@ + "xcopy-msbuild": "16.5.0-alpha" + }, + "msbuild-sdks": { +- "Yarn.MSBuild": "1.22.10", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" + } -- 2.20.1.windows.1 From 7304df62856d3fdb3de8e9968059254d00dffac3 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 16:49:00 -0700 Subject: [PATCH 13/31] Update packability of integration tests --- Directory.Build.props | 3 +-- Directory.Build.targets | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index ced547d4960a..179e74f163d4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -41,8 +41,7 @@ '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsUnitTestProject)' == 'true' OR - '$(IsSpecificationTestProject)' == 'true' OR - '$(IsOtherTestProject)' == 'true'">true + '$(IsSpecificationTestProject)' == 'true'">true - + $(DefaultNetCoreTargetFramework) From 1f2e8ee0b61388cd3d09412a97ac092c779bca68 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 18:19:50 -0700 Subject: [PATCH 16/31] Mark Components.E2ETests as NodeJsProject --- eng/Build.props | 1 + .../E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Build.props b/eng/Build.props index 8805c438ebe2..6d8f092b296f 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -124,6 +124,7 @@ - + $(DefaultNetCoreTargetFramework) From 0a160d9c4872fa44a3ab30f86f0e20e3896e8fd5 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 18:34:18 -0700 Subject: [PATCH 17/31] Exclude YarnMSBuild project in source build --- eng/Build.props | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/eng/Build.props b/eng/Build.props index 6d8f092b296f..e318f4fb5279 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -124,7 +124,6 @@ + + + From 5122e5904af99b83bc74977d5c1ba02000d53af5 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 18 May 2021 19:00:40 -0700 Subject: [PATCH 18/31] Try remove packastool patch --- ...-Conditionally-set-PackAsToolShimRID.patch | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 eng/source-build-patches/0002-Conditionally-set-PackAsToolShimRID.patch diff --git a/eng/source-build-patches/0002-Conditionally-set-PackAsToolShimRID.patch b/eng/source-build-patches/0002-Conditionally-set-PackAsToolShimRID.patch deleted file mode 100644 index 99a6483e9403..000000000000 --- a/eng/source-build-patches/0002-Conditionally-set-PackAsToolShimRID.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 64d2efe24308d9e8b99fdea60c92ee1115259506 Mon Sep 17 00:00:00 2001 -From: dseefeld -Date: Thu, 31 Oct 2019 20:38:26 +0000 -Subject: [PATCH 02/14] Conditionally set PackAsToolShimRID - ---- - Directory.Build.targets | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/Directory.Build.targets b/Directory.Build.targets -index 4b72a52947..1a3b01e858 100644 ---- a/Directory.Build.targets -+++ b/Directory.Build.targets -@@ -52,6 +52,11 @@ - true - - -+ -+ -+ win-x64;win-x86 -+ -+ - - $(AssemblyName) - Date: Wed, 19 May 2021 10:39:55 -0700 Subject: [PATCH 19/31] Verification --- eng/Build.props | 2 +- eng/common/templates/steps/source-build.yml | 1 + ...global.json-updates-for-source-build.patch | 20 ++++++------------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index e318f4fb5279..b7cccd17b611 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -140,7 +140,7 @@ $(RepoRoot)src\Components\WebAssembly\WebAssembly.Authentication\src\Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj; " Exclude="@(ProjectToExclude)" /> - + diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index e20637ed6a17..95d304c3d031 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -57,6 +57,7 @@ steps: **/*.log **/*.binlog artifacts/source-build/self/prebuilt-report/** + artifacts/packages/Release/NonShipping/* TargetFolder: '$(Build.StagingDirectory)/BuildLogs' CleanTargetFolder: true continueOnError: true diff --git a/eng/source-build-patches/0001-global.json-updates-for-source-build.patch b/eng/source-build-patches/0001-global.json-updates-for-source-build.patch index 7049568b51e3..5a3628885391 100644 --- a/eng/source-build-patches/0001-global.json-updates-for-source-build.patch +++ b/eng/source-build-patches/0001-global.json-updates-for-source-build.patch @@ -1,14 +1,14 @@ -From d070c95637ba2c26f51588088b9c1e76deed9623 Mon Sep 17 00:00:00 2001 +From d0c2069e7c81c5fbd5a27f786e5e3347ab9d4b95 Mon Sep 17 00:00:00 2001 From: John Luo -Date: Tue, 18 May 2021 16:08:50 -0700 -Subject: [PATCH] global.json updates for source-build +Date: Wed, 19 May 2021 10:41:41 -0700 +Subject: [PATCH] global.json updates for source build --- - global.json | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) + global.json | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/global.json b/global.json -index 5a2b8a613d..43723053ce 100644 +index 5a2b8a613d..951a5f9fe3 100644 --- a/global.json +++ b/global.json @@ -5,13 +5,10 @@ @@ -26,14 +26,6 @@ index 5a2b8a613d..43723053ce 100644 "aspnetcore/x64": [ "3.1.14" ] -@@ -29,7 +26,6 @@ - "xcopy-msbuild": "16.5.0-alpha" - }, - "msbuild-sdks": { -- "Yarn.MSBuild": "1.22.10", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21264.2", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21264.2" - } -- 2.20.1.windows.1 From 2303106125212816702f6249f00327dcba5f24f9 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 19 May 2021 11:24:11 -0700 Subject: [PATCH 20/31] Consolidate ExcludeFromSourceBuild logic --- Directory.Build.props | 5 ----- Directory.Build.targets | 10 +++++++++- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 32cad5d1380c..ba1c1675a099 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -36,11 +36,6 @@ '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsUnitTestProject)' == 'true'">false - true true + Condition="'$(ExcludeFromSourceBuild)' == '' and + '$(DotNetBuildFromSource)' == 'true' and + '$(IsAspNetCoreApp)' != 'true' and + '$(IsAnalyzersProject)' != 'true' and + ('$(IsSampleProject)' == 'true' OR + '$(IsTestAssetProject)' == 'true' OR + '$(IsBenchmarkProject)' == 'true' OR + '$(IsUnitTestProject)' == 'true' OR + '$(IsSpecificationTestProject)' == 'true')">true From 46192871d947efd6c1c137dc97ed56a14ab07b0d Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 19 May 2021 11:35:51 -0700 Subject: [PATCH 21/31] Revert "Consolidate ExcludeFromSourceBuild logic" This reverts commit ed8816addb38062b7a9bdb966346ca26ad7ddb79. --- Directory.Build.props | 5 +++++ Directory.Build.targets | 10 +--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index ba1c1675a099..32cad5d1380c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -36,6 +36,11 @@ '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsUnitTestProject)' == 'true'">false + true true + Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(IsAnalyzersProject)' != 'true'">true From 6bdeeeb177ae103ee637c48418b56cbdbd5ac4b9 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 21 May 2021 09:55:30 -0500 Subject: [PATCH 22/31] Add support to skip SB publish validation in CI --- .azure/pipelines/ci.yml | 1 + eng/build.sh | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index b9a11a2983a1..5c1c7a7bef67 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -755,6 +755,7 @@ stages: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754' buildScript: './eng/build.sh' + skipPublishValidation: true # Publish to the BAR - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/build.sh b/eng/build.sh index 53d2fdb581a4..b5fbbbe36871 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -18,7 +18,6 @@ verbosity='minimal' run_restore='' run_build=true run_pack=false -run_publish=false run_tests=false build_all=false build_deps=true @@ -148,9 +147,6 @@ while [[ $# -gt 0 ]]; do -pack) run_pack=true ;; - -publish) - run_publish=true - ;; -no-pack|-nopack) run_pack=false ;; From 83774e3a76cb6b3b7ca47c5b1b74617497418793 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 21 May 2021 10:15:17 -0500 Subject: [PATCH 23/31] Update patch --- .../0001-global.json-updates-for-source-build.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/source-build-patches/0001-global.json-updates-for-source-build.patch b/eng/source-build-patches/0001-global.json-updates-for-source-build.patch index 5a3628885391..dacdff0d4ce9 100644 --- a/eng/source-build-patches/0001-global.json-updates-for-source-build.patch +++ b/eng/source-build-patches/0001-global.json-updates-for-source-build.patch @@ -13,7 +13,7 @@ index 5a2b8a613d..951a5f9fe3 100644 +++ b/global.json @@ -5,13 +5,10 @@ "tools": { - "dotnet": "6.0.100-preview.5.21264.3", + "dotnet": "6.0.100-preview.5.21230.2", "runtimes": { - "dotnet/x64": [ + "dotnet": [ @@ -26,6 +26,6 @@ index 5a2b8a613d..951a5f9fe3 100644 "aspnetcore/x64": [ "3.1.14" ] --- +-- 2.20.1.windows.1 From 6a77269059b09f2af30dfb4dab360250f2f4ff65 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 31 May 2021 23:27:07 -0700 Subject: [PATCH 24/31] Revert publish workaround From cfb063830846a4d9f418eef0b716e6a1ca97eb00 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 31 May 2021 23:44:41 -0700 Subject: [PATCH 25/31] Update binlog parameter logic --- eng/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.sh b/eng/build.sh index b5fbbbe36871..311734c91cff 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -342,6 +342,7 @@ if [[ "$binary_log" == true ]]; then if [[ "$found" == false ]]; then msbuild_args[${#msbuild_args[*]}]="/bl:$log_dir/Build.binlog" fi + toolset_build_args[${#toolset_build_args[*]}]="/bl:$log_dir/Build.repotasks.binlog" elif [[ "$ci" == true ]]; then # Ensure the artifacts/log directory isn't empty to avoid warnings. touch "$log_dir/empty.log" @@ -367,7 +368,6 @@ if [ "$build_repo_tasks" = true ]; then -p:Configuration=Release \ -p:Restore=$run_restore \ -p:Build=true \ - -bl:RepoTasks.binlog \ -clp:NoSummary \ ${toolset_build_args[@]+"${toolset_build_args[@]}"} fi From 2ad715f86ef2375f825d0430b0926517e7b5d078 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 31 May 2021 23:48:59 -0700 Subject: [PATCH 26/31] Revert Directory.Build.props changes --- Directory.Build.props | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 32cad5d1380c..ba1c1675a099 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -36,11 +36,6 @@ '$(IsTestAssetProject)' == 'true' OR '$(IsBenchmarkProject)' == 'true' OR '$(IsUnitTestProject)' == 'true'">false - true - 5.9.0 - 16.9.0 diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index 8a75becf1db0..e723beb3531b 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -15,14 +15,14 @@ - + - - - + + + From fc96aa24904906a49e6a3827d6f9d78bcd2d973c Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 1 Jun 2021 13:44:45 -0700 Subject: [PATCH 29/31] Remove debugging code --- eng/common/templates/steps/source-build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 95d304c3d031..e20637ed6a17 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -57,7 +57,6 @@ steps: **/*.log **/*.binlog artifacts/source-build/self/prebuilt-report/** - artifacts/packages/Release/NonShipping/* TargetFolder: '$(Build.StagingDirectory)/BuildLogs' CleanTargetFolder: true continueOnError: true From 07c000605ce033da677ea0b1319e09e84e842605 Mon Sep 17 00:00:00 2001 From: = Date: Wed, 2 Jun 2021 10:57:20 -0700 Subject: [PATCH 30/31] Modify source build global json script --- eng/scripts/prepare-sourcebuild-globaljson.sh | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/eng/scripts/prepare-sourcebuild-globaljson.sh b/eng/scripts/prepare-sourcebuild-globaljson.sh index 15a1b7386159..403391cb9798 100755 --- a/eng/scripts/prepare-sourcebuild-globaljson.sh +++ b/eng/scripts/prepare-sourcebuild-globaljson.sh @@ -2,7 +2,21 @@ set -euo pipefail -jq \ - '.tools.runtimes = {.tools.runtimes | .dotnet = ."dotnet/x64" | del(."dotnet/x64") | del(."dotnet/x86")}' \ - global.json > global.json.swap +while IFS= read -r line +do + # Remove dotnet/x64 runtimes + if [[ "$line" == *"dotnet/x86"* ]] + then + while IFS= read -r removeLine + do + if [[ "$removeLine" == *"]"* ]] + then + break + fi + done + else + # Change dotnet/x64 to dotnet + echo "${line/dotnet\/x64/dotnet}" + fi +done < global.json > global.json.swap mv global.json.swap global.json From 3b42193ab2278859a6993155403f1142db84765f Mon Sep 17 00:00:00 2001 From: = Date: Thu, 3 Jun 2021 11:59:04 -0700 Subject: [PATCH 31/31] Relocate script invocation --- .azure/pipelines/ci.yml | 2 +- eng/SourceBuild.props | 12 +++--------- eng/scripts/prepare-sourcebuild-globaljson.sh | 6 ++++-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 7e28340c31ad..5c1c7a7bef67 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -754,7 +754,7 @@ stages: platform: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-f39df28-20191023143754' - buildScript: './eng/scripts/prepare-sourcebuild-globaljson.sh && ./eng/build.sh' + buildScript: './eng/build.sh' skipPublishValidation: true # Publish to the BAR diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props index 98f9b244c2af..27cbe920367a 100644 --- a/eng/SourceBuild.props +++ b/eng/SourceBuild.props @@ -6,18 +6,12 @@ false - - - - - - + Command="./eng/scripts/prepare-sourcebuild-globaljson.sh" + WorkingDirectory="$(InnerSourceBuildRepoRoot)" />