diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 447d17d5160111..91fb6a7197a53f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22101.2", + "version": "1.0.0-prerelease.22104.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92252a1296afd1..63cb52fc1bb17b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,258 +1,258 @@ - + https://github.com/dotnet/icu - cd095b0fb4c6f8adca9e44ef17346b3e13a73a7c + b4b40012a3cc997700c4b4118f9ba646aab3d192 https://github.com/dotnet/msquic a7213b4676c1803bb251771291a525482d42e511 - + https://github.com/dotnet/emsdk - 8f6606fae08ffa42b025dc42ebe2eea91db3a242 + 96aa78d8d62904171e1a6cd5fe8fc4742254133f https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - afc9070f64d110ce2bf029a4a624b9dd1c6dbffd + d707b379670052dbb926739c1f060aa11f442f30 - + https://github.com/dotnet/llvm-project - afc9070f64d110ce2bf029a4a624b9dd1c6dbffd + d707b379670052dbb926739c1f060aa11f442f30 - + https://github.com/dotnet/llvm-project - afc9070f64d110ce2bf029a4a624b9dd1c6dbffd + d707b379670052dbb926739c1f060aa11f442f30 - + https://github.com/dotnet/llvm-project - afc9070f64d110ce2bf029a4a624b9dd1c6dbffd + d707b379670052dbb926739c1f060aa11f442f30 - + https://github.com/dotnet/llvm-project - afc9070f64d110ce2bf029a4a624b9dd1c6dbffd + d707b379670052dbb926739c1f060aa11f442f30 - + https://github.com/dotnet/llvm-project - afc9070f64d110ce2bf029a4a624b9dd1c6dbffd + d707b379670052dbb926739c1f060aa11f442f30 - + https://github.com/dotnet/llvm-project - afc9070f64d110ce2bf029a4a624b9dd1c6dbffd + d707b379670052dbb926739c1f060aa11f442f30 - + https://github.com/dotnet/llvm-project - afc9070f64d110ce2bf029a4a624b9dd1c6dbffd + d707b379670052dbb926739c1f060aa11f442f30 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e - + https://github.com/dotnet/llvm-project - 20080e62c2ea6ed059be57b88268dd8cd28604e6 + 7384a32eadebf377a99fc251687285055391609e - + https://github.com/dotnet/llvm-project - 20080e62c2ea6ed059be57b88268dd8cd28604e6 + 7384a32eadebf377a99fc251687285055391609e - + https://github.com/dotnet/llvm-project - 20080e62c2ea6ed059be57b88268dd8cd28604e6 + 7384a32eadebf377a99fc251687285055391609e - + https://github.com/dotnet/llvm-project - 20080e62c2ea6ed059be57b88268dd8cd28604e6 + 7384a32eadebf377a99fc251687285055391609e - + https://github.com/dotnet/llvm-project - 20080e62c2ea6ed059be57b88268dd8cd28604e6 + 7384a32eadebf377a99fc251687285055391609e - + https://github.com/dotnet/llvm-project - 20080e62c2ea6ed059be57b88268dd8cd28604e6 + 7384a32eadebf377a99fc251687285055391609e - + https://github.com/dotnet/llvm-project - 20080e62c2ea6ed059be57b88268dd8cd28604e6 + 7384a32eadebf377a99fc251687285055391609e - + https://github.com/dotnet/llvm-project - 20080e62c2ea6ed059be57b88268dd8cd28604e6 + 7384a32eadebf377a99fc251687285055391609e - + https://github.com/dotnet/runtime - bc6d349ecd72eec162f0532e6b6218fdbaa07ddb + 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 - + https://github.com/dotnet/runtime - bc6d349ecd72eec162f0532e6b6218fdbaa07ddb + 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 - + https://github.com/dotnet/runtime - bc6d349ecd72eec162f0532e6b6218fdbaa07ddb + 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 - + https://github.com/dotnet/runtime - bc6d349ecd72eec162f0532e6b6218fdbaa07ddb + 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 - + https://github.com/dotnet/runtime - bc6d349ecd72eec162f0532e6b6218fdbaa07ddb + 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 - + https://github.com/dotnet/runtime - bc6d349ecd72eec162f0532e6b6218fdbaa07ddb + 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 - + https://github.com/dotnet/runtime - bc6d349ecd72eec162f0532e6b6218fdbaa07ddb + 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 - + https://github.com/dotnet/runtime - bc6d349ecd72eec162f0532e6b6218fdbaa07ddb + 0ae04e5b33afac1c14a6127df1037f83d39a6ec3 https://github.com/dotnet/linker 3f704bb49eb2fb2847ceaecfbabe8d5f3e0c86c9 - + https://github.com/dotnet/xharness - 4d24e26939bf0770047cd59299235cf6caa86cdb + 6eee948fc9dbe516e54bff7d420c2881bd3b4eab - + https://github.com/dotnet/xharness - 4d24e26939bf0770047cd59299235cf6caa86cdb + 6eee948fc9dbe516e54bff7d420c2881bd3b4eab - + https://github.com/dotnet/xharness - 4d24e26939bf0770047cd59299235cf6caa86cdb + 6eee948fc9dbe516e54bff7d420c2881bd3b4eab - + https://github.com/dotnet/arcade - 4d6406fa2e84c8516a338694be3a4097e6e1f104 + 70831f0d126fe88b81d7dc8de11358e17a5ce364 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -270,13 +270,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization 47c55c3cf08885d691aa9d581d40310fe448c1ea - + https://github.com/dotnet/hotreload-utils - 3d4988f053ae6b9803e76687b02fee3f8a83156c + 37a4525cca58eb3301a69b4fdc8849d6a6329d0a - + https://github.com/dotnet/runtime-assets - 8813c6d9e73b5cb0b4ccf4c0b8c609ad344636a7 + 742afe55335a20674d063a5bfbbbef8ccc056c0e https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 133782fee457c9..7dfb08a927c66d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,39 +54,39 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 2.5.1-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22102.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 - 7.0.0-beta.22080.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 2.5.1-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 + 7.0.0-beta.22103.1 6.0.0-preview.1.102 - 7.0.0-preview.2.22080.2 - 7.0.0-preview.2.22080.2 - 7.0.0-preview.2.22080.2 + 7.0.0-preview.2.22103.2 + 7.0.0-preview.2.22103.2 + 7.0.0-preview.2.22103.2 3.1.0 - 7.0.0-preview.2.22080.2 - 1.0.0-alpha.1.22073.1 - 1.0.0-alpha.1.22073.1 - 1.0.0-alpha.1.22073.1 - 1.0.0-alpha.1.22073.1 - 1.0.0-alpha.1.22073.1 - 1.0.0-alpha.1.22073.1 - 1.0.0-alpha.1.22073.1 - 1.0.0-alpha.1.22073.1 + 7.0.0-preview.2.22103.2 + 1.0.0-alpha.1.22104.2 + 1.0.0-alpha.1.22104.2 + 1.0.0-alpha.1.22104.2 + 1.0.0-alpha.1.22104.2 + 1.0.0-alpha.1.22104.2 + 1.0.0-alpha.1.22104.2 + 1.0.0-alpha.1.22104.2 + 1.0.0-alpha.1.22104.2 5.0.0 4.3.0 @@ -121,24 +121,24 @@ 5.0.0 5.0.0 4.9.0-rc2.21473.1 - 7.0.0-preview.2.22080.2 - 7.0.0-preview.2.22080.2 + 7.0.0-preview.2.22103.2 + 7.0.0-preview.2.22103.2 4.5.4 4.5.0 - 7.0.0-preview.2.22080.2 + 7.0.0-preview.2.22103.2 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 - 7.0.0-beta.22075.1 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 + 7.0.0-beta.22103.2 1.0.0-prerelease.22078.3 1.0.0-prerelease.22078.3 @@ -161,10 +161,10 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22101.2 - 1.0.0-prerelease.22101.2 - 1.0.0-prerelease.22101.2 - 1.0.2-alpha.0.22081.2 + 1.0.0-prerelease.22104.1 + 1.0.0-prerelease.22104.1 + 1.0.0-prerelease.22104.1 + 1.0.2-alpha.0.22103.1 2.4.2-pre.22 0.12.0-pre.20 2.4.2 @@ -181,20 +181,20 @@ 7.0.100-1.22081.3 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.2.22101.1 + 7.0.0-preview.2.22103.1 7.0.0-alpha.1.21529.3 - 11.1.0-alpha.1.22081.2 - 11.1.0-alpha.1.22081.2 - 11.1.0-alpha.1.22081.2 - 11.1.0-alpha.1.22081.2 - 11.1.0-alpha.1.22081.2 - 11.1.0-alpha.1.22081.2 - 11.1.0-alpha.1.22081.2 - 11.1.0-alpha.1.22081.2 + 11.1.0-alpha.1.22103.3 + 11.1.0-alpha.1.22103.3 + 11.1.0-alpha.1.22103.3 + 11.1.0-alpha.1.22103.3 + 11.1.0-alpha.1.22103.3 + 11.1.0-alpha.1.22103.3 + 11.1.0-alpha.1.22103.3 + 11.1.0-alpha.1.22103.3 - 7.0.0-alpha.2.22102.3 + 7.0.0-alpha.2.22104.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index c5c2a9915121b3..92e98af7ebd5c7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -140,6 +140,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: - task: ComponentGovernanceComponentDetection@0 + continueOnError: true - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index d85d6d07d5c7b0..12a8ff94d8e960 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -43,8 +43,8 @@ steps: # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= - if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)' + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index cdc6966b29227b..1ba0c7ba8b5d4b 100644 --- a/global.json +++ b/global.json @@ -12,11 +12,11 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22080.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22103.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22103.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22103.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", - "Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22080.2" + "Microsoft.NET.Sdk.IL": "7.0.0-preview.2.22103.2" } }