From 47bad06eff5914106c84fce88ec04f709b2e7a5d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 21 Mar 2023 09:27:37 -0700 Subject: [PATCH 1/7] First pass at source build pre-built detection A first pass at source built prebuilt detection. Currently depends on: - An arcade update that is still in flight (https://github.com/dotnet/sdk/pull/30845) - Workaround of a p1 roslyn-analzyers bug (fixed in p3 supposedly) Enable pre-built detection, without being completely clean. Add dependencies and enable source-build elements where needed. There are a variety of prebuilts that need additional investigation. Likely they will either be SBRPs, upgraded, or perhaps permanantly excluded from detection (e.g. Microsoft.NETCore.App.Ref 6.0 packages). --- Directory.Build.props | 3 + eng/SourceBuildPrebuiltBaseline.xml | 64 +++++++++- eng/Version.Details.xml | 34 +++-- eng/Versions.props | 6 +- eng/common/cross/build-rootfs.sh | 120 ++++++++++-------- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 3810 -> 3842 bytes eng/common/templates/job/job.yml | 2 +- .../templates/job/source-index-stage1.yml | 2 +- eng/common/tools.ps1 | 14 +- global.json | 6 +- 10 files changed, 172 insertions(+), 79 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 01df765884d4..12d6e4548d04 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -23,6 +23,9 @@ $(NoWarn);NU1701 + + $(NoWarn);CA2009 true true diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index c1b6dfbf0538..f7d6a5008ae4 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -1,5 +1,67 @@ - + + + + + + + + + + + + + + + + + + + + + \ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9e13ed556f7..f9afa588d9d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,6 +13,7 @@ https://github.com/dotnet/runtime 7b651743dc951384f6c3d8455c88518022c7c3b9 + https://github.com/dotnet/runtime @@ -45,6 +46,7 @@ https://github.com/dotnet/msbuild 60ea2f733cfcc78da965ab43cf040fe5c58800fb + https://github.com/dotnet/msbuild @@ -62,7 +64,7 @@ https://github.com/dotnet/format 0b968051beac5d7c1a62a52aee7fbbbb47dc1f47 - + https://github.com/dotnet/roslyn @@ -255,6 +257,11 @@ dcd0eca339b5c64b5816c111f583c82062ce4c74 + + https://github.com/dotnet/source-build-reference-packages + e2279a0388f89a1f771ff7e4ded01f0e657bcafb + + https://github.com/dotnet/deployment-tools b60c95e1ce736630d17e16626c59e3dd85ebae2b @@ -268,30 +275,35 @@ - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + a1359bf50fe84f9b1cd01d611c9186820126df9b - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + a1359bf50fe84f9b1cd01d611c9186820126df9b - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + a1359bf50fe84f9b1cd01d611c9186820126df9b - + https://github.com/dotnet/arcade - c4a85adbff520f62bfade7a6132f471506c3d35a + a1359bf50fe84f9b1cd01d611c9186820126df9b + + + https://github.com/dotnet/sourcelink + 3f43bf1b2dead2cb51f20dc47f6dfd7981248820 + https://github.com/dotnet/runtime 7b651743dc951384f6c3d8455c88518022c7c3b9 - + https://github.com/dotnet/xliff-tasks - 69157952aba0f08738249af4454b045b553614c4 + b7fb98b199d0b1b6188da4f4bf4f5accddac98d4 diff --git a/eng/Versions.props b/eng/Versions.props index 0bc68fa690d4..041f617c9b98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -32,7 +32,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.23120.1 + 8.0.0-beta.23166.5 7.0.0-preview.22423.2 8.0.0-preview.3.23170.14 4.3.0 @@ -172,7 +172,7 @@ - 1.0.0-beta.23116.1 + 1.0.0-beta.23165.1 @@ -182,7 +182,7 @@ 6.10.0 6.1.0 - 8.0.0-beta.23120.1 + 8.0.0-beta.23166.5 4.8.2 1.3.2 6.0.0-beta.22262.1 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ffaa88eb0f06..ff113f733532 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -55,7 +55,7 @@ __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" -__AlpinePackages+=" compiler-rt-static" +__AlpinePackages+=" compiler-rt" __AlpinePackages+=" numactl-dev" # runtime libraries' dependencies @@ -150,7 +150,6 @@ while :; do __BuildArch=riscv64 __AlpineArch=riscv64 __AlpinePackages="${__AlpinePackages// lldb-dev/}" - __AlpinePackages="${__AlpinePackages// compiler-rt-static/}" __QEMUArch=riscv64 __UbuntuArch=riscv64 __UbuntuRepo="http://deb.debian.org/debian-ports" @@ -160,10 +159,6 @@ while :; do if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring" fi - - if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then - __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) - fi ;; ppc64le) __BuildArch=ppc64le @@ -175,10 +170,6 @@ while :; do __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package - - if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then - __AlpineVersion=3.15 # minimum version that supports compiler-rt - fi ;; s390x) __BuildArch=s390x @@ -190,10 +181,6 @@ while :; do __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" __UbuntuPackages="${__UbuntuPackages// libomp5/}" unset __LLDB_Package - - if [[ "$version" != "edge" && ( -z "$__AlpineVersion" || -z "$__AlpineMajorVersion" )]]; then - __AlpineVersion=3.15 # minimum version that supports compiler-rt - fi ;; x64) __BuildArch=x64 @@ -206,6 +193,7 @@ while :; do x86) __BuildArch=x86 __UbuntuArch=i386 + __AlpineArch=x86 __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; lldb*) @@ -260,25 +248,40 @@ while :; do ;; jessie) # Debian 8 __CodeName=jessie - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; stretch) # Debian 9 __CodeName=stretch - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; buster) # Debian 10 __CodeName=buster - __UbuntuRepo="http://ftp.debian.org/debian/" __LLDB_Package="liblldb-6.0-dev" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; bullseye) # Debian 11 __CodeName=bullseye - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; sid) # Debian sid __CodeName=sid - __UbuntuRepo="http://ftp.debian.org/debian/" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi ;; tizen) __CodeName= @@ -296,29 +299,8 @@ while :; do parts=(${version//./ }) __AlpineMajorVersion="${parts[0]}" __AlpineMinoVersion="${parts[1]}" - - if [[ -z "$__AlpineVersion" ]]; then - __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" - fi + __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" fi - - case "$__AlpineVersion" in - 3.14) __AlpinePackages+=" llvm11-libs" ;; - 3.15) __AlpinePackages+=" llvm12-libs" ;; - 3.16) __AlpinePackages+=" llvm13-libs" ;; - 3.17) __AlpinePackages+=" llvm15-libs" ;; - edge) __AlpineLlvmLibsLookup=1 ;; - *) - if [[ "$__AlpineArch" =~ "s390x|ppc64le" ]]; then - __AlpineVersion=3.15 # minimum version that supports compiler-rt - __AlpinePackages+=" llvm12-libs" - elif [[ "$__AlpineArch" == "riscv64" ]]; then - __AlpineLlvmLibsLookup=1 - __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) - else - __AlpineVersion=3.13 # 3.13 to maximize compatibility - fi - esac ;; freebsd12) __CodeName=freebsd @@ -361,10 +343,41 @@ while :; do shift done +case "$__AlpineVersion" in + 3.14) __AlpinePackages+=" llvm11-libs" ;; + 3.15) __AlpinePackages+=" llvm12-libs" ;; + 3.16) __AlpinePackages+=" llvm13-libs" ;; + 3.17) __AlpinePackages+=" llvm15-libs" ;; + edge) __AlpineLlvmLibsLookup=1 ;; + *) + if [[ "$__AlpineArch" =~ s390x|ppc64le ]]; then + echo boo + __AlpineVersion=3.15 # minimum version that supports lldb-dev + __AlpinePackages+=" llvm12-libs" + elif [[ "$__AlpineArch" == "x86" ]]; then + __AlpineVersion=3.17 # minimum version that supports lldb-dev + __AlpinePackages+=" llvm15-libs" + elif [[ "$__AlpineArch" == "riscv64" ]]; then + __AlpineLlvmLibsLookup=1 + __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) + else + __AlpineVersion=3.13 # 3.13 to maximize compatibility + __AlpinePackages+=" llvm10-libs" + + if [[ "$__AlpineArch" == "armv7" ]]; then + __AlpinePackages="${__AlpinePackages//numactl-dev/}" + fi + fi +esac + +if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then + # compiler-rt--static was merged in compiler-rt package in alpine 3.16 + # for older versions, we need compiler-rt--static, so replace the name + __AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}" +fi + if [[ "$__BuildArch" == "armel" ]]; then __LLDB_Package="lldb-3.5-dev" -elif [[ "$__BuildArch" == "arm" && "$__AlpineVersion" == "3.13" ]]; then - __AlpinePackages="${__AlpinePackages//numactl-dev/}" fi __UbuntuPackages+=" ${__LLDB_Package:-}" @@ -407,26 +420,27 @@ if [[ "$__CodeName" == "alpine" ]]; then version="v$__AlpineVersion" fi + # initialize DB "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb \ - add $__AlpinePackages + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then - "$__ApkToolsDir/apk.static" \ + __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ - search 'llvm*-libs' | sort | tail -1 | while IFS=- read name rest; do - "$__ApkToolsDir/apk.static" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ - -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ - add "$name-libs" - done + search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')" fi + # install all packages in one go + "$__ApkToolsDir/apk.static" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ + -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ + -U --allow-untrusted --root "$__RootfsDir" --arch "$__AlpineArch" \ + add $__AlpinePackages + rm -r "$__ApkToolsDir" elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p "$__RootfsDir"/usr/local/etc diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss index 6661fed566e49b0c206665bc21f135e06c9b89c4..858a0b237c62ce4f2ee12aa14794f160f6b122b7 100644 GIT binary patch delta 274 zcmaDP+a$;Ke*az|n#iQX$U9L_gN>JqL4iSGqQ3ORGAW?Q1Qjlb2!joS{zOAbi0B6! zCSI<|ip=VhLl{FCc_;TV>rD1wb_28WKvIp|l9MO!aluqwVe-JE3Mi$(QiGy^k2Qyp zcXJgh2O}fzByO?EbC~%yFJp^h0r5&8LVSE82)RSthrlX5CZFL2dIY2eC=as!FRvoZ VC5(KsFeZ}w7+K^&o(6kQ830GCL398B delta 289 zcmZpYdnC*B|KCJ59Y(H+iP97Oc_zkKO`NVWagPln*JOPr<;k*)5sCa-6G z0Wy(Sbn`m43>Gj`eDVTrmdU$#btcDi1KkdioE*R>0M!WMtz(ne{FHkKBZ~3}45bsf c6(=X~aZS$V(*VjreBsR}4-AfjvJ?He0GoYJrT_o{ diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 61914a1fbcd3..b214a31db236 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -101,7 +101,7 @@ jobs: # handle key-value variable syntax. # example: # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, '')) }}: + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: - ${{ each pair in variable }}: - name: ${{ pair.key }} value: ${{ pair.value }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 71b66aeb8a5c..b98202aa02d8 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20221220.2 + sourceIndexPackageVersion: 1.0.1-20230228.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 7caacc6de2e1..8ad03be3eccb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -913,11 +913,13 @@ if (!$disableConfigureToolsetImport) { function Enable-Nuget-EnhancedRetry() { if ($ci) { Write-Host "Setting NUGET enhanced retry environment variables" - $env:NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY = 'true' - $env:NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT = 6 - $env:NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 - Write-PipelineSetVariable -Name 'NUGET_ENABLE_EXPERIMENTAL_HTTP_RETRY' -Value 'true' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_MAX_NETWORK_TRY_COUNT' -Value '6' - Write-PipelineSetVariable -Name 'NUGET_EXPERIMENTAL_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' + $env:NUGET_ENABLE_ENHANCED_HTTP_RETRY = 'true' + $env:NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT = 6 + $env:NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS = 1000 + $env:NUGET_RETRY_HTTP_429 = 'true' + Write-PipelineSetVariable -Name 'NUGET_ENABLE_ENHANCED_HTTP_RETRY' -Value 'true' + Write-PipelineSetVariable -Name 'NUGET_ENHANCED_MAX_NETWORK_TRY_COUNT' -Value '6' + Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' + Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } } diff --git a/global.json b/global.json index 3c209918bf48..6fba748622a0 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-alpha.1.23067.5", + "dotnet": "8.0.100-preview.3.23158.2", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23120.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23120.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23166.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23166.5" } } From 32aa8ac2b88a7a3dc065c00c8b130429bb652685 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 28 Mar 2023 09:03:38 -0700 Subject: [PATCH 2/7] Revert changes --- eng/common/loc/P22DotNetHtmlLocalization.lss | Bin 3842 -> 3810 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss index 858a0b237c62ce4f2ee12aa14794f160f6b122b7..6661fed566e49b0c206665bc21f135e06c9b89c4 100644 GIT binary patch delta 289 zcmZpYdnC*B|KCJ59Y(H+iP97Oc_zkKO`NVWagPln*JOPr<;k*)5sCa-6G z0Wy(Sbn`m43>Gj`eDVTrmdU$#btcDi1KkdioE*R>0M!WMtz(ne{FHkKBZ~3}45bsf c6(=X~aZS$V(*VjreBsR}4-AfjvJ?He0GoYJrT_o{ delta 274 zcmaDP+a$;Ke*az|n#iQX$U9L_gN>JqL4iSGqQ3ORGAW?Q1Qjlb2!joS{zOAbi0B6! zCSI<|ip=VhLl{FCc_;TV>rD1wb_28WKvIp|l9MO!aluqwVe-JE3Mi$(QiGy^k2Qyp zcXJgh2O}fzByO?EbC~%yFJp^h0r5&8LVSE82)RSthrlX5CZFL2dIY2eC=as!FRvoZ VC5(KsFeZ}w7+K^&o(6kQ830GCL398B From 5ab26544aae537551106e86b9d901eb0537bd283 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 28 Mar 2023 09:21:06 -0700 Subject: [PATCH 3/7] Re-add source link deps --- eng/Version.Details.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cbecad151a5..6ddb0a2e669d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -280,6 +280,11 @@ 1177b37e60c7271ab461098aefbdd03edc15b90d + + https://github.com/dotnet/sourcelink + a86ac5afc76f4afbd3dd59029a00857cc3eeb6e3 + + https://github.com/dotnet/arcade 1177b37e60c7271ab461098aefbdd03edc15b90d From 1697e47479e66f1308bc3d262872f5ceb7495196 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 31 Mar 2023 10:27:25 -0700 Subject: [PATCH 4/7] Update coherency --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56fb171d2ff6..91697da9709f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -280,9 +280,9 @@ 747f53d751983dd062f39f4654bff074536e0012 - + https://github.com/dotnet/sourcelink - a86ac5afc76f4afbd3dd59029a00857cc3eeb6e3 + ccfca8dce5f7525433756281c2c275386348a9ad From c942623d5b8988ba3ce70d6a355de572be374e2d Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 31 Mar 2023 10:29:38 -0700 Subject: [PATCH 5/7] Disable ref pack exclusion --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 100d6cf47493..d278382e7c3b 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -13,7 +13,7 @@ - + From 793a1f6526a51aa7516a3d1d93863c30a8c2958e Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 3 Apr 2023 11:32:12 -0700 Subject: [PATCH 6/7] Re-enable ref pack exclusion --- eng/SourceBuildPrebuiltBaseline.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index d278382e7c3b..53c7340f4caa 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -13,7 +13,7 @@ - + From fe1c658596673f2e26264ad41162b23b12018cfc Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 3 Apr 2023 11:33:00 -0700 Subject: [PATCH 7/7] Re-enable razor exclusion --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 53c7340f4caa..080fe4778905 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -10,6 +10,10 @@ https://github.com/microsoft/vstest/pull/4332. --> + + +