From e32d6d4ee0fc2e26ae6bee015d54bc5eca229fb0 Mon Sep 17 00:00:00 2001 From: Natalia Kondratyeva Date: Tue, 12 Sep 2023 22:26:34 +0000 Subject: [PATCH 1/8] Merged PR 33648: [release/8.0] Update MsQuic --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 646f22880d530d..15b861e0b7ecca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,7 +219,7 @@ 8.0.0-rc.2.23454.2 - 2.2.2 + 2.2.3-ci.391104 8.0.0-alpha.1.23412.1 16.0.5-alpha.1.23423.1 From 4796219f6bc0d09dafd21708c2d503279890da5d Mon Sep 17 00:00:00 2001 From: Ahmet Ibrahim Aksoy Date: Thu, 5 Oct 2023 15:50:59 +0000 Subject: [PATCH 2/8] Split commands in FtpWebRequest --- .../src/Resources/Strings.resx | 3 +++ .../src/System/Net/FtpControlStream.cs | 5 +++++ .../src/System/Net/FtpWebRequest.cs | 3 +++ .../tests/FtpWebRequestTest.cs | 21 +++++++++++++++++++ 4 files changed, 32 insertions(+) diff --git a/src/libraries/System.Net.Requests/src/Resources/Strings.resx b/src/libraries/System.Net.Requests/src/Resources/Strings.resx index f8ac54eb739cdd..05b94042590c8c 100644 --- a/src/libraries/System.Net.Requests/src/Resources/Strings.resx +++ b/src/libraries/System.Net.Requests/src/Resources/Strings.resx @@ -195,6 +195,9 @@ The underlying connection was closed: An unexpected error occurred on a receive + + CRLF character pair is not allowed in FtpWebRequest inputs. + The remote name could not be resolved diff --git a/src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs b/src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs index 35eefb9c38cbba..ffba72c9315d28 100644 --- a/src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs +++ b/src/libraries/System.Net.Requests/src/System/Net/FtpControlStream.cs @@ -1118,6 +1118,11 @@ private string GetPortCommandLine() /// private static string FormatFtpCommand(string command, string? parameter) { + if (parameter is not null && parameter.Contains("\r\n", StringComparison.Ordinal)) + { + throw new FormatException(SR.net_ftp_no_newlines); + } + return string.IsNullOrEmpty(parameter) ? command + "\r\n" : command + " " + parameter + "\r\n"; diff --git a/src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs b/src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs index 5a6009240fd921..b27873e9edb233 100644 --- a/src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs +++ b/src/libraries/System.Net.Requests/src/System/Net/FtpWebRequest.cs @@ -486,6 +486,9 @@ internal FtpWebRequest(Uri uri) if ((object)uri.Scheme != (object)Uri.UriSchemeFtp) throw new ArgumentOutOfRangeException(nameof(uri)); + if (uri.OriginalString.Contains("\r\n", StringComparison.Ordinal)) + throw new FormatException(SR.net_ftp_no_newlines); + _timerCallback = new TimerThread.Callback(TimerCallback); _syncObject = new object(); diff --git a/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs b/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs index d1f5e58b3492b5..c2b7ad12524003 100644 --- a/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs +++ b/src/libraries/System.Net.Requests/tests/FtpWebRequestTest.cs @@ -203,6 +203,27 @@ public void Ftp_RenameFileSubDir_Success(FtpExecutionMode mode) Assert.False(DirExists(mode, dir)); } + [Fact] + public void Ftp_Ignore_NewLine_Constructor_Throws_FormatException() + { + string uri = absoluteUri + Guid.NewGuid().ToString(); + + Assert.Throws(() => WebRequest.Create($"{uri}\r\n{WebRequestMethods.Ftp.AppendFile} {Guid.NewGuid().ToString()}")); + } + + [ConditionalFact(nameof(LocalServerAvailable))] + public void Ftp_Ignore_NewLine_GetRequestStream_And_GetResponse_Throws_FormatException_As_InnerException() + { + FtpWebRequest ftpWebRequest = (FtpWebRequest)WebRequest.Create(absoluteUri + Guid.NewGuid().ToString()); + ftpWebRequest.Method = "APPE"; + ftpWebRequest.Credentials = new NetworkCredential("test\r\ntest2", "test\r\ntest2"); + var requestException = Assert.Throws(() => ftpWebRequest.GetRequestStream()); + Assert.True(requestException.InnerException is FormatException); + + var responseException = Assert.Throws(() => ftpWebRequest.GetResponse()); + Assert.True(responseException.InnerException is FormatException); + } + private static async Task DoAsync(FtpWebRequest request, MemoryStream requestBody) { if (requestBody != null) From 2066e8f214a187fb7d039a519808ca67a11b0368 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 25 Oct 2023 17:13:10 +0000 Subject: [PATCH 3/8] Apply suggestions from code review --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4d15f289d8eba8..ed16dbfe0a219a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,7 +219,7 @@ 8.0.0-rtm.23511.1 - 2.2.2 + 2.2.3 8.0.0-alpha.1.23468.1 16.0.5-alpha.1.23478.1 From 82089e50b9529e76551b1d1bad110001809aaf0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 20:57:52 -0800 Subject: [PATCH 4/8] [release/8.0] Update dependencies from dnceng/internal/dotnet-optimization (#94605) * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20231109.3 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23525.5 -> To Version 1.0.0-prerelease.23559.3 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20231109.3 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23525.5 -> To Version 1.0.0-prerelease.23559.3 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20231111.3 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23525.5 -> To Version 1.0.0-prerelease.23561.3 * Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20231111.3 optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23525.5 -> To Version 1.0.0-prerelease.23561.3 --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 4 ---- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 18 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a661d10176116..0c7e2962cba265 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0dafd57c184e1..2352181aa0037f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,21 +338,21 @@ https://github.com/dotnet/arcade 080141bf0f9f15408bb6eb8e301b23bddf81d054 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d80a861521d84459c9290c31127b2a0ce511f279 + c68e08c656a1e9b058fe22cc0546dbbd245c85fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d80a861521d84459c9290c31127b2a0ce511f279 + c68e08c656a1e9b058fe22cc0546dbbd245c85fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d80a861521d84459c9290c31127b2a0ce511f279 + c68e08c656a1e9b058fe22cc0546dbbd245c85fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d80a861521d84459c9290c31127b2a0ce511f279 + c68e08c656a1e9b058fe22cc0546dbbd245c85fb https://github.com/dotnet/hotreload-utils @@ -388,13 +388,13 @@ 7e33fd449381b337c290a801057fdcd68c4b7220 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d80a861521d84459c9290c31127b2a0ce511f279 + c68e08c656a1e9b058fe22cc0546dbbd245c85fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - d80a861521d84459c9290c31127b2a0ce511f279 + c68e08c656a1e9b058fe22cc0546dbbd245c85fb diff --git a/eng/Versions.props b/eng/Versions.props index 6cdad19d086c47..39cd16e0073b2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,12 +158,12 @@ 8.0.0-beta.23558.5 8.0.0-beta.23558.5 - 1.0.0-prerelease.23525.5 - 1.0.0-prerelease.23525.5 - 1.0.0-prerelease.23525.5 - 1.0.0-prerelease.23525.5 - 1.0.0-prerelease.23525.5 - 1.0.0-prerelease.23525.5 + 1.0.0-prerelease.23561.3 + 1.0.0-prerelease.23561.3 + 1.0.0-prerelease.23561.3 + 1.0.0-prerelease.23561.3 + 1.0.0-prerelease.23561.3 + 1.0.0-prerelease.23561.3 16.11.29-beta1.23404.4 2.0.0-beta4.23307.1 From fef37023557f560431ba7766828136d1dc0ed1e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 14:10:23 -0800 Subject: [PATCH 5/8] [release/8.0] Update dependencies from dotnet/emsdk (#94516) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/emsdk build 20231108.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.0-rtm.23530.2 -> To Version 8.0.0-rtm.23558.2 * Update dependencies from https://github.com/dotnet/emsdk build 20231108.4 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.0-rtm.23530.2 -> To Version 8.0.1-rtm.23558.4 * Update dependencies from https://github.com/dotnet/emsdk build 20231109.1 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.0-rtm.23530.2 -> To Version 8.0.1-servicing.23559.1 * Update dependencies from https://github.com/dotnet/emsdk build 20231113.2 Microsoft.SourceBuild.Intermediate.emsdk , Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.0-rtm.23530.2 -> To Version 8.0.1-servicing.23563.2 Dependency coherency updates runtime.linux-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.win-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.win-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.osx-arm64.Microsoft.NETCore.Runtime.ObjWriter,runtime.osx-x64.Microsoft.NETCore.Runtime.ObjWriter,runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk,runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools From Version 16.0.5-alpha.1.23478.1 -> To Version 16.0.5-alpha.1.23558.12 (parent: Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> --- NuGet.config | 1 + eng/Version.Details.xml | 128 ++++++++++++++++++++-------------------- eng/Versions.props | 62 +++++++++---------- 3 files changed, 96 insertions(+), 95 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0c7e2962cba265..fd2b87b608a8c8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2352181aa0037f..4d2d5b07608b86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,69 +12,69 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 https://github.com/dotnet/command-line-api @@ -90,13 +90,13 @@ 45dd3a73dd5b64b010c4251303b3664bb30df029 - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 0af50f733332e8c148f7f2debef2cb90504840d5 - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 0af50f733332e8c148f7f2debef2cb90504840d5 @@ -237,61 +237,61 @@ https://github.com/dotnet/runtime-assets 59430f9a34c6fba965d1941a7eb5df08ed24cc2d - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 - + https://github.com/dotnet/llvm-project - a0c65bc3a652036d21cd2c506a54c4b6cf8c49bd + ed5cffbdf262fdd9bb075b7b68d84bf3e4e090d4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 39cd16e0073b2e..d37b781bec6fe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,14 +110,14 @@ 8.0.0-rc.1.23406.6 8.0.0-preview.7.23325.2 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 6.0.0 1.1.1 @@ -222,38 +222,38 @@ 2.2.3 8.0.0-alpha.1.23527.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 - 8.0.0 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 - 16.0.5-alpha.1.23478.1 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 + 16.0.5-alpha.1.23558.12 3.1.7 1.0.406601 From aab2b2edc4d15f6ee4f2f88d2521eef506a1b1cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 14:35:15 +0100 Subject: [PATCH 6/8] [release/8.0] Update dependencies from dotnet/arcade (#94792) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependencies from https://github.com/dotnet/arcade build 20231114.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23556.5 -> To Version 8.0.0-beta.23564.4 * Set MicrosoftDotnetSdkInternalVersion to 8.0.100. Uncomment SdkVersionForWorkloadTesting line. * Upgrade to VS preview image --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Carlos Sánchez López <1175054+carlossanlop@users.noreply.github.com> Co-authored-by: Viktor Hofer --- eng/Version.Details.xml | 72 ++++++++++++++-------------- eng/Versions.props | 34 ++++++------- eng/pipelines/common/xplat-setup.yml | 2 +- global.json | 10 ++-- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d2d5b07608b86..16705807a4d5e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness 480b9159eb7e69b182a87581d5a336e97e0b6dae - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index d37b781bec6fe8..1766bc52259019 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ 8.0.100-rtm.23520.8 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 2.5.1-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 - 8.0.0-beta.23556.5 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 2.5.1-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 + 8.0.0-beta.23564.4 6.0.0-preview.1.102 @@ -258,7 +258,7 @@ 3.1.7 1.0.406601 - 8.0.100-rtm.23506.1 - + 8.0.100 + $(MicrosoftDotnetSdkInternalVersion) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index eb19570aeecac2..bd00245788f552 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -173,7 +173,7 @@ jobs: # Public Windows Build Pool ${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64.open + demands: ImageOverride -equals windows.vs2022preview.amd64.open ${{ if eq(parameters.helixQueuesTemplate, '') }}: diff --git a/global.json b/global.json index 0ba22484d372e8..517059ae7a3859 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "8.0.100-rtm.23506.1", + "version": "8.0.100", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.100-rtm.23506.1" + "dotnet": "8.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23556.5", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23556.5", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23564.4", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23564.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6" From be88b591aa898f1e5fd43e3f3e24b4f215d04d09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 10:37:21 -0800 Subject: [PATCH 7/8] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20231115.3 (#94851) optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime , optimization.PGO.CoreCLR From Version 1.0.0-prerelease.23561.3 -> To Version 1.0.0-prerelease.23565.3 Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 3 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 3 files changed, 18 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index fd2b87b608a8c8..2daf70bbead041 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,9 +10,6 @@ - - - diff --git a/eng/Versions.props b/eng/Versions.props index e139f1eb0ed0ec..523816f7052b79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,12 +158,12 @@ 8.0.0-beta.23558.5 8.0.0-beta.23558.5 - 1.0.0-prerelease.23561.3 - 1.0.0-prerelease.23561.3 - 1.0.0-prerelease.23561.3 - 1.0.0-prerelease.23561.3 - 1.0.0-prerelease.23561.3 - 1.0.0-prerelease.23561.3 + 1.0.0-prerelease.23565.3 + 1.0.0-prerelease.23565.3 + 1.0.0-prerelease.23565.3 + 1.0.0-prerelease.23565.3 + 1.0.0-prerelease.23565.3 + 1.0.0-prerelease.23565.3 16.11.29-beta1.23404.4 2.0.0-beta4.23307.1 From 656f461c50a46971fb5e6273bbe57d46f713a3e2 Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Thu, 16 Nov 2023 12:51:02 -0600 Subject: [PATCH 8/8] Downgrade 6 & 7 per tactics (#94863) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 523816f7052b79..ad201088988efe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 0 1 8.0.100 - 7.0.$([MSBuild]::Add($(PatchVersion),14)) + 7.0.$([MSBuild]::Add($(PatchVersion),13)) 6.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet7)').Build),11)) servicing