diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index b0ca8df7b5fef8e7337ec726611c1b6137fb34db..37cc0681fbf9dbed16097e489c7e9bbb743b7969 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
- "version": "1.0.0-prerelease.21370.1",
+ "version": "1.0.0-prerelease.21373.1",
"commands": [
"xharness"
]
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 05e276bfa18d911130c2ec39e9ca5ca431cdb123..57e52dc79db2beee2a9a4c88709a887df7b9de43 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,79 +8,79 @@
https://github.com/dotnet/msquic
d7db669b70f4dd67ec001c192f9809c218cab88b
-
+
https://github.com/dotnet/emsdk
- 70549df51ec4b2561e2d11caa542e0b2a2903e0a
+ 7a7664b07a1625bc1682e0735019178e69fcfbec
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 6224d1b573b73caaa84176bd83dabe75f202cdc7
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
https://github.com/microsoft/vstest
@@ -158,65 +158,65 @@
https://github.com/dotnet/runtime
38017c3935de95d0335bac04f4901ddfc2718656
-
+
https://github.com/dotnet/runtime
- f7e4c261815c66fde2c1e750b744f193e236c17e
+ 95863758cd16c345d0b8fca067d5db5d6901e498
-
+
https://github.com/dotnet/runtime
- f7e4c261815c66fde2c1e750b744f193e236c17e
+ 95863758cd16c345d0b8fca067d5db5d6901e498
-
+
https://github.com/dotnet/runtime
- f7e4c261815c66fde2c1e750b744f193e236c17e
+ 95863758cd16c345d0b8fca067d5db5d6901e498
-
+
https://github.com/dotnet/runtime
- f7e4c261815c66fde2c1e750b744f193e236c17e
+ 95863758cd16c345d0b8fca067d5db5d6901e498
-
+
https://github.com/dotnet/runtime
- f7e4c261815c66fde2c1e750b744f193e236c17e
+ 95863758cd16c345d0b8fca067d5db5d6901e498
-
+
https://github.com/dotnet/runtime
- f7e4c261815c66fde2c1e750b744f193e236c17e
+ 95863758cd16c345d0b8fca067d5db5d6901e498
-
+
https://github.com/dotnet/runtime
- f7e4c261815c66fde2c1e750b744f193e236c17e
+ 95863758cd16c345d0b8fca067d5db5d6901e498
https://github.com/mono/linker
0cb9250a903cfc90cbac602ed79c0cbc588d8d3f
-
+
https://github.com/dotnet/xharness
- aa0da55569eaa42c2c735dd89abd2843fba4fe01
+ ccb49ae05b6d98b29871a1779408d4579e16d6e5
-
+
https://github.com/dotnet/xharness
- aa0da55569eaa42c2c735dd89abd2843fba4fe01
+ ccb49ae05b6d98b29871a1779408d4579e16d6e5
-
+
https://github.com/dotnet/arcade
- 89806f0b9e93ad2bbe32c654412835c0801a2032
+ c6a28c81f96d196338b3ea520bc1e6dc7c440ee2
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 2e172488a9ee56619a08c8303a708e69dc82503e
+ f8742ac0820e98221e7eec5f13989d9538579399
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 2e172488a9ee56619a08c8303a708e69dc82503e
+ f8742ac0820e98221e7eec5f13989d9538579399
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 2e172488a9ee56619a08c8303a708e69dc82503e
+ f8742ac0820e98221e7eec5f13989d9538579399
-
+
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
- 2e172488a9ee56619a08c8303a708e69dc82503e
+ f8742ac0820e98221e7eec5f13989d9538579399
https://github.com/dotnet/hotreload-utils
@@ -226,9 +226,9 @@
https://github.com/dotnet/runtime-assets
bcfd1993de3767c54c6d8a522bf63770fba3c98d
-
+
https://github.com/dotnet/roslyn-analyzers
- 7e82240306d8a7a83ebbbc1894381393cebf9fb2
+ 19af44783ceecc31842d7028e3b0ce83095ea166
diff --git a/eng/Versions.props b/eng/Versions.props
index b13cc449379c0930f50ed2ee77f2a20971285f5b..b03ef6f33987fb5a72f62424c1e3c8a8efdd0f62 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -50,31 +50,31 @@
3.10.0
3.10.0
- 6.0.0-rc1.21366.2
+ 6.0.0-rc1.21375.2
- 6.0.0-beta.21370.12
- 6.0.0-beta.21370.12
- 6.0.0-beta.21370.12
- 6.0.0-beta.21370.12
- 6.0.0-beta.21370.12
- 6.0.0-beta.21370.12
- 2.5.1-beta.21370.12
- 6.0.0-beta.21370.12
- 6.0.0-beta.21370.12
- 6.0.0-beta.21370.12
- 6.0.0-beta.21372.16
- 6.0.0-beta.21370.12
- 6.0.0-beta.21370.12
- 6.0.0-beta.21370.12
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 2.5.1-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
+ 6.0.0-beta.21373.11
6.0.0-preview.1.102
6.0.0-alpha.1.20612.4
- 6.0.0-rc.1.21369.2
- 6.0.0-rc.1.21369.2
+ 6.0.0-rc.1.21375.2
+ 6.0.0-rc.1.21375.2
3.1.0
- 6.0.0-rc.1.21369.2
+ 6.0.0-rc.1.21375.2
5.0.0
4.3.0
@@ -108,11 +108,11 @@
5.0.0
5.0.0
4.8.1
- 6.0.0-rc.1.21369.2
- 6.0.0-rc.1.21369.2
+ 6.0.0-rc.1.21375.2
+ 6.0.0-rc.1.21375.2
4.5.4
4.5.0
- 6.0.0-rc.1.21369.2
+ 6.0.0-rc.1.21375.2
6.0.0-beta.21371.1
6.0.0-beta.21371.1
@@ -125,10 +125,10 @@
6.0.0-beta.21371.1
6.0.0-beta.21371.1
- 1.0.0-prerelease.21371.3
- 1.0.0-prerelease.21371.3
- 1.0.0-prerelease.21371.3
- 1.0.0-prerelease.21371.3
+ 1.0.0-prerelease.21374.3
+ 1.0.0-prerelease.21374.3
+ 1.0.0-prerelease.21374.3
+ 1.0.0-prerelease.21374.3
16.9.0-beta1.21055.5
2.0.0-beta1.20253.1
@@ -152,8 +152,8 @@
1.0.1-prerelease-00006
16.9.0-preview-20201201-01
- 1.0.0-prerelease.21370.1
- 1.0.0-prerelease.21370.1
+ 1.0.0-prerelease.21373.1
+ 1.0.0-prerelease.21373.1
1.0.1-alpha.0.21369.1
2.4.1
2.4.2
@@ -182,7 +182,7 @@
11.1.0-alpha.1.21369.1
11.1.0-alpha.1.21369.1
- 6.0.0-rc.1.21369.1
+ 6.0.0-rc.1.21376.4
$(MicrosoftNETWorkloadEmscriptenManifest60100Version)
1.1.87-gba258badda
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
index e20637ed6a177d087ac555f78e85dcb1429de9ca..705b7a1c847b99181f67b0757f326b158899dc59 100644
--- a/eng/common/templates/steps/source-build.yml
+++ b/eng/common/templates/steps/source-build.yml
@@ -29,6 +29,11 @@ steps:
officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)'
fi
+ internalRuntimeDownloadArgs=
+ if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
+ internalRuntimeDownloadArgs='--runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
+ fi
+
targetRidArgs=
if [ '${{ parameters.platform.targetRID }}' != '' ]; then
targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}'
@@ -43,6 +48,7 @@ steps:
--configuration $buildConfig \
--restore --build --pack $publishArgs -bl \
$officialBuildArgs \
+ $internalRuntimeDownloadArgs \
$targetRidArgs \
/p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \
/p:ArcadeBuildFromSource=true
diff --git a/global.json b/global.json
index 18f1604a2e5cd511ab1ecd1b0dc07f4ac5aa1977..ad51e8c2d4275cbe9e535255ca2c840f3ba38cef 100644
--- a/global.json
+++ b/global.json
@@ -12,13 +12,13 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21370.12",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21373.11",
"Microsoft.DotNet.PackageValidation": "1.0.0-preview.7.21352.4",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21370.12",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21370.12",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21370.12",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21373.11",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21373.11",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21373.11",
"Microsoft.Build.NoTargets": "3.0.4",
"Microsoft.Build.Traversal": "3.0.23",
- "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21369.2"
+ "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21375.2"
}
}