diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ac4a73f5afd8d..28440a12df242 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22153.2", + "version": "1.0.0-prerelease.22160.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95194471bb02d..499104b945058 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/icu - 41aaf9cfbb94c2c00fd43da6c70217733280cd59 + 5416401e2e54d6ce9bef7f0c4a5fe25088c42652 - + https://github.com/dotnet/msquic - a7213b4676c1803bb251771291a525482d42e511 + 9e90f006e0f8bb5e596c8e7d3af58976cdebceeb https://github.com/dotnet/emsdk @@ -16,111 +16,111 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - 149a445d7fafd9fa270faeb194e5e617c76f9010 + f17917e8d6a2e3ba069cddeab873554706d502a5 - + https://github.com/dotnet/llvm-project - 149a445d7fafd9fa270faeb194e5e617c76f9010 + f17917e8d6a2e3ba069cddeab873554706d502a5 - + https://github.com/dotnet/llvm-project - 149a445d7fafd9fa270faeb194e5e617c76f9010 + f17917e8d6a2e3ba069cddeab873554706d502a5 - + https://github.com/dotnet/llvm-project - 149a445d7fafd9fa270faeb194e5e617c76f9010 + f17917e8d6a2e3ba069cddeab873554706d502a5 - + https://github.com/dotnet/llvm-project - 149a445d7fafd9fa270faeb194e5e617c76f9010 + f17917e8d6a2e3ba069cddeab873554706d502a5 - + https://github.com/dotnet/llvm-project - 149a445d7fafd9fa270faeb194e5e617c76f9010 + f17917e8d6a2e3ba069cddeab873554706d502a5 - + https://github.com/dotnet/llvm-project - 149a445d7fafd9fa270faeb194e5e617c76f9010 + f17917e8d6a2e3ba069cddeab873554706d502a5 - + https://github.com/dotnet/llvm-project - 149a445d7fafd9fa270faeb194e5e617c76f9010 + f17917e8d6a2e3ba069cddeab873554706d502a5 - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa https://github.com/microsoft/vstest @@ -234,21 +234,21 @@ https://github.com/dotnet/linker 26e0c5cdc29a5a4f541100148b5cb7a814773110 - + https://github.com/dotnet/xharness - f1de706e7c78e2cb37ed95c55282f17b0d1fad32 + 17956df760439a8eedf6acc2ef510a6fe185124a - + https://github.com/dotnet/xharness - f1de706e7c78e2cb37ed95c55282f17b0d1fad32 + 17956df760439a8eedf6acc2ef510a6fe185124a - + https://github.com/dotnet/xharness - f1de706e7c78e2cb37ed95c55282f17b0d1fad32 + 17956df760439a8eedf6acc2ef510a6fe185124a - + https://github.com/dotnet/arcade - 8ed47fcae6a5d2d40483ed81858f4ede8eab7ae2 + 81001b45bd54f9223905bf55f6ed0125273580fa https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -266,17 +266,17 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization a44e13253c25ec42c4700d4d7ba6f84d9751a387 - + https://github.com/dotnet/hotreload-utils - 3c2fd7c2b45bfde00e13a52c1fd5f58cec578e52 + 71e00538eb121ebd6680c8cf4856a0dbd05837bf https://github.com/dotnet/runtime-assets 1b6340bd48d65b481e1add301fe7462394cc46c6 - + https://github.com/dotnet/roslyn-analyzers - f7d861496f6c8ee22f79a3481b9184a2f3ad61aa + 96155d391ef8011f9db11761fad0faf1e1e99f2b https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index e990336a6089f..caa1598866eb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 4.2.0-2.22128.1 4.2.0-2.22128.1 4.2.0-2.22128.1 - 7.0.0-preview1.22153.1 + 7.0.0-preview1.22157.1 4.2.0-2.22128.1 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 2.5.1-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 - 7.0.0-beta.22154.3 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 2.5.1-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 + 7.0.0-beta.22157.6 6.0.0-preview.1.102 @@ -71,14 +71,14 @@ 3.1.0 7.0.0-preview.3.22157.1 - 1.0.0-alpha.1.22128.1 - 1.0.0-alpha.1.22128.1 - 1.0.0-alpha.1.22128.1 - 1.0.0-alpha.1.22128.1 - 1.0.0-alpha.1.22128.1 - 1.0.0-alpha.1.22128.1 - 1.0.0-alpha.1.22128.1 - 1.0.0-alpha.1.22128.1 + 1.0.0-alpha.1.22157.1 + 1.0.0-alpha.1.22157.1 + 1.0.0-alpha.1.22157.1 + 1.0.0-alpha.1.22157.1 + 1.0.0-alpha.1.22157.1 + 1.0.0-alpha.1.22157.1 + 1.0.0-alpha.1.22157.1 + 1.0.0-alpha.1.22157.1 6.0.0 4.3.0 @@ -152,10 +152,10 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.22153.2 - 1.0.0-prerelease.22153.2 - 1.0.0-prerelease.22153.2 - 1.0.2-alpha.0.22128.2 + 1.0.0-prerelease.22160.1 + 1.0.0-prerelease.22160.1 + 1.0.0-prerelease.22160.1 + 1.0.2-alpha.0.22157.2 2.4.2-pre.22 0.12.0-pre.20 2.4.2 @@ -172,9 +172,9 @@ 7.0.100-1.22157.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-preview.3.22128.1 + 7.0.0-preview.3.22157.1 - 7.0.0-alpha.1.21529.3 + 7.0.0-alpha.1.22159.1 11.1.0-alpha.1.22121.2 11.1.0-alpha.1.22121.2 diff --git a/global.json b/global.json index 47ff135a98855..55dd5f4e4281f 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "6.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22154.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22154.3", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22154.3", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22157.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22157.6", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22157.6", "Microsoft.Build.NoTargets": "3.3.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-preview.3.22157.1" diff --git a/src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props b/src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props index 042fde29a5982..29501d4d6c47f 100644 --- a/src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props +++ b/src/libraries/Common/tests/System/Net/Prerequisites/LocalEchoServer.props @@ -12,8 +12,8 @@ $(WasmXHarnessArgs) --web-server-use-cors --web-server-use-https $(WasmXHarnessArgs) --set-web-server-http-env=DOTNET_TEST_WEBSOCKETHOST,DOTNET_TEST_HTTPHOST,DOTNET_TEST_REMOTE_LOOP_HOST $(WasmXHarnessArgs) --set-web-server-https-env=DOTNET_TEST_SECUREWEBSOCKETHOST,DOTNET_TEST_SECUREHTTPHOST,DOTNET_TEST_HTTP2HOST - $(WasmXHarnessArgs) --web-server-middleware=$(_RemoteLoopMiddleware)/RemoteLoopServer.dll,GenericHandler - $(WasmXHarnessArgs) --web-server-middleware=$(_TestEchoMiddleware)/NetCoreServer.dll,GenericHandler + $(WasmXHarnessArgs) --web-server-middleware=$(_RemoteLoopMiddleware)/RemoteLoopServer.dll,RemoteLoopServer.GenericHandler + $(WasmXHarnessArgs) --web-server-middleware=$(_TestEchoMiddleware)/NetCoreServer.dll,NetCoreServer.GenericHandler