From 1a23773b46cd373bf7b2881cc0b9cb2fe261ecc8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Nov 2021 13:12:44 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/arcade build 20211123.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21573.3 --- eng/Version.Details.xml | 8 ++++---- eng/common/build.sh | 4 ---- eng/common/native/init-compiler.sh | 2 +- eng/common/sdk-task.ps1 | 3 --- eng/common/templates/job/job.yml | 1 + eng/common/tools.ps1 | 21 --------------------- eng/common/tools.sh | 7 ------- global.json | 6 +++--- 8 files changed, 9 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e15469012e2bc..18fdd37052e3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 https://github.com/dotnet/roslyn b65e75b2a80d3418a3e32de32345ce250eb5d450 - + https://github.com/dotnet/arcade - 97463777ee9a8445d4a4c5911ede0f0cd71fa8aa + 927f8d4d5036f68a5fc6d042f336bc9458027208 diff --git a/eng/common/build.sh b/eng/common/build.sh index bc07a1c684824..55b298f16ccd1 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -187,10 +187,6 @@ function InitializeCustomToolset { } function Build { - - if [[ "$ci" == true ]]; then - TryLogClientIpAddress - fi InitializeToolset InitializeCustomToolset diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 8c944f30b2864..03a996062a796 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -112,7 +112,7 @@ if [[ -z "$CC" ]]; then fi if [[ "$compiler" == "clang" ]]; then - if command -v "lld$desired_version" > /dev/null; then + if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then # Only lld version >= 9 can be considered stable if [[ "$majorVersion" -ge 9 ]]; then LDFLAGS="-fuse-ld=lld" diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 7ab9baac5c8d9..b1bca63ab1d82 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -83,9 +83,6 @@ try { } if ($restore) { - if ($ci) { - Try-LogClientIpAddress - } Build 'Restore' } diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 37dceb1bab0a9..7678b94ce740c 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -114,6 +114,7 @@ jobs: continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@0 - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 90b1f9fdcdb19..f1e1cb53953bc 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Disable telemetry on CI. if ($ci) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 - - # In case of network error, try to log the current IP for reference - Try-LogClientIpAddress } # Source Build uses DotNetCoreSdkDir variable @@ -895,24 +892,6 @@ if (!$disableConfigureToolsetImport) { } } -function Try-LogClientIpAddress() -{ - Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" - try - { - $result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing - $lines = $result.Content.Split([Environment]::NewLine) - $socketIp = $lines | Select-String -Pattern "^Socket IP:.*" - Write-Host $socketIp - $clientIp = $lines | Select-String -Pattern "^Client IP:.*" - Write-Host $clientIp - } - catch - { - Write-Host "Unable to get this machine's effective IP address for logging: $_" - } -} - # # If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic. # diff --git a/eng/common/tools.sh b/eng/common/tools.sh index dd7030ff5385e..e555c34269f6e 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -405,13 +405,6 @@ function StopProcesses { return 0 } -function TryLogClientIpAddress () { - echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' - if command -v curl > /dev/null; then - curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true - fi -} - function MSBuild { local args=$@ if [[ "$pipelines_log" == true ]]; then diff --git a/global.json b/global.json index 518435683bbcd..135e0e2d654df 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.10.0-preview2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21569.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21569.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3" } -} \ No newline at end of file +} From e00430113ad621fea7ef0a0b987fd95536f554f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Nov 2021 13:11:47 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/arcade build 20211124.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21574.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18fdd37052e3b..21335da1112a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb https://github.com/dotnet/roslyn b65e75b2a80d3418a3e32de32345ce250eb5d450 - + https://github.com/dotnet/arcade - 927f8d4d5036f68a5fc6d042f336bc9458027208 + 11fb2931671a47924e29b92e5fe06043fb3c6bbb diff --git a/global.json b/global.json index 135e0e2d654df..b44bb1037b63a 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.10.0-preview2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21573.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21574.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21574.3" } } From 2ed86865f58cc69483ed8ba1ee341e5091d7af32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Nov 2021 13:13:16 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/arcade build 20211126.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21576.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/native/init-compiler.sh | 10 ++++------ global.json | 4 ++-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21335da1112a2..bc0a832604ca7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea https://github.com/dotnet/roslyn b65e75b2a80d3418a3e32de32345ce250eb5d450 - + https://github.com/dotnet/arcade - 11fb2931671a47924e29b92e5fe06043fb3c6bbb + 9c578f701e92c055ed752c3869a0f36c60630cea diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 03a996062a796..fd1d080e20435 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -111,12 +111,10 @@ if [[ -z "$CC" ]]; then exit 1 fi -if [[ "$compiler" == "clang" ]]; then - if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then - # Only lld version >= 9 can be considered stable - if [[ "$majorVersion" -ge 9 ]]; then - LDFLAGS="-fuse-ld=lld" - fi +# Only lld version >= 9 can be considered stable +if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then + if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then + LDFLAGS="-fuse-ld=lld" fi fi diff --git a/global.json b/global.json index b44bb1037b63a..813759b425f87 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.10.0-preview2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21574.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21574.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.2" } } From 4fac530a52aeb0c7d460b1243d2dd9bd58a383c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Nov 2021 13:10:37 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/arcade build 20211126.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21576.4 --- eng/Version.Details.xml | 8 ++++---- eng/common/native/init-compiler.sh | 3 ++- global.json | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc0a832604ca7..50130fb2a19ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 https://github.com/dotnet/roslyn b65e75b2a80d3418a3e32de32345ce250eb5d450 - + https://github.com/dotnet/arcade - 9c578f701e92c055ed752c3869a0f36c60630cea + 427c05909067bb2e484116ae2239456bb45adb85 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index fd1d080e20435..e361e03fabdd2 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -2,6 +2,7 @@ # # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # +# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! if [[ "$#" -lt 3 ]]; then echo "Usage..." @@ -113,7 +114,7 @@ fi # Only lld version >= 9 can be considered stable if [[ "$compiler" == "clang" && "$majorVersion" -ge 9 ]]; then - if "$CC" -fuse-ld=lld -Wl,--version 2>/dev/null; then + if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then LDFLAGS="-fuse-ld=lld" fi fi diff --git a/global.json b/global.json index 813759b425f87..3960ed57eddd5 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.10.0-preview2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4" } } From 8afe87c2dedf1250ead549346b68ec5300f76b8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Dec 2021 13:12:41 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/arcade build 20211202.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21602.3 --- eng/Version.Details.xml | 8 ++++---- eng/common/sdl/packages.config | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/tools.sh | 2 +- global.json | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50130fb2a19ef..f205688017f0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd https://github.com/dotnet/roslyn b65e75b2a80d3418a3e32de32345ce250eb5d450 - + https://github.com/dotnet/arcade - 427c05909067bb2e484116ae2239456bb45adb85 + 59775387deb609d7c62f9e713d133c34ba28ffcd diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 3bd8b29ebd721..4585cfd6bba1e 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 3aafc82e4171a..8128f2c357052 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in # sync with the packages.config file. - name: DefaultGuardianVersion - value: 0.53.3 + value: 0.109.0 - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - name: GuardianPackagesConfigFile diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e555c34269f6e..17f0a365805d5 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -178,7 +178,7 @@ function InstallDotNetSdk { if [[ $# -ge 3 ]]; then architecture=$3 fi - InstallDotNet "$root" "$version" $architecture 'sdk' 'false' $runtime_source_feed $runtime_source_feed_key + InstallDotNet "$root" "$version" $architecture 'sdk' 'true' $runtime_source_feed $runtime_source_feed_key } function InstallDotNet { diff --git a/global.json b/global.json index 3960ed57eddd5..f74139efc66b9 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.10.0-preview2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21576.4", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21576.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21602.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21602.3" } } From 80c25ff29302a83ce7dbded0904c41f8fc269dff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Dec 2021 13:12:35 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/arcade build 20211203.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.21569.2 -> To Version 7.0.0-beta.21603.6 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f205688017f0b..422ae397e79a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -13,18 +13,18 @@ - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 https://github.com/dotnet/roslyn b65e75b2a80d3418a3e32de32345ce250eb5d450 - + https://github.com/dotnet/arcade - 59775387deb609d7c62f9e713d133c34ba28ffcd + b3e949192067c8acdaaae35015534f76e92d79d4 diff --git a/global.json b/global.json index f74139efc66b9..14aa2fe8b0e09 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "xcopy-msbuild": "16.10.0-preview2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21602.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21602.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21603.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21603.6" } }