From 0f527f68cca3f11243c9383b04267f5304cd6d21 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Thu, 21 Sep 2023 15:10:57 -0700 Subject: [PATCH 001/550] enable rid parsing in invariant ways for CommonOptions and Restore command; Add tests for rid parsing --- src/Cli/dotnet/CommonOptions.cs | 4 +- .../dotnet-restore/RestoreCommandParser.cs | 6 +-- .../GivenDotnetOsArchOptions.cs | 49 +++++++++++++++++++ 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs index a989805c68d9..ca91c66edb3c 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -262,9 +262,9 @@ public static string GetCurrentRuntimeId() return currentRuntimeIdentifiers[0]; // First rid is the most specific (ex win-x64) } - private static string GetOsFromRid(string rid) => rid.Substring(0, rid.LastIndexOf("-")); + private static string GetOsFromRid(string rid) => rid.Substring(0, rid.LastIndexOf("-", StringComparison.InvariantCulture)); - private static string GetArchFromRid(string rid) => rid.Substring(rid.LastIndexOf("-") + 1, rid.Length - rid.LastIndexOf("-") - 1); + private static string GetArchFromRid(string rid) => rid.Substring(rid.LastIndexOf("-", StringComparison.InvariantCulture) + 1, rid.Length - rid.LastIndexOf("-", StringComparison.InvariantCulture) - 1); private static IEnumerable ForwardSelfContainedOptions(bool isSelfContained, ParseResult parseResult) { diff --git a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index 0d08befe5c19..bce6bc18d5c7 100644 --- a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -80,9 +80,9 @@ public static void AddImplicitRestoreOptions(CliCommand command, bool showHelp = command.Options.Add(option); } } - private static string GetOsFromRid(string rid) => rid.Substring(0, rid.LastIndexOf("-")); - private static string GetArchFromRid(string rid) => rid.Substring(rid.LastIndexOf("-") + 1, rid.Length - rid.LastIndexOf("-") - 1); - public static string RestoreRuntimeArgFunc(IEnumerable rids) + private static string GetOsFromRid(string rid) => rid.Substring(0, rid.LastIndexOf("-", StringComparison.InvariantCulture)); + private static string GetArchFromRid(string rid) => rid.Substring(rid.LastIndexOf("-", StringComparison.InvariantCulture) + 1, rid.Length - rid.LastIndexOf("-", StringComparison.InvariantCulture) - 1); + public static string RestoreRuntimeArgFunc(IEnumerable rids) { List convertedRids = new(); foreach (string rid in rids) diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs index a1e4980d7f0f..a58b3ebefdd6 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Globalization; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Tools; using BuildCommand = Microsoft.DotNet.Tools.Build.BuildCommand; @@ -148,5 +149,53 @@ public void ArchOptionsAMD64toX64() .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary -property:RuntimeIdentifier=os-x64 -property:SelfContained=false"); }); } + + [Fact] + public void ArchOptionIsResolvedFromRidUnderDifferentCulture() + { + CultureInfo currentCultureBefore = CultureInfo.CurrentCulture; + try + { + CultureInfo.CurrentCulture = new CultureInfo("th"); + CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () => + { + var msbuildPath = ""; + var command = BuildCommand.FromArgs(new string[] { "--os", "os" }, msbuildPath); + var expectedArch = RuntimeInformation.ProcessArchitecture.Equals(Architecture.Arm64) ? "arm64" : Environment.Is64BitOperatingSystem ? "x64" : "x86"; + command.GetArgumentsToMSBuild() + .Should() + .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary -property:RuntimeIdentifier=os-{expectedArch} -property:SelfContained=false"); + }); + } + finally { CultureInfo.CurrentCulture = currentCultureBefore; } + } + + [Fact] + public void OsOptionIsResolvedFromRidUnderDifferentCulture() + { + CultureInfo currentCultureBefore = CultureInfo.CurrentCulture; + try + { + CultureInfo.CurrentCulture = new CultureInfo("th"); + CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () => + { + var msbuildPath = ""; + var command = BuildCommand.FromArgs(new string[] { "--arch", "arch" }, msbuildPath); + var expectedOs = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "win" : + RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "linux" : + RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? "osx" : + null; + if (expectedOs == null) + { + // Not a supported OS for running test + return; + } + command.GetArgumentsToMSBuild() + .Should() + .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary -property:RuntimeIdentifier={expectedOs}-arch -property:SelfContained=false"); + }); + } + finally { CultureInfo.CurrentCulture = currentCultureBefore;} + } } } From 8c76bcb7883f3ae88b20e997d213b8950608f1f5 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Fri, 22 Sep 2023 15:51:16 -0700 Subject: [PATCH 002/550] fix test --- .../dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs index a58b3ebefdd6..d05c204229de 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs @@ -164,7 +164,7 @@ public void ArchOptionIsResolvedFromRidUnderDifferentCulture() var expectedArch = RuntimeInformation.ProcessArchitecture.Equals(Architecture.Arm64) ? "arm64" : Environment.Is64BitOperatingSystem ? "x64" : "x86"; command.GetArgumentsToMSBuild() .Should() - .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary -property:RuntimeIdentifier=os-{expectedArch} -property:SelfContained=false"); + .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary -property:RuntimeIdentifier=os-{expectedArch}"); }); } finally { CultureInfo.CurrentCulture = currentCultureBefore; } @@ -192,7 +192,7 @@ public void OsOptionIsResolvedFromRidUnderDifferentCulture() } command.GetArgumentsToMSBuild() .Should() - .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary -property:RuntimeIdentifier={expectedOs}-arch -property:SelfContained=false"); + .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary -property:RuntimeIdentifier={expectedOs}-arch"); }); } finally { CultureInfo.CurrentCulture = currentCultureBefore;} From d783ea6e5433409e8896baa4c60b7bd057d5363a Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Mon, 2 Oct 2023 16:13:09 -0700 Subject: [PATCH 003/550] branding update for 8.0.2xx (#35661) --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7e0f47f348c1..44920717d4dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,13 +11,13 @@ - 8.0.100 - 8.0.100 + 8.0.200 + 8.0.200 false release - rtm + preview rtm servicing From c2cfab261b0724529562d0264dc70748f4a6c5d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 14:41:45 -0700 Subject: [PATCH 004/550] [release/8.0.2xx] Update dependencies from dotnet/runtime (#35874) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac32cbaa138c..5a86db685a88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,46 +10,46 @@ https://github.com/dotnet/templating 6a5b28a2ab8ca3351841f09c2647ccb873c621aa - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/emsdk - 50bf805c8b5ca52abd34fde390609d8a54640246 + ae4eaab4a9415d7f87ca7c6dc0b41ea482fa6337 @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest cf7d549fc0197abaabec19d61d2c20d7a7b089f8 - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a https://github.com/dotnet/windowsdesktop @@ -386,19 +386,19 @@ - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a @@ -419,9 +419,9 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/runtime - 49bf70a429a6122217f2c88e778ce8115ceac3bd + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 44920717d4dc..5fc7c1433d93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23463.1 7.0.0-preview.22423.2 - 8.0.0-rc.2.23470.7 + 8.0.0-rtm.23504.8 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rc.2.23470.7 + 8.0.0-rtm.23504.8 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,18 +49,18 @@ - 8.0.0-rc.2.23470.7 - 8.0.0-rc.2.23470.7 - 8.0.0-rc.2.23470.7 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rc.2.23470.7 - 8.0.0-rc.2.23470.7 - 8.0.0-rc.2.23470.7 - 8.0.0-rc.2.23470.7 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rc.2.23470.7 - 8.0.0-rc.2.23470.7 - 8.0.0-rc.2.23470.7 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 $(MicrosoftExtensionsLoggingConsoleVersion) $(MicrosoftExtensionsLoggingConsoleVersion) @@ -89,9 +89,9 @@ - 8.0.0-rc.2.23470.7 - 8.0.0-rc.2.23470.7 - 8.0.0-rc.2.23470.7 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 @@ -208,7 +208,7 @@ - 8.0.0-rtm.23470.1 + 8.0.0-rtm.23477.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 015c5f1dc1a73049390d44cc197ba58a4f00b7b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Oct 2023 12:51:07 +0000 Subject: [PATCH 005/550] Update dependencies from https://github.com/dotnet/razor build 20231004.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23471.1 -> To Version 7.0.0-preview.23504.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a86db685a88..4b10b1ebfa9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore cca9840c7d56a44dac424493a94365c7ac5f1427 - + https://github.com/dotnet/razor - cf76071cbdef71acea7adea57e71251a44d9bd37 + 8de09384414b0f850b29991342b4c40c423a8b40 - + https://github.com/dotnet/razor - cf76071cbdef71acea7adea57e71251a44d9bd37 + 8de09384414b0f850b29991342b4c40c423a8b40 - + https://github.com/dotnet/razor - cf76071cbdef71acea7adea57e71251a44d9bd37 + 8de09384414b0f850b29991342b4c40c423a8b40 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5fc7c1433d93..adc56bfa2738 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23471.1 - 7.0.0-preview.23471.1 - 7.0.0-preview.23471.1 + 7.0.0-preview.23504.1 + 7.0.0-preview.23504.1 + 7.0.0-preview.23504.1 From 6d828b65ecad56b764977afc9395d42aa52374ea Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 6 Oct 2023 11:27:34 -0500 Subject: [PATCH 006/550] Declare dependencies for two Extensions.Logging packages (#35906) --- Directory.Packages.props | 4 ++-- eng/Version.Details.xml | 10 ++++++++++ eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 4dcbd5a15709..eb74dea8e7f6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -34,8 +34,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a86db685a88..37f0916c1eca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -386,6 +386,16 @@ + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + + https://github.com/dotnet/runtime 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a diff --git a/eng/Versions.props b/eng/Versions.props index 5fc7c1433d93..d421616ed7c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 8.0.0-rtm.23504.8 8.0.0-rtm.23504.8 $(MicrosoftExtensionsDependencyModelPackageVersion) + 8.0.0-rtm.23504.8 8.0.0-rtm.23504.8 + 8.0.0-rtm.23504.8 8.0.0-rtm.23504.8 8.0.0-rtm.23504.8 - $(MicrosoftExtensionsLoggingConsoleVersion) - $(MicrosoftExtensionsLoggingConsoleVersion) From a19a59394eed2849dc2fda545a5efb4d947cd914 Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Fri, 6 Oct 2023 18:29:40 +0200 Subject: [PATCH 007/550] SDK resolver perf: Don't check current process for dotnet.exe on .NET Framework (#35890) When evaluating projects in Visual Studio, more than half of the CPU spent in SDK resolution is in EnvironmentProvider.GetCurrentProcessPath(). Making this call in the .NET Framework version of the resolver does not make sense as there is no Framework dotnet.exe. This PRs reorders the checks so that EnvironmentProvider.GetCurrentProcessPath() does not run except for failure cases, which speeds up evaluation of the OrchardCore solution by ~18%. The Framework Process.MainModule getter is slow. In this trace the total CPU spent in evaluation was 9459 ms. --- .../EnvironmentProvider.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Resolvers/Microsoft.DotNet.NativeWrapper/EnvironmentProvider.cs b/src/Resolvers/Microsoft.DotNet.NativeWrapper/EnvironmentProvider.cs index 9b70750cced6..75cd6ded54c3 100644 --- a/src/Resolvers/Microsoft.DotNet.NativeWrapper/EnvironmentProvider.cs +++ b/src/Resolvers/Microsoft.DotNet.NativeWrapper/EnvironmentProvider.cs @@ -67,10 +67,15 @@ public string GetDotnetExeDirectory(Action log = null) return environmentOverride; } - string dotnetExe = _getCurrentProcessPath(); + string dotnetExe; +#if NETCOREAPP + // The dotnet executable is loading only the .NET version of this code so there is no point checking + // the current process path on .NET Framework. We are expected to find dotnet on PATH. + dotnetExe = _getCurrentProcessPath(); if (string.IsNullOrEmpty(dotnetExe) || !Path.GetFileNameWithoutExtension(dotnetExe) .Equals(Constants.DotNet, StringComparison.InvariantCultureIgnoreCase)) +#endif { string dotnetExeFromPath = GetCommandPath(Constants.DotNet); @@ -87,6 +92,13 @@ public string GetDotnetExeDirectory(Action log = null) } else { log?.Invoke($"GetDotnetExeDirectory: dotnet command path not found. Using current process"); log?.Invoke($"GetDotnetExeDirectory: Path variable: {_getEnvironmentVariable(Constants.PATH)}"); + +#if !NETCOREAPP + // If we failed to find dotnet on PATH, we revert to the old behavior of returning the current process + // path. This is really an error state but we're keeping the contract of always returning a non-empty + // path for backward compatibility. + dotnetExe = _getCurrentProcessPath(); +#endif } } From bd8383e2df8dbcdfa7754973e02abbb5ac6a99c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 09:41:30 -0700 Subject: [PATCH 008/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#35901) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37f0916c1eca..b6ff4e18ca77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 1d6407d1f743e64c6eef2dbff1b07a81dc6c239e - + https://github.com/dotnet/roslyn - bd11e7accd665cf8e04572efd9a466690bd50985 + 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/roslyn - bd11e7accd665cf8e04572efd9a466690bd50985 + 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/roslyn - bd11e7accd665cf8e04572efd9a466690bd50985 + 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/roslyn - bd11e7accd665cf8e04572efd9a466690bd50985 + 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/roslyn - bd11e7accd665cf8e04572efd9a466690bd50985 + 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/roslyn - bd11e7accd665cf8e04572efd9a466690bd50985 + 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/roslyn - bd11e7accd665cf8e04572efd9a466690bd50985 + 81d9274600db701a8b08ed8af3fd6b00a775cc33 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d421616ed7c0..109a4c52d938 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.8.0-3.23471.9 - 4.8.0-3.23471.9 - 4.8.0-3.23471.9 - 4.8.0-3.23471.9 - 4.8.0-3.23471.9 - 4.8.0-3.23471.9 - 4.8.0-3.23471.9 + 4.8.0-3.23504.4 + 4.8.0-3.23504.4 + 4.8.0-3.23504.4 + 4.8.0-3.23504.4 + 4.8.0-3.23504.4 + 4.8.0-3.23504.4 + 4.8.0-3.23504.4 $(MicrosoftNetCompilersToolsetPackageVersion) From cab62a9ad7a09ed7c88b6696af48a2318dbfd0e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 09:41:47 -0700 Subject: [PATCH 009/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#35900) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6ff4e18ca77..c9820606f4fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild 3847162365a20626dbef16f2b1153dada9c26965 - + https://github.com/dotnet/fsharp - 62aba1c2b0cbfa18f94cff0f471c395ac78ff6c8 + 38b2bac6361e9b75dc2b51c0f2b78b008872767d - + https://github.com/dotnet/fsharp - 62aba1c2b0cbfa18f94cff0f471c395ac78ff6c8 + 38b2bac6361e9b75dc2b51c0f2b78b008872767d diff --git a/eng/Versions.props b/eng/Versions.props index 109a4c52d938..4db5d1ca4b86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23471.1 + 12.8.0-beta.23478.1 From 66a1275d0eb041baa220acebc51a2c76986547ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 09:42:06 -0700 Subject: [PATCH 010/550] [release/8.0.2xx] Update dependencies from dotnet/aspnetcore (#35899) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9820606f4fc..61ec48db68b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn 81d9274600db701a8b08ed8af3fd6b00a775cc33 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf 8f8527d020b488bfb8da6ccb9c88b8ceaaf15cdc - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor cf76071cbdef71acea7adea57e71251a44d9bd37 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/dotnet/aspnetcore - cca9840c7d56a44dac424493a94365c7ac5f1427 + 51f80c73e5a9bfb21962db8daa9bb174b9af5942 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 4db5d1ca4b86..fe7f59d37192 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 - 8.0.0-rtm.23471.8 + 8.0.0-rtm.23505.1 + 8.0.0-rtm.23505.1 + 8.0.0-rtm.23505.1 + 8.0.0-rtm.23505.1 + 8.0.0-rtm.23505.1 + 8.0.0-rtm.23505.1 + 8.0.0-rtm.23505.1 From 56802c90f8f4052606f1668c64b8ca63a7ef9037 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 09:42:22 -0700 Subject: [PATCH 011/550] [release/8.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#35898) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61ec48db68b5..c3b77f38bdf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -339,9 +339,9 @@ 6dbf3aaa0fc9664df86462f5c70b99800934fccd - + https://github.com/dotnet/source-build-reference-packages - d825c6693d4e26f63aaa93c3c1d057faa098e347 + 7b55da982fc6e71c1776c4de89111aee0eecb45a From 8c497a4a09cf2d12ce8279b3de93d26c6174fba6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 09:42:40 -0700 Subject: [PATCH 012/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn-analyzers (#35897) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3b77f38bdf4..0c1fc4c45684 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -312,17 +312,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - 2c9a20b6706b8a9ad650b41bff30980cf5af67ed + 4a7701fd72094614897b33e4cb1d9640c221d862 - + https://github.com/dotnet/roslyn-analyzers - 2c9a20b6706b8a9ad650b41bff30980cf5af67ed + 4a7701fd72094614897b33e4cb1d9640c221d862 - + https://github.com/dotnet/roslyn-analyzers - 2c9a20b6706b8a9ad650b41bff30980cf5af67ed + 4a7701fd72094614897b33e4cb1d9640c221d862 diff --git a/eng/Versions.props b/eng/Versions.props index fe7f59d37192..fe10cd14bfbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,8 +99,8 @@ - 8.0.0-preview.23468.1 - 3.11.0-beta1.23468.1 + 8.0.0-preview.23472.1 + 3.11.0-beta1.23472.1 From de513bbcab464dd6de2536db0efa6117519e221e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 09:43:04 -0700 Subject: [PATCH 013/550] [release/8.0.2xx] Update dependencies from dotnet/windowsdesktop (#35896) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c1fc4c45684..ee7872a13380 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,25 +213,25 @@ https://github.com/dotnet/runtime 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a - + https://github.com/dotnet/windowsdesktop - 7d1d325d01d081912a056124217e08e1a6046580 + fbc1fdd82c38765663b256e663a51e55b855f345 - + https://github.com/dotnet/windowsdesktop - 7d1d325d01d081912a056124217e08e1a6046580 + fbc1fdd82c38765663b256e663a51e55b855f345 - + https://github.com/dotnet/windowsdesktop - 7d1d325d01d081912a056124217e08e1a6046580 + fbc1fdd82c38765663b256e663a51e55b855f345 - + https://github.com/dotnet/windowsdesktop - 7d1d325d01d081912a056124217e08e1a6046580 + fbc1fdd82c38765663b256e663a51e55b855f345 - + https://github.com/dotnet/wpf - 8f8527d020b488bfb8da6ccb9c88b8ceaaf15cdc + b892ae845b9832e0873ef2f7c958c46dc6b3d637 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index fe10cd14bfbe..83d99ac38819 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ - 8.0.0-rtm.23471.2 + 8.0.0-rtm.23504.3 From ddc80157b9f86664231827ebecc759a1ecc1b058 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:40:41 -0700 Subject: [PATCH 014/550] [release/8.0.2xx] Update dependencies from dotnet/templating (#35904) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee7872a13380..b0641a2030ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 6a5b28a2ab8ca3351841f09c2647ccb873c621aa + 6eba921b9481faced330ff3b47a9241d8513f5c8 - + https://github.com/dotnet/templating - 6a5b28a2ab8ca3351841f09c2647ccb873c621aa + 6eba921b9481faced330ff3b47a9241d8513f5c8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 83d99ac38819..26a6528ca745 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23471.4 + 8.0.100-rtm.23504.5 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23471.4 + 8.0.100-rtm.23504.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From db5d90ccb34cf7f2a5e6ec333db009bdc762086d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:41:01 -0700 Subject: [PATCH 015/550] [release/8.0.2xx] Update dependencies from dotnet/format (#35903) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0641a2030ba..423fd1011883 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,9 +74,9 @@ 38b2bac6361e9b75dc2b51c0f2b78b008872767d - + https://github.com/dotnet/format - 1d6407d1f743e64c6eef2dbff1b07a81dc6c239e + c6c3c61ee64679d41f8e69b9a8f7d4c877f5a5af diff --git a/eng/Versions.props b/eng/Versions.props index 26a6528ca745..b8cf04c318fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.447106 + 8.0.447601 From b62f9b2a97551a2e620fa669277b84b14c686ba6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:22:15 -0700 Subject: [PATCH 016/550] [release/8.0.2xx] Update dependencies from dotnet/source-build-externals (#35895) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 423fd1011883..460ac8b68e8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -334,9 +334,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 6dbf3aaa0fc9664df86462f5c70b99800934fccd + ed17956dbc31097b7ba6a66be086f4a70a97d84f From 915a28f0f2ed382c33324d5c738cf5ba24aa600d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:22:56 -0700 Subject: [PATCH 017/550] [release/8.0.2xx] Update dependencies from nuget/nuget.client (#35894) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 460ac8b68e8a..20585b541680 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 - + https://github.com/nuget/nuget.client - f47eb5771ee3f9a100d0b31d82ccb5ee600a56ed + 0dd5a1ea536201af94725353e4bc711d7560b246 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index b8cf04c318fa..2556c37f6b17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.8.0-rc.112 - 6.8.0-rc.112 + 6.8.0-rc.122 + 6.8.0-rc.122 6.0.0-rc.278 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 - 6.8.0-rc.112 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 + 6.8.0-rc.122 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From cd1c77ef517a4542af170c07ec22267433265aa4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 12:24:24 -0700 Subject: [PATCH 018/550] [release/8.0.2xx] Update dependencies from dotnet/sourcelink (#35877) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com> --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20585b541680..3f85f721c2d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -348,30 +348,30 @@ https://github.com/dotnet/deployment-tools 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/sourcelink - ea3bd92278af83bae656ad9747c11f5a345e5b4a + bd296362cb0b717a4fd0146a9790eadcd8e587a8 - + https://github.com/dotnet/sourcelink - ea3bd92278af83bae656ad9747c11f5a345e5b4a + bd296362cb0b717a4fd0146a9790eadcd8e587a8 - + https://github.com/dotnet/sourcelink - ea3bd92278af83bae656ad9747c11f5a345e5b4a + bd296362cb0b717a4fd0146a9790eadcd8e587a8 - + https://github.com/dotnet/sourcelink - ea3bd92278af83bae656ad9747c11f5a345e5b4a + bd296362cb0b717a4fd0146a9790eadcd8e587a8 - + https://github.com/dotnet/sourcelink - ea3bd92278af83bae656ad9747c11f5a345e5b4a + bd296362cb0b717a4fd0146a9790eadcd8e587a8 - + https://github.com/dotnet/sourcelink - ea3bd92278af83bae656ad9747c11f5a345e5b4a + bd296362cb0b717a4fd0146a9790eadcd8e587a8 diff --git a/eng/Versions.props b/eng/Versions.props index 2556c37f6b17..9fefe9ee8557 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,12 +177,12 @@ - 8.0.0-beta.23469.2 - 8.0.0-beta.23469.2 - 8.0.0-beta.23469.2 - 8.0.0-beta.23469.2 - 8.0.0-beta.23469.2 - 8.0.0-beta.23469.2 + 8.0.0-beta.23503.2 + 8.0.0-beta.23503.2 + 8.0.0-beta.23503.2 + 8.0.0-beta.23503.2 + 8.0.0-beta.23503.2 + 8.0.0-beta.23503.2 From 6cb5a6db147c73c7fd1b8423b1d556d56ef3b2db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:33:08 -0700 Subject: [PATCH 019/550] [release/8.0.2xx] Update dependencies from nuget/nuget.client (#35911) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3f85f721c2d2..78e3ed067b5c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore 51f80c73e5a9bfb21962db8daa9bb174b9af5942 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 6a096d0504851db695bef483801a992d65262c64 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 9fefe9ee8557..4a9c0d8c91be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.8.0-rc.122 - 6.8.0-rc.122 + 6.9.0-preview.1.10 + 6.9.0-preview.1.10 6.0.0-rc.278 - 6.8.0-rc.122 - 6.8.0-rc.122 - 6.8.0-rc.122 - 6.8.0-rc.122 - 6.8.0-rc.122 - 6.8.0-rc.122 - 6.8.0-rc.122 - 6.8.0-rc.122 - 6.8.0-rc.122 + 6.9.0-preview.1.10 + 6.9.0-preview.1.10 + 6.9.0-preview.1.10 + 6.9.0-preview.1.10 + 6.9.0-preview.1.10 + 6.9.0-preview.1.10 + 6.9.0-preview.1.10 + 6.9.0-preview.1.10 + 6.9.0-preview.1.10 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 3d3f450a4fd42cd5e47f3a4b4227d5668dc0af5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 6 Oct 2023 14:33:24 -0700 Subject: [PATCH 020/550] [release/8.0.2xx] Update dependencies from microsoft/vstest (#35910) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78e3ed067b5c..7978ff69b8d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,18 +180,18 @@ https://github.com/nuget/nuget.client 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/microsoft/vstest - cf7d549fc0197abaabec19d61d2c20d7a7b089f8 + 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd - + https://github.com/microsoft/vstest - cf7d549fc0197abaabec19d61d2c20d7a7b089f8 + 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd - + https://github.com/microsoft/vstest - cf7d549fc0197abaabec19d61d2c20d7a7b089f8 + 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4a9c0d8c91be..6bdcf83f0daa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.8.0-release-23468-02 - 17.8.0-release-23468-02 - 17.8.0-release-23468-02 + 17.9.0-preview-23503-02 + 17.9.0-preview-23503-02 + 17.9.0-preview-23503-02 From cb1401bb9e71b922069127c44057d08029de795b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Oct 2023 12:46:29 +0000 Subject: [PATCH 021/550] Update dependencies from https://github.com/dotnet/msbuild build 20231005.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.0-preview-23471-08 -> To Version 17.9.0-preview-23505-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84c2451667e4..d4081d5abfe5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ ae4eaab4a9415d7f87ca7c6dc0b41ea482fa6337 - + https://github.com/dotnet/msbuild - 3847162365a20626dbef16f2b1153dada9c26965 + 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 - + https://github.com/dotnet/msbuild - 3847162365a20626dbef16f2b1153dada9c26965 + 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 - + https://github.com/dotnet/msbuild - 3847162365a20626dbef16f2b1153dada9c26965 + 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 19eda0bf2070..b7ff3932ad59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.8.0-preview-23471-08 + 17.9.0-preview-23505-02 $(MicrosoftBuildPackageVersion) - 8.0.0-rtm.23505.1 - 8.0.0-rtm.23505.1 - 8.0.0-rtm.23505.1 - 8.0.0-rtm.23505.1 - 8.0.0-rtm.23505.1 - 8.0.0-rtm.23505.1 - 8.0.0-rtm.23505.1 + 8.0.0-rtm.23506.5 + 8.0.0-rtm.23506.5 + 8.0.0-rtm.23506.5 + 8.0.0-rtm.23506.5 + 8.0.0-rtm.23506.5 + 8.0.0-rtm.23506.5 + 8.0.0-rtm.23506.5 From 3b14ea64bc9b968ae13034f5e3a56baa7ac2b76f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Oct 2023 12:47:11 +0000 Subject: [PATCH 023/550] Update dependencies from https://github.com/dotnet/templating build 20231007.4 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23504.5 -> To Version 8.0.100-rtm.23507.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84c2451667e4..a002f9e582d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 6eba921b9481faced330ff3b47a9241d8513f5c8 + 9c9c9443df3a8c1ea48f5c5cff08582e8a415f31 - + https://github.com/dotnet/templating - 6eba921b9481faced330ff3b47a9241d8513f5c8 + 9c9c9443df3a8c1ea48f5c5cff08582e8a415f31 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 19eda0bf2070..5a00670e1c05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23504.5 + 8.0.100-rtm.23507.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23504.5 + 8.0.100-rtm.23507.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From a2367c8d4e8805ce44cd178921daebf5fb6c90f4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Oct 2023 12:47:22 +0000 Subject: [PATCH 024/550] Update dependencies from https://github.com/dotnet/runtime build 20231006.12 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23504.8 -> To Version 8.0.0-rtm.23506.12 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rtm.23477.1 -> To Version 8.0.0-rtm.23504.4 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 36 ++++++++--------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84c2451667e4..ffd961984e3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,46 +10,46 @@ https://github.com/dotnet/templating 6eba921b9481faced330ff3b47a9241d8513f5c8 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/emsdk - ae4eaab4a9415d7f87ca7c6dc0b41ea482fa6337 + 0c28b5cfe0f9173000450a3edc808dc8c2b9286e @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 https://github.com/dotnet/windowsdesktop @@ -386,29 +386,29 @@ - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + + https://github.com/dotnet/runtime + b17a34c818bd5e01fdb9827fea64727a5fc51025 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + + https://github.com/dotnet/runtime + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + b17a34c818bd5e01fdb9827fea64727a5fc51025 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 19eda0bf2070..3d0ee4bde54c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23463.1 7.0.0-preview.22423.2 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23506.12 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23506.12 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,20 +49,20 @@ - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 @@ -89,9 +89,9 @@ - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 + 8.0.0-rtm.23506.12 @@ -208,7 +208,7 @@ - 8.0.0-rtm.23477.1 + 8.0.0-rtm.23504.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 8c0cda06f3f3bb791a813a517174ccb057507a12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 09:31:11 -0700 Subject: [PATCH 025/550] [release/8.0.2xx] Update dependencies from microsoft/vstest (#35945) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75930c6b8b2b..3281279cb69e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,18 +180,18 @@ https://github.com/nuget/nuget.client 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/microsoft/vstest - 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd + 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 - + https://github.com/microsoft/vstest - 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd + 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 - + https://github.com/microsoft/vstest - 8b75bc5d019f69733c6c0ef6bdd598f5b557c4cd + 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a7161f1e1367..37a623502628 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23503-02 - 17.9.0-preview-23503-02 - 17.9.0-preview-23503-02 + 17.9.0-preview-23506-01 + 17.9.0-preview-23506-01 + 17.9.0-preview-23506-01 From 71acb5cb333e47411c4cf0ee0e55c893fdbc60ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 14:42:34 -0700 Subject: [PATCH 026/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#35944) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3281279cb69e..72706d6157f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ c6c3c61ee64679d41f8e69b9a8f7d4c877f5a5af - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + 0caa880a161057559d1dcaad890e4053f520136e - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + 0caa880a161057559d1dcaad890e4053f520136e - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + 0caa880a161057559d1dcaad890e4053f520136e - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + 0caa880a161057559d1dcaad890e4053f520136e - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + 0caa880a161057559d1dcaad890e4053f520136e - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + 0caa880a161057559d1dcaad890e4053f520136e - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + 0caa880a161057559d1dcaad890e4053f520136e https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 37a623502628..4dc244494acc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.8.0-3.23504.4 - 4.8.0-3.23504.4 - 4.8.0-3.23504.4 - 4.8.0-3.23504.4 - 4.8.0-3.23504.4 - 4.8.0-3.23504.4 - 4.8.0-3.23504.4 + 4.9.0-1.23506.7 + 4.9.0-1.23506.7 + 4.9.0-1.23506.7 + 4.9.0-1.23506.7 + 4.9.0-1.23506.7 + 4.9.0-1.23506.7 + 4.9.0-1.23506.7 $(MicrosoftNetCompilersToolsetPackageVersion) From dfca8303bb63485ae37dbfd065862bda892131a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 14:42:49 -0700 Subject: [PATCH 027/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#35943) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72706d6157f3..0a427628c23a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 - + https://github.com/dotnet/fsharp - 38b2bac6361e9b75dc2b51c0f2b78b008872767d + 39ef9ca10f63a99de12f9b348a877d32c6446857 - + https://github.com/dotnet/fsharp - 38b2bac6361e9b75dc2b51c0f2b78b008872767d + 39ef9ca10f63a99de12f9b348a877d32c6446857 diff --git a/eng/Versions.props b/eng/Versions.props index 4dc244494acc..9ca9ae5097ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23478.1 + 12.8.0-beta.23509.1 From 14fa66fa275aa22a8ab5e4be786dfaef406d9449 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 3 Oct 2023 20:02:20 -0700 Subject: [PATCH 028/550] A lot of cleanup around uses of many different ValueTuple types. Created records or aliases to attempt to simplify. Ad-hoc formatting cleanup and some simplification. No functional changes should be taking place. --- .../dotnet-workload/WorkloadInfoHelper.cs | 3 +- .../install/IWorkloadManifestUpdater.cs | 11 +- .../install/WorkloadInstallCommand.cs | 4 +- .../install/WorkloadManifestUpdater.cs | 150 ++++++++---------- .../list/WorkloadListCommand.cs | 29 ++-- .../update/WorkloadUpdateCommand.cs | 4 +- .../WorkloadId.cs | 2 +- .../GivenDotnetWorkloadInstall.cs | 37 ++--- .../GivenWorkloadManifestUpdater.cs | 24 +-- .../MockWorkloadManifestUpdater.cs | 21 +-- ...nWorkloadInstallerAndWorkloadsInstalled.cs | 18 ++- .../GivenDotnetWorkloadUpdate.cs | 44 +++-- 12 files changed, 150 insertions(+), 197 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs index a8ee40187373..b2f787ff157a 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs @@ -66,8 +66,7 @@ public WorkloadInfoHelper( public IWorkloadInstallationRecordRepository WorkloadRecordRepo { get; private init; } public IWorkloadResolver WorkloadResolver { get; private init; } - public IEnumerable InstalledSdkWorkloadIds => - WorkloadRecordRepo.GetInstalledWorkloads(_currentSdkFeatureBand); + public IEnumerable InstalledSdkWorkloadIds => WorkloadRecordRepo.GetInstalledWorkloads(_currentSdkFeatureBand); public InstalledWorkloadsCollection AddInstalledVsWorkloads(IEnumerable sdkWorkloadIds) { diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs index 87957062092f..a196275bae72 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.EnvironmentAbstractions; using Microsoft.NET.Sdk.WorkloadManifestReader; +using WorkloadCollection = System.Collections.Generic.Dictionary; namespace Microsoft.DotNet.Workloads.Workload.Install { @@ -12,13 +13,9 @@ internal interface IWorkloadManifestUpdater Task BackgroundUpdateAdvertisingManifestsWhenRequiredAsync(); - IEnumerable<( - ManifestVersionUpdate manifestUpdate, - Dictionary Workloads - )> CalculateManifestUpdates(); + IEnumerable CalculateManifestUpdates(); - IEnumerable - CalculateManifestRollbacks(string rollbackDefinitionFilePath); + IEnumerable CalculateManifestRollbacks(string rollbackDefinitionFilePath); Task> GetManifestPackageDownloadsAsync(bool includePreviews, SdkFeatureBand providedSdkFeatureBand, SdkFeatureBand installedSdkFeatureBand); @@ -26,4 +23,6 @@ Dictionary Workloads void DeleteUpdatableWorkloadsFile(); } + + internal record ManifestUpdateWithWorkloads(ManifestVersionUpdate ManifestUpdate, WorkloadCollection Workloads); } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index 11689ddcc858..84666b6ba266 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -40,7 +40,7 @@ public WorkloadInstallCommand( _workloadResolver, Verbosity, _userProfileDir, VerifySignatures, PackageDownloader, _dotnetPath, TempDirectoryPath, _packageSourceLocation, RestoreActionConfiguration, elevationRequired: !_printDownloadLinkOnly && string.IsNullOrWhiteSpace(_downloadToCacheOption)); - _workloadManifestUpdater = _workloadManifestUpdaterFromConstructor ?? new WorkloadManifestUpdater(Reporter, _workloadResolver, PackageDownloader, _userProfileDir, TempDirectoryPath, + _workloadManifestUpdater = _workloadManifestUpdaterFromConstructor ?? new WorkloadManifestUpdater(Reporter, _workloadResolver, PackageDownloader, _userProfileDir, _workloadInstaller.GetWorkloadInstallationRecordRepository(), _workloadInstaller, _packageSourceLocation, displayManifestUpdates: Verbosity.IsDetailedOrDiagnostic()); ValidateWorkloadIdsInput(); @@ -162,7 +162,7 @@ public void InstallWorkloads(IEnumerable workloadIds, bool skipManif _workloadManifestUpdater.UpdateAdvertisingManifestsAsync(includePreviews, offlineCache).Wait(); manifestsToUpdate = useRollback ? _workloadManifestUpdater.CalculateManifestRollbacks(_fromRollbackDefinition) : - _workloadManifestUpdater.CalculateManifestUpdates().Select(m => m.manifestUpdate); + _workloadManifestUpdater.CalculateManifestUpdates().Select(m => m.ManifestUpdate); } InstallWorkloadsWithInstallRecord(_workloadInstaller, workloadIds, _sdkFeatureBand, manifestsToUpdate, offlineCache, useRollback); diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index da18d53e4e6d..63317155864f 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Text.Json; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; @@ -12,6 +13,7 @@ using Microsoft.NET.Sdk.WorkloadManifestReader; using NuGet.Common; using NuGet.Versioning; +using WorkloadCollection = System.Collections.Generic.Dictionary; namespace Microsoft.DotNet.Workloads.Workload.Install { @@ -22,7 +24,6 @@ internal class WorkloadManifestUpdater : IWorkloadManifestUpdater private readonly INuGetPackageDownloader _nugetPackageDownloader; private readonly SdkFeatureBand _sdkFeatureBand; private readonly string _userProfileDir; - private readonly string _tempDirPath; private readonly PackageSourceLocation _packageSourceLocation; Func _getEnvironmentVariable; private readonly IWorkloadInstallationRecordRepository _workloadRecordRepo; @@ -33,7 +34,6 @@ public WorkloadManifestUpdater(IReporter reporter, IWorkloadResolver workloadResolver, INuGetPackageDownloader nugetPackageDownloader, string userProfileDir, - string tempDirPath, IWorkloadInstallationRecordRepository workloadRecordRepo, IWorkloadManifestInstaller workloadManifestInstaller, PackageSourceLocation packageSourceLocation = null, @@ -44,7 +44,6 @@ public WorkloadManifestUpdater(IReporter reporter, _reporter = reporter; _workloadResolver = workloadResolver; _userProfileDir = userProfileDir; - _tempDirPath = tempDirPath; _nugetPackageDownloader = nugetPackageDownloader; _sdkFeatureBand = sdkFeatureBand ?? new SdkFeatureBand(_workloadResolver.GetSdkFeatureBand()); _packageSourceLocation = packageSourceLocation; @@ -72,15 +71,14 @@ private static WorkloadManifestUpdater GetInstance(string userProfileDir) workloadResolver, VerbosityOptions.normal, userProfileDir, verifySignatures: false); var workloadRecordRepo = installer.GetWorkloadInstallationRecordRepository(); - return new WorkloadManifestUpdater(reporter, workloadResolver, nugetPackageDownloader, userProfileDir, tempPackagesDir.Value, workloadRecordRepo, installer); + return new WorkloadManifestUpdater(reporter, workloadResolver, nugetPackageDownloader, userProfileDir, workloadRecordRepo, installer); } public async Task UpdateAdvertisingManifestsAsync(bool includePreviews, DirectoryPath? offlineCache = null) { // this updates all the manifests var manifests = _workloadResolver.GetInstalledManifests(); - await Task.WhenAll(manifests.Select(manifest => UpdateAdvertisingManifestAsync(manifest, includePreviews, offlineCache))) - .ConfigureAwait(false); + await Task.WhenAll(manifests.Select(manifest => UpdateAdvertisingManifestAsync(manifest, includePreviews, offlineCache))).ConfigureAwait(false); WriteUpdatableWorkloadsFile(); } @@ -161,37 +159,26 @@ public static void AdvertiseWorkloadUpdates() } } - public IEnumerable<( - ManifestVersionUpdate manifestUpdate, - Dictionary Workloads - )> - CalculateManifestUpdates() + public IEnumerable CalculateManifestUpdates() { - var manifestUpdates = - new List<(ManifestVersionUpdate manifestUpdate, - Dictionary Workloads)>(); var currentManifestIds = GetInstalledManifestIds(); foreach (var manifestId in currentManifestIds) { - var currentManifestVersion = GetInstalledManifestVersion(manifestId); - var advertisingManifestVersionAndWorkloads = GetAdvertisingManifestVersionAndWorkloads(manifestId); - if (advertisingManifestVersionAndWorkloads == null) + var (installedVersion, installedBand) = GetInstalledManifestVersion(manifestId); + var advertisingInfo = GetAdvertisingManifestVersionAndWorkloads(manifestId); + if (advertisingInfo == null) { continue; } + var ((adVersion, adBand), adWorkloads) = advertisingInfo.Value; - if (advertisingManifestVersionAndWorkloads != null && - ((advertisingManifestVersionAndWorkloads.Value.ManifestVersion.CompareTo(currentManifestVersion.manifestVersion) > 0 - && advertisingManifestVersionAndWorkloads.Value.ManifestFeatureBand.Equals(currentManifestVersion.sdkFeatureBand)) || - advertisingManifestVersionAndWorkloads.Value.ManifestFeatureBand.CompareTo(currentManifestVersion.sdkFeatureBand) > 0)) + if ((adVersion.CompareTo(installedVersion) > 0 && adBand.Equals(installedBand)) || + adBand.CompareTo(installedBand) > 0) { - manifestUpdates.Add((new ManifestVersionUpdate(manifestId, currentManifestVersion.manifestVersion, currentManifestVersion.sdkFeatureBand.ToString(), - advertisingManifestVersionAndWorkloads.Value.ManifestVersion, advertisingManifestVersionAndWorkloads.Value.ManifestFeatureBand.ToString()), - advertisingManifestVersionAndWorkloads.Value.Workloads)); + var update = new ManifestVersionUpdate(manifestId, installedVersion, installedBand.ToString(), adVersion, adBand.ToString()); + yield return new(update, adWorkloads); } } - - return manifestUpdates; } public IEnumerable GetUpdatableWorkloadsToAdvertise(IEnumerable installedWorkloads) @@ -213,20 +200,19 @@ public IEnumerable CalculateManifestRollbacks(string roll var currentManifestIds = GetInstalledManifestIds(); var manifestRollbacks = ParseRollbackDefinitionFile(rollbackDefinitionFilePath); - var unrecognizedManifestIds = manifestRollbacks.Where(rollbackManifest => !currentManifestIds.Contains(rollbackManifest.Item1)); + var unrecognizedManifestIds = manifestRollbacks.Where(rollbackManifest => !currentManifestIds.Contains(rollbackManifest.Id)); if (unrecognizedManifestIds.Any()) { _reporter.WriteLine(string.Format(LocalizableStrings.RollbackDefinitionContainsExtraneousManifestIds, rollbackDefinitionFilePath, string.Join(" ", unrecognizedManifestIds)).Yellow()); - manifestRollbacks = manifestRollbacks.Where(rollbackManifest => currentManifestIds.Contains(rollbackManifest.Item1)); + manifestRollbacks = manifestRollbacks.Where(rollbackManifest => currentManifestIds.Contains(rollbackManifest.Id)); } - var manifestUpdates = manifestRollbacks - .Select(manifest => - { - var installedManifestInfo = GetInstalledManifestVersion(manifest.id); - return new ManifestVersionUpdate(manifest.id, installedManifestInfo.manifestVersion, installedManifestInfo.sdkFeatureBand.ToString(), - manifest.version, manifest.featureBand.ToString()); - }); + var manifestUpdates = manifestRollbacks.Select(manifest => + { + var (id, (version, band)) = manifest; + var (installedVersion, installedBand) = GetInstalledManifestVersion(id); + return new ManifestVersionUpdate(id, installedVersion, installedBand.ToString(), version, band.ToString()); + }); return manifestUpdates; } @@ -285,10 +271,7 @@ public async Task> GetManifestPackageDownloadsAsyn return downloads; } - private IEnumerable GetInstalledManifestIds() - { - return _workloadResolver.GetInstalledManifests().Select(manifest => new ManifestId(manifest.Id)); - } + private IEnumerable GetInstalledManifestIds() => _workloadResolver.GetInstalledManifests().Select(manifest => new ManifestId(manifest.Id)); private async Task UpdateAdvertisingManifestAsync(WorkloadManifestInfo manifest, bool includePreviews, DirectoryPath? offlineCache = null) { @@ -354,44 +337,41 @@ private async Task UpdateAdvertisingManifestAsync(WorkloadManifestInfo manifest, } } - private (ManifestVersion ManifestVersion, SdkFeatureBand ManifestFeatureBand, Dictionary Workloads)? - GetAdvertisingManifestVersionAndWorkloads(ManifestId manifestId) + private (ManifestVersionWithBand ManifestWithBand, WorkloadCollection Workloads)? GetAdvertisingManifestVersionAndWorkloads(ManifestId manifestId) { - var manifestPath = Path.Combine(GetAdvertisingManifestPath(_sdkFeatureBand, manifestId), - "WorkloadManifest.json"); + var manifestPath = Path.Combine(GetAdvertisingManifestPath(_sdkFeatureBand, manifestId), "WorkloadManifest.json"); if (!File.Exists(manifestPath)) { return null; } - using (FileStream fsSource = new FileStream(manifestPath, FileMode.Open, FileAccess.Read)) - { - var manifest = WorkloadManifestReader.ReadWorkloadManifest(manifestId.ToString(), fsSource, manifestPath); - // we need to know the feature band of the advertised manifest (read it from the AdvertisedManifestFeatureBand.txt file) - // if we don't find the file then use the current feature band - var adManifestFeatureBandPath = Path.Combine(GetAdvertisingManifestPath(_sdkFeatureBand, manifestId), "AdvertisedManifestFeatureBand.txt"); - - SdkFeatureBand adManifestFeatureBand = _sdkFeatureBand; - if (File.Exists(adManifestFeatureBandPath)) - { - adManifestFeatureBand = new SdkFeatureBand(File.ReadAllText(adManifestFeatureBandPath)); - } - + using FileStream fsSource = new(manifestPath, FileMode.Open, FileAccess.Read); + var manifest = WorkloadManifestReader.ReadWorkloadManifest(manifestId.ToString(), fsSource, manifestPath); + // we need to know the feature band of the advertised manifest (read it from the AdvertisedManifestFeatureBand.txt file) + // if we don't find the file then use the current feature band + var adManifestFeatureBandPath = Path.Combine(GetAdvertisingManifestPath(_sdkFeatureBand, manifestId), "AdvertisedManifestFeatureBand.txt"); - return (new ManifestVersion(manifest.Version), adManifestFeatureBand, manifest.Workloads.Values.OfType().ToDictionary(w => w.Id)); + SdkFeatureBand adManifestFeatureBand = _sdkFeatureBand; + if (File.Exists(adManifestFeatureBandPath)) + { + adManifestFeatureBand = new SdkFeatureBand(File.ReadAllText(adManifestFeatureBandPath)); } + + ManifestVersionWithBand manifestWithBand = new(new ManifestVersion(manifest.Version), adManifestFeatureBand); + var workloads = manifest.Workloads.Values.OfType().ToDictionary(w => w.Id); + return (manifestWithBand, workloads); } - private (ManifestVersion manifestVersion, SdkFeatureBand sdkFeatureBand) GetInstalledManifestVersion(ManifestId manifestId) + private ManifestVersionWithBand GetInstalledManifestVersion(ManifestId manifestId) { - - var manifest = _workloadResolver.GetInstalledManifests() - .FirstOrDefault(manifest => manifest.Id.ToLowerInvariant().Equals(manifestId.ToString())); + var manifest = _workloadResolver.GetInstalledManifests().FirstOrDefault(manifest => manifest.Id.ToLowerInvariant().Equals(manifestId.ToString())); if (manifest == null) { throw new Exception(string.Format(LocalizableStrings.ManifestDoesNotExist, manifestId.ToString())); } - return (new ManifestVersion(manifest.Version), new SdkFeatureBand(manifest.ManifestFeatureBand)); + var version = new ManifestVersion(manifest.Version); + var band = new SdkFeatureBand(manifest.ManifestFeatureBand); + return new(version, band); } private bool AdManifestSentinelIsDueForUpdate() @@ -418,8 +398,7 @@ private bool AdManifestSentinelIsDueForUpdate() private async Task UpdatedAdManifestPackagesExistAsync() { var manifests = GetInstalledManifestIds(); - var availableUpdates = await Task.WhenAll(manifests.Select(manifest => NewerManifestPackageExists(manifest))) - .ConfigureAwait(false); + var availableUpdates = await Task.WhenAll(manifests.Select(manifest => NewerManifestPackageExists(manifest))).ConfigureAwait(false); return availableUpdates.Any(); } @@ -437,7 +416,7 @@ private async Task NewerManifestPackageExists(ManifestId manifest) } } - private IEnumerable<(ManifestId id, ManifestVersion version, SdkFeatureBand featureBand)> ParseRollbackDefinitionFile(string rollbackDefinitionFilePath) + private IEnumerable<(ManifestId Id, ManifestVersionWithBand ManifestWithBand)> ParseRollbackDefinitionFile(string rollbackDefinitionFilePath) { string fileContent; @@ -457,12 +436,11 @@ private async Task NewerManifestPackageExists(ManifestId manifest) } } - return WorkloadSet.FromJson(fileContent, _sdkFeatureBand).ManifestVersions - .Select(kvp => (kvp.Key, kvp.Value.Version, kvp.Value.FeatureBand)); + var versions = WorkloadSet.FromJson(fileContent, _sdkFeatureBand).ManifestVersions; + return versions.Select(kvp => (kvp.Key, new ManifestVersionWithBand(kvp.Value.Version, kvp.Value.FeatureBand))); } - private bool BackgroundUpdatesAreDisabled() => - bool.TryParse(_getEnvironmentVariable(EnvironmentVariableNames.WORKLOAD_UPDATE_NOTIFY_DISABLE), out var disableEnvVar) && disableEnvVar; + private bool BackgroundUpdatesAreDisabled() => bool.TryParse(_getEnvironmentVariable(EnvironmentVariableNames.WORKLOAD_UPDATE_NOTIFY_DISABLE), out var disableEnvVar) && disableEnvVar; private string GetAdvertisingManifestSentinelPath(SdkFeatureBand featureBand) => Path.Combine(_userProfileDir, $".workloadAdvertisingManifestSentinel{featureBand}"); @@ -483,9 +461,12 @@ private async Task GetOnlinePackagePath(SdkFeatureBand sdkFeatureBand, M private string GetOfflinePackagePath(SdkFeatureBand sdkFeatureBand, ManifestId manifestId, DirectoryPath? offlineCache = null) { string packagePath = Directory.GetFiles(offlineCache.Value.Value) - .Where(path => path.EndsWith(".nupkg")) .Where(path => { + if (!path.EndsWith(".nupkg")) + { + return false; + } var manifestPackageId = _workloadManifestInstaller.GetManifestPackageId(manifestId, sdkFeatureBand).ToString(); return Path.GetFileName(path).StartsWith(manifestPackageId, StringComparison.OrdinalIgnoreCase); }) @@ -494,43 +475,40 @@ private string GetOfflinePackagePath(SdkFeatureBand sdkFeatureBand, ManifestId m return packagePath; } - private async Task<(bool, string)> GetManifestPackageUpdate(SdkFeatureBand sdkFeatureBand, ManifestId manifestId, bool includePreviews, DirectoryPath? offlineCache = null) + private async Task<(bool Success, string PackagePath)> GetManifestPackageUpdate(SdkFeatureBand sdkFeatureBand, ManifestId manifestId, bool includePreviews, DirectoryPath? offlineCache = null) { if (offlineCache == null || !offlineCache.HasValue) { try { - string packagePath = await GetOnlinePackagePath(sdkFeatureBand, manifestId, includePreviews); - return (true, packagePath); + string onlinePath = await GetOnlinePackagePath(sdkFeatureBand, manifestId, includePreviews); + return (Success: true, PackagePath: onlinePath); } catch (NuGetPackageNotFoundException) { - return (false, null); + return (Success: false, PackagePath: null); } } - else - { - string packagePath = GetOfflinePackagePath(sdkFeatureBand, manifestId, offlineCache); - return (packagePath != null, packagePath); - } + + string offlinePath = GetOfflinePackagePath(sdkFeatureBand, manifestId, offlineCache); + return (Success: offlinePath != null, PackagePath: offlinePath); } - private async Task<(bool, NuGetVersion)> GetPackageVersion(PackageId packageId, PackageSourceLocation packageSourceLocation = null, bool includePreview = false) + private async Task<(bool Success, NuGetVersion LatestVersion)> GetPackageVersion(PackageId packageId, PackageSourceLocation packageSourceLocation = null, bool includePreview = false) { try { - var latestVersion = await _nugetPackageDownloader.GetLatestPackageVersion(packageId, packageSourceLocation: _packageSourceLocation, includePreview: includePreview); - return (true, latestVersion); + var latestVersion = await _nugetPackageDownloader.GetLatestPackageVersion(packageId, packageSourceLocation: packageSourceLocation, includePreview: includePreview); + return (Success: true, LatestVersion: latestVersion); } catch (NuGetPackageNotFoundException) { - return (false, null); + return (Success: false, LatestVersion: null); } - } + private string GetAdvertisingManifestPath(SdkFeatureBand featureBand, ManifestId manifestId) => Path.Combine(_userProfileDir, "sdk-advertising", featureBand.ToString(), manifestId.ToString()); - private string GetAdvertisingManifestPath(SdkFeatureBand featureBand, ManifestId manifestId) => - Path.Combine(_userProfileDir, "sdk-advertising", featureBand.ToString(), manifestId.ToString()); + private record ManifestVersionWithBand(ManifestVersion Version, SdkFeatureBand Band); } } diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs index 42fb65445dd7..5d98661d4359 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs @@ -12,6 +12,7 @@ using Microsoft.NET.Sdk.WorkloadManifestReader; using Microsoft.TemplateEngine.Cli.Commands; using InformationStrings = Microsoft.DotNet.Workloads.Workload.LocalizableStrings; +using WorkloadCollection = System.Collections.Generic.Dictionary; namespace Microsoft.DotNet.Workloads.Workload.List { @@ -54,7 +55,7 @@ public WorkloadListCommand( string userProfileDir1 = userProfileDir ?? CliFolderPathCalculator.DotnetUserProfileFolderPath; _workloadManifestUpdater = workloadManifestUpdater ?? new WorkloadManifestUpdater(Reporter, - _workloadListHelper.WorkloadResolver, PackageDownloader, userProfileDir1, TempDirectoryPath, _workloadListHelper.WorkloadRecordRepo, _workloadListHelper.Installer); + _workloadListHelper.WorkloadResolver, PackageDownloader, userProfileDir1, _workloadListHelper.WorkloadRecordRepo, _workloadListHelper.Installer); } public override int Execute() @@ -65,9 +66,9 @@ public override int Execute() { _workloadListHelper.CheckTargetSdkVersionIsValid(); - UpdateAvailableEntry[] updateAvailable = GetUpdateAvailable(installedList); - ListOutput listOutput = new(installedList.Select(id => id.ToString()).ToArray(), - updateAvailable); + var updateAvailable = GetUpdateAvailable(installedList); + var installed = installedList.Select(id => id.ToString()).ToArray(); + ListOutput listOutput = new(installed, updateAvailable.ToArray()); Reporter.WriteLine("==workloadListJsonOutputStart=="); Reporter.WriteLine( @@ -108,29 +109,23 @@ public override int Execute() return 0; } - internal UpdateAvailableEntry[] GetUpdateAvailable(IEnumerable installedList) + internal IEnumerable GetUpdateAvailable(IEnumerable installedList) { - HashSet installedWorkloads = installedList.ToHashSet(); _workloadManifestUpdater.UpdateAdvertisingManifestsAsync(_includePreviews).Wait(); - var manifestsToUpdate = - _workloadManifestUpdater.CalculateManifestUpdates(); + var manifestsToUpdate = _workloadManifestUpdater.CalculateManifestUpdates(); - List updateList = new(); - foreach ((ManifestVersionUpdate manifestUpdate, Dictionary workloads) in manifestsToUpdate) + foreach ((ManifestVersionUpdate manifestUpdate, WorkloadCollection workloads) in manifestsToUpdate) { - foreach ((WorkloadId WorkloadId, WorkloadDefinition workloadDefinition) in - workloads) + foreach ((WorkloadId workloadId, WorkloadDefinition workloadDefinition) in workloads) { - if (installedWorkloads.Contains(new WorkloadId(WorkloadId.ToString()))) + if (installedList.Contains(workloadId)) { - updateList.Add(new UpdateAvailableEntry(manifestUpdate.ExistingVersion.ToString(), + yield return new UpdateAvailableEntry(manifestUpdate.ExistingVersion.ToString(), manifestUpdate.NewVersion.ToString(), - workloadDefinition.Description, WorkloadId.ToString())); + workloadDefinition.Description, workloadId.ToString()); } } } - - return updateList.ToArray(); } internal record ListOutput(string[] Installed, UpdateAvailableEntry[] UpdateAvailable); diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index 03930eb5c5b0..691ae4603b09 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -42,7 +42,7 @@ public WorkloadUpdateCommand( _dotnetPath, TempDirectoryPath, packageSourceLocation: _packageSourceLocation, RestoreActionConfiguration, elevationRequired: !_printDownloadLinkOnly && !_printRollbackDefinitionOnly && string.IsNullOrWhiteSpace(_downloadToCacheOption)); - _workloadManifestUpdater = _workloadManifestUpdaterFromConstructor ?? new WorkloadManifestUpdater(Reporter, _workloadResolver, PackageDownloader, _userProfileDir, TempDirectoryPath, + _workloadManifestUpdater = _workloadManifestUpdaterFromConstructor ?? new WorkloadManifestUpdater(Reporter, _workloadResolver, PackageDownloader, _userProfileDir, _workloadInstaller.GetWorkloadInstallationRecordRepository(), _workloadInstaller, _packageSourceLocation, sdkFeatureBand: _sdkFeatureBand); } @@ -108,7 +108,7 @@ public void UpdateWorkloads(bool includePreviews = false, DirectoryPath? offline var manifestsToUpdate = useRollback ? _workloadManifestUpdater.CalculateManifestRollbacks(_fromRollbackDefinition) : - _workloadManifestUpdater.CalculateManifestUpdates().Select(m => m.manifestUpdate); + _workloadManifestUpdater.CalculateManifestUpdates().Select(m => m.ManifestUpdate); UpdateWorkloadsWithInstallRecord(_sdkFeatureBand, manifestsToUpdate, useRollback, offlineCache); diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadId.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadId.cs index 948b8ec928ae..c6adcff13fbc 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadId.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/WorkloadId.cs @@ -4,7 +4,7 @@ namespace Microsoft.NET.Sdk.WorkloadManifestReader { /// - /// Wraps a workload definition id string to help ensure consistency of behaviour/semantics. + /// Wraps a workload definition id string to help ensure consistency of behavior/semantics. /// Comparisons are case insensitive but ToString() will return the original string for display purposes. /// public readonly struct WorkloadId : IComparable, IEquatable diff --git a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs index b619e67e1e3e..cc219543e599 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs @@ -169,10 +169,10 @@ public void GivenNoWorkloadsInstalledInfoOptionRemarksOnThat() // However, we can test a setup where no workloads are installed and --info is provided. _reporter.Clear(); - var mockWorkloadIds = new WorkloadId[] { new WorkloadId("xamarin-android"), new WorkloadId("xamarin-android-build") }; + _ = new WorkloadId[] { new WorkloadId("xamarin-android"), new WorkloadId("xamarin-android-build") }; var testDirectory = _testAssetsManager.CreateTestDirectory().Path; var dotnetRoot = Path.Combine(testDirectory, "dotnet"); - var installer = new MockPackWorkloadInstaller(); + _ = new MockPackWorkloadInstaller(); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(new[] { _manifestPath }), dotnetRoot); var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android"}); @@ -207,18 +207,17 @@ public void GivenWorkloadInstallItCanUpdateInstalledManifests(bool userLocal, st Parser.Instance.Parse(new string[] {"dotnet", "workload", "install", "xamarin-android"}); var featureBand = new SdkFeatureBand(sdkVersion); var manifestsToUpdate = - new (ManifestVersionUpdate manifestUpdate, Dictionary Workloads)[] + new ManifestUpdateWithWorkloads[] { - (new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("1.0.0"), featureBand.ToString(), new ManifestVersion("2.0.0"), featureBand.ToString()), - null), + new(new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("1.0.0"), featureBand.ToString(), new ManifestVersion("2.0.0"), featureBand.ToString()), null), }; (_, var installManager, var installer, _, _, _) = GetTestInstallers(parseResult, userLocal, sdkVersion, manifestUpdates: manifestsToUpdate, installedFeatureBand: sdkVersion); installManager.InstallWorkloads(new List(), false); // Don't actually do any installs, just update manifests - installer.InstalledManifests[0].manifestUpdate.ManifestId.Should().Be(manifestsToUpdate[0].manifestUpdate.ManifestId); - installer.InstalledManifests[0].manifestUpdate.NewVersion.Should().Be(manifestsToUpdate[0].manifestUpdate.NewVersion); + installer.InstalledManifests[0].manifestUpdate.ManifestId.Should().Be(manifestsToUpdate[0].ManifestUpdate.ManifestId); + installer.InstalledManifests[0].manifestUpdate.NewVersion.Should().Be(manifestsToUpdate[0].ManifestUpdate.NewVersion); installer.InstalledManifests[0].manifestUpdate.NewFeatureBand.Should().Be(new SdkFeatureBand(sdkVersion).ToString()); installer.InstalledManifests[0].offlineCache.Should().Be(null); } @@ -232,11 +231,9 @@ public void GivenWorkloadInstallFromCacheItInstallsCachedManifest(bool userLocal { var featureBand = new SdkFeatureBand(sdkVersion); var manifestsToUpdate = - new (ManifestVersionUpdate manifestUpdate, Dictionary - Workloads)[] + new ManifestUpdateWithWorkloads[] { - (new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("1.0.0"), featureBand.ToString(), new ManifestVersion("2.0.0"), featureBand.ToString()), - null) + new(new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("1.0.0"), featureBand.ToString(), new ManifestVersion("2.0.0"), featureBand.ToString()), null) }; var cachePath = Path.Combine(_testAssetsManager.CreateTestDirectory(identifier: AppendForUserLocal("mockCache_", userLocal) + sdkVersion).Path, "mockCachePath"); @@ -249,8 +246,8 @@ public void GivenWorkloadInstallFromCacheItInstallsCachedManifest(bool userLocal installManager.Execute(); - installer.InstalledManifests[0].manifestUpdate.ManifestId.Should().Be(manifestsToUpdate[0].manifestUpdate.ManifestId); - installer.InstalledManifests[0].manifestUpdate.NewVersion.Should().Be(manifestsToUpdate[0].manifestUpdate.NewVersion); + installer.InstalledManifests[0].manifestUpdate.ManifestId.Should().Be(manifestsToUpdate[0].ManifestUpdate.ManifestId); + installer.InstalledManifests[0].manifestUpdate.NewVersion.Should().Be(manifestsToUpdate[0].ManifestUpdate.NewVersion); installer.InstalledManifests[0].manifestUpdate.NewFeatureBand.Should().Be(new SdkFeatureBand(sdkVersion).ToString()); installer.InstalledManifests[0].offlineCache.Should().Be(new DirectoryPath(cachePath)); } @@ -264,7 +261,7 @@ public void GivenWorkloadInstallItCanDownloadToOfflineCache(bool userLocal, stri { var cachePath = Path.Combine(_testAssetsManager.CreateTestDirectory(identifier: AppendForUserLocal("mockCache_", userLocal) + sdkVersion).Path, "mockCachePath"); var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android", "--download-to-cache", cachePath }); - (_, var installManager, var installer, _, var manifestUpdater, var packageDownloader) = GetTestInstallers(parseResult, userLocal, sdkVersion, tempDirManifestPath: _manifestPath, installedFeatureBand: sdkVersion); + (_, var installManager, _, _, var manifestUpdater, var packageDownloader) = GetTestInstallers(parseResult, userLocal, sdkVersion, tempDirManifestPath: _manifestPath, installedFeatureBand: sdkVersion); installManager.Execute(); @@ -457,7 +454,7 @@ static void CreateFile(string path) string sdkVersion, [CallerMemberName] string testName = "", string failingWorkload = null, - IEnumerable<(ManifestVersionUpdate manifestUpdate, Dictionary Workloads)> manifestUpdates = null, + IEnumerable manifestUpdates = null, string tempDirManifestPath = null, string installedFeatureBand = null) { @@ -472,7 +469,7 @@ static void CreateFile(string path) }; var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); - var manifestUpdater = new MockWorkloadManifestUpdater(manifestUpdates, tempDirManifestPath); + var manifestUpdater = new MockWorkloadManifestUpdater(manifestUpdates); if (userLocal) { WorkloadFileBasedInstall.SetUserLocal(dotnetRoot, sdkVersion); @@ -593,13 +590,11 @@ public void ShowManifestUpdatesWhenVerbosityIsDetailedOrDiagnostic(string verbos var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", verbosityFlag, "xamarin-android" }); var manifestsToUpdate = - new (ManifestVersionUpdate manifestUpdate, Dictionary - Workloads)[] + new ManifestUpdateWithWorkloads[] { - (new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("1.0.0"), sdkFeatureBand, new ManifestVersion("2.0.0"), sdkFeatureBand), - null), + new(new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("1.0.0"), sdkFeatureBand, new ManifestVersion("2.0.0"), sdkFeatureBand), null), }; - (_, var installManager, var installer, _, _, _) = + (_, var installManager, _, _, _, _) = GetTestInstallers(parseResult, true, sdkFeatureBand, manifestUpdates: manifestsToUpdate); installManager.InstallWorkloads(new List(), false); // Don't actually do any installs, just update manifests diff --git a/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs b/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs index b9b9b8eb969d..0715c0e70a55 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs @@ -124,9 +124,9 @@ public void GivenWorkloadManifestUpdateItCanCalculateUpdates() var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, userProfileDir: Path.Combine(testDir, ".dotnet"), testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, userProfileDir: Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); - var manifestUpdates = manifestUpdater.CalculateManifestUpdates().Select( m => m.manifestUpdate); + var manifestUpdates = manifestUpdater.CalculateManifestUpdates().Select(m => m.ManifestUpdate); manifestUpdates.Should().BeEquivalentTo(expectedManifestUpdates); } @@ -191,9 +191,9 @@ public void GivenAdvertisedManifestsItCalculatesCorrectUpdates() var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, userProfileDir: Path.Combine(testDir, ".dotnet"), testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, userProfileDir: Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); - var manifestUpdates = manifestUpdater.CalculateManifestUpdates().Select(m => m.manifestUpdate); + var manifestUpdates = manifestUpdater.CalculateManifestUpdates().Select(m => m.ManifestUpdate); manifestUpdates.Should().BeEquivalentTo(expectedManifestUpdates); } @@ -233,7 +233,7 @@ public void ItCanFallbackAndAdvertiseCorrectUpdate(bool useOfflineCache) var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); nugetDownloader.PackageIdsToNotFind.Add($"{testManifestName}.Manifest-6.0.300"); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); var offlineCacheDir = ""; if (useOfflineCache) @@ -310,7 +310,7 @@ public void ItCanFallbackWithNoUpdates(bool useOfflineCache) var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); var offlineCacheDir = ""; if (useOfflineCache) @@ -377,7 +377,7 @@ public void GivenNoUpdatesAreAvailableAndNoRollbackItGivesAppropriateMessage(boo var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); var offlineCacheDir = ""; if (useOfflineCache) @@ -440,7 +440,7 @@ public void GivenWorkloadManifestRollbackItCanCalculateUpdates() var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller()); var manifestUpdates = manifestUpdater.CalculateManifestRollbacks(rollbackDefPath); manifestUpdates.Should().BeEquivalentTo(expectedManifestUpdates); @@ -483,7 +483,7 @@ public void GivenFromRollbackDefinitionItErrorsOnInstalledExtraneousManifestId() var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(Array.Empty()), dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller()); manifestUpdater.CalculateManifestRollbacks(rollbackDefPath); string.Join(" ", _reporter.Lines).Should().Contain(rollbackDefPath); @@ -525,7 +525,7 @@ public void GivenFromRollbackDefinitionItErrorsOnExtraneousManifestIdInRollbackD var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(Array.Empty()), dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller()); manifestUpdater.CalculateManifestRollbacks(rollbackDefPath); string.Join(" ", _reporter.Lines).Should().Contain(rollbackDefPath); @@ -557,7 +557,7 @@ public void GivenWorkloadManifestUpdateItChoosesHighestManifestVersionInCache() var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); var installer = new MockPackWorkloadInstaller(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, testDir, installationRepo, installer); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, installer); manifestUpdater.UpdateAdvertisingManifestsAsync(false, new DirectoryPath(offlineCache)).Wait(); // We should have chosen the higher version manifest package to install/ extract @@ -709,7 +709,7 @@ public void TestSideBySideUpdateChecks() var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, testDir, installationRepo, new MockPackWorkloadInstaller(), getEnvironmentVariable: getEnvironmentVariable); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller(), getEnvironmentVariable: getEnvironmentVariable); var sentinelPath = Path.Combine(testDir, _manifestSentinelFileName + featureBand); return (manifestUpdater, nugetDownloader, sentinelPath); diff --git a/src/Tests/dotnet-workload-install.Tests/MockWorkloadManifestUpdater.cs b/src/Tests/dotnet-workload-install.Tests/MockWorkloadManifestUpdater.cs index d3e2bf8a3b6f..6a3d90073c64 100644 --- a/src/Tests/dotnet-workload-install.Tests/MockWorkloadManifestUpdater.cs +++ b/src/Tests/dotnet-workload-install.Tests/MockWorkloadManifestUpdater.cs @@ -12,16 +12,11 @@ internal class MockWorkloadManifestUpdater : IWorkloadManifestUpdater public int UpdateAdvertisingManifestsCallCount = 0; public int CalculateManifestUpdatesCallCount = 0; public int GetManifestPackageDownloadsCallCount = 0; - private IEnumerable<(ManifestVersionUpdate manifestUpdate, - Dictionary Workloads)> _manifestUpdates; - private string _tempDirManifestPath; + private readonly IEnumerable _manifestUpdates; - public MockWorkloadManifestUpdater(IEnumerable<(ManifestVersionUpdate manifestUpdate, - Dictionary Workloads)> manifestUpdates = null, string tempDirManifestPath = null) + public MockWorkloadManifestUpdater(IEnumerable manifestUpdates = null) { - _manifestUpdates = manifestUpdates ?? new List<(ManifestVersionUpdate manifestUpdate, - Dictionary Workloads)>(); - _tempDirManifestPath = tempDirManifestPath; + _manifestUpdates = manifestUpdates ?? new List(); } public Task UpdateAdvertisingManifestsAsync(bool includePreview, DirectoryPath? cachePath = null) @@ -30,9 +25,7 @@ public Task UpdateAdvertisingManifestsAsync(bool includePreview, DirectoryPath? return Task.CompletedTask; } - public IEnumerable<( - ManifestVersionUpdate manifestUpdate, - Dictionary Workloads)> CalculateManifestUpdates() + public IEnumerable CalculateManifestUpdates() { CalculateManifestUpdatesCallCount++; return _manifestUpdates; @@ -49,11 +42,11 @@ public Task> GetManifestPackageDownloadsAsync(bool public IEnumerable CalculateManifestRollbacks(string rollbackDefinitionFilePath) { - return _manifestUpdates.Select(t => t.manifestUpdate); + return _manifestUpdates.Select(t => t.ManifestUpdate); } - public Task BackgroundUpdateAdvertisingManifestsWhenRequiredAsync() => throw new System.NotImplementedException(); - public IEnumerable GetUpdatableWorkloadsToAdvertise(IEnumerable installedWorkloads) => throw new System.NotImplementedException(); + public Task BackgroundUpdateAdvertisingManifestsWhenRequiredAsync() => throw new NotImplementedException(); + public IEnumerable GetUpdatableWorkloadsToAdvertise(IEnumerable installedWorkloads) => throw new NotImplementedException(); public void DeleteUpdatableWorkloadsFile() { } } } diff --git a/src/Tests/dotnet-workload-list.Tests/GivenWorkloadInstallerAndWorkloadsInstalled.cs b/src/Tests/dotnet-workload-list.Tests/GivenWorkloadInstallerAndWorkloadsInstalled.cs index 98e467085595..c282c8f39e4e 100644 --- a/src/Tests/dotnet-workload-list.Tests/GivenWorkloadInstallerAndWorkloadsInstalled.cs +++ b/src/Tests/dotnet-workload-list.Tests/GivenWorkloadInstallerAndWorkloadsInstalled.cs @@ -6,9 +6,11 @@ using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.Workload.Install.Tests; using Microsoft.DotNet.Workloads.Workload; +using Microsoft.DotNet.Workloads.Workload.Install; using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; using Microsoft.DotNet.Workloads.Workload.List; using Microsoft.NET.Sdk.WorkloadManifestReader; +using WorkloadCollection = System.Collections.Generic.Dictionary; namespace Microsoft.DotNet.Cli.Workload.Update.Tests { @@ -22,7 +24,7 @@ public class GivenInstalledWorkloadAndManifestUpdater : SdkTest private WorkloadListCommand _workloadListCommand; private string _testDirectory; - private List<(ManifestVersionUpdate manifestUpdate, Dictionary Workloads)> _mockManifestUpdates; + private List _mockManifestUpdates; private MockNuGetPackageDownloader _nugetDownloader; private string _dotnetRoot; @@ -40,14 +42,14 @@ private void Setup(string identifier) _mockManifestUpdates = new() { - ( + new( new ManifestVersionUpdate( new ManifestId("manifest1"), new ManifestVersion(CurrentSdkVersion), currentSdkFeatureBand.ToString(), new ManifestVersion(UpdateAvailableVersion), currentSdkFeatureBand.ToString()), - new Dictionary + new WorkloadCollection { [new WorkloadId(InstallingWorkload)] = new( new WorkloadId(InstallingWorkload), false, XamarinAndroidDescription, @@ -56,28 +58,28 @@ private void Setup(string identifier) new WorkloadId("other"), false, "other description", WorkloadDefinitionKind.Dev, null, null, null) }), - ( + new( new ManifestVersionUpdate( new ManifestId("manifest-other"), new ManifestVersion(CurrentSdkVersion), currentSdkFeatureBand.ToString(), new ManifestVersion("7.0.101"), currentSdkFeatureBand.ToString()), - new Dictionary + new WorkloadCollection { [new WorkloadId("other-manifest-workload")] = new( new WorkloadId("other-manifest-workload"), false, "other-manifest-workload description", WorkloadDefinitionKind.Dev, null, null, null) }), - ( + new( new ManifestVersionUpdate( new ManifestId("manifest-older-version"), new ManifestVersion(CurrentSdkVersion), currentSdkFeatureBand.ToString(), new ManifestVersion("6.0.100"), currentSdkFeatureBand.ToString()), - new Dictionary + new WorkloadCollection { [new WorkloadId("other-manifest-workload")] = new( new WorkloadId("other-manifest-workload"), false, @@ -107,7 +109,7 @@ public void ItShouldGetAvailableUpdate() { Setup(nameof(ItShouldGetAvailableUpdate)); WorkloadListCommand.UpdateAvailableEntry[] result = - _workloadListCommand.GetUpdateAvailable(new List {new("xamarin-android")}); + _workloadListCommand.GetUpdateAvailable(new List { new("xamarin-android") }).ToArray(); result.Should().NotBeEmpty(); result[0].WorkloadId.Should().Be(InstallingWorkload, "Only should installed workload"); diff --git a/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs b/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs index f9d4738eed6f..ea20fd8ae088 100644 --- a/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs +++ b/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs @@ -214,7 +214,7 @@ public void GivenWorkloadUpdateItCanDownloadToOfflineCache() var mockWorkloadIds = new WorkloadId[] { new WorkloadId("xamarin-android") }; var cachePath = Path.Combine(_testAssetsManager.CreateTestDirectory(identifier: "cachePath").Path, "mockCachePath"); var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "update", "--download-to-cache", cachePath }); - (_, var command, var installer, _, var manifestUpdater, var packageDownloader) = GetTestInstallers(parseResult, installedWorkloads: mockWorkloadIds, includeInstalledPacks: true, installedFeatureBand: "6.0.100"); + (_, var command, _, _, var manifestUpdater, var packageDownloader) = GetTestInstallers(parseResult, installedWorkloads: mockWorkloadIds, includeInstalledPacks: true, installedFeatureBand: "6.0.100"); command.Execute(); @@ -326,22 +326,19 @@ public void ApplyRollbackAcrossFeatureBand(string existingSdkFeatureBand, string var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "update", "--from-rollback-file", "rollback.json" }); var manifestsToUpdate = - new (ManifestVersionUpdate manifestUpdate, - Dictionary Workloads)[] + new ManifestUpdateWithWorkloads[] { - (new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("1.0.0"), existingSdkFeatureBand, new ManifestVersion("2.0.0"), newSdkFeatureBand), - null), + new(new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("1.0.0"), existingSdkFeatureBand, new ManifestVersion("2.0.0"), newSdkFeatureBand), null), }; - - (var dotnetPath, var updateCommand, var packInstaller, var workloadResolver, var workloadManifestUpdater, var nuGetPackageDownloader) = GetTestInstallers(parseResult, manifestUpdates: manifestsToUpdate, sdkVersion: "6.0.300", identifier: existingSdkFeatureBand + newSdkFeatureBand, installedFeatureBand: existingSdkFeatureBand); + (_, var updateCommand, var packInstaller, _, _, _) = GetTestInstallers(parseResult, manifestUpdates: manifestsToUpdate, sdkVersion: "6.0.300", identifier: existingSdkFeatureBand + newSdkFeatureBand, installedFeatureBand: existingSdkFeatureBand); updateCommand.UpdateWorkloads(); - packInstaller.InstalledManifests[0].manifestUpdate.ManifestId.Should().Be(manifestsToUpdate[0].manifestUpdate.ManifestId); - packInstaller.InstalledManifests[0].manifestUpdate.NewVersion.Should().Be(manifestsToUpdate[0].manifestUpdate.NewVersion); - packInstaller.InstalledManifests[0].manifestUpdate.NewFeatureBand.Should().Be(manifestsToUpdate[0].manifestUpdate.NewFeatureBand); - packInstaller.InstalledManifests[0].manifestUpdate.ExistingVersion.Should().Be(manifestsToUpdate[0].manifestUpdate.ExistingVersion); - packInstaller.InstalledManifests[0].manifestUpdate.ExistingFeatureBand.Should().Be(manifestsToUpdate[0].manifestUpdate.ExistingFeatureBand); + packInstaller.InstalledManifests[0].manifestUpdate.ManifestId.Should().Be(manifestsToUpdate[0].ManifestUpdate.ManifestId); + packInstaller.InstalledManifests[0].manifestUpdate.NewVersion.Should().Be(manifestsToUpdate[0].ManifestUpdate.NewVersion); + packInstaller.InstalledManifests[0].manifestUpdate.NewFeatureBand.Should().Be(manifestsToUpdate[0].ManifestUpdate.NewFeatureBand); + packInstaller.InstalledManifests[0].manifestUpdate.ExistingVersion.Should().Be(manifestsToUpdate[0].ManifestUpdate.ExistingVersion); + packInstaller.InstalledManifests[0].manifestUpdate.ExistingFeatureBand.Should().Be(manifestsToUpdate[0].ManifestUpdate.ExistingFeatureBand); packInstaller.InstalledManifests[0].offlineCache.Should().Be(null); var defaultJsonPath = Path.Combine(dotnetPath, "dotnet", "metadata", "workloads", "6.0.300", "InstallState", "default.json"); @@ -357,23 +354,18 @@ public void ApplyRollbackWithMultipleManifestsAcrossFeatureBand() var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "update", "--from-rollback-file", "rollback.json" }); var manifestsToUpdate = - new (ManifestVersionUpdate manifestUpdate, - Dictionary Workloads)[] + new ManifestUpdateWithWorkloads[] { - (new ManifestVersionUpdate(new ManifestId("mock-manifest-1"), new ManifestVersion("1.0.0"), "6.0.300", new ManifestVersion("2.0.0"), "6.0.100"), - null), - (new ManifestVersionUpdate(new ManifestId("mock-manifest-2"), new ManifestVersion("1.0.0"), "6.0.100", new ManifestVersion("2.0.0"), "6.0.300"), - null), - (new ManifestVersionUpdate(new ManifestId("mock-manifest-3"), new ManifestVersion("1.0.0"), "5.0.100", new ManifestVersion("2.0.0"), "6.0.100"), - null), + new(new ManifestVersionUpdate(new ManifestId("mock-manifest-1"), new ManifestVersion("1.0.0"), "6.0.300", new ManifestVersion("2.0.0"), "6.0.100"), null), + new(new ManifestVersionUpdate(new ManifestId("mock-manifest-2"), new ManifestVersion("1.0.0"), "6.0.100", new ManifestVersion("2.0.0"), "6.0.300"), null), + new(new ManifestVersionUpdate(new ManifestId("mock-manifest-3"), new ManifestVersion("1.0.0"), "5.0.100", new ManifestVersion("2.0.0"), "6.0.100"), null), }; - - (_, var updateCommand, var packInstaller, var workloadResolver, var workloadManifestUpdater, var nuGetPackageDownloader) = GetTestInstallers(parseResult, manifestUpdates: manifestsToUpdate, sdkVersion: "6.0.300", installedFeatureBand: "6.0.300"); + (_, var updateCommand, var packInstaller, _, _, _) = GetTestInstallers(parseResult, manifestUpdates: manifestsToUpdate, sdkVersion: "6.0.300", installedFeatureBand: "6.0.300"); updateCommand.UpdateWorkloads(); - packInstaller.InstalledManifests[0].manifestUpdate.ManifestId.Should().Be(manifestsToUpdate[0].manifestUpdate.ManifestId); - packInstaller.InstalledManifests[0].manifestUpdate.NewVersion.Should().Be(manifestsToUpdate[0].manifestUpdate.NewVersion); + packInstaller.InstalledManifests[0].manifestUpdate.ManifestId.Should().Be(manifestsToUpdate[0].ManifestUpdate.ManifestId); + packInstaller.InstalledManifests[0].manifestUpdate.NewVersion.Should().Be(manifestsToUpdate[0].ManifestUpdate.NewVersion); packInstaller.InstalledManifests[0].manifestUpdate.NewFeatureBand.Should().Be("6.0.100"); packInstaller.InstalledManifests[1].manifestUpdate.NewFeatureBand.Should().Be("6.0.300"); packInstaller.InstalledManifests[2].manifestUpdate.NewFeatureBand.Should().Be("6.0.100"); @@ -418,7 +410,7 @@ public void GivenInvalidVersionInRollbackFileItErrors() [CallerMemberName] string testName = "", string failingWorkload = null, string failingPack = null, - IEnumerable<(ManifestVersionUpdate manifestUpdate, Dictionary Workloads)> manifestUpdates = null, + IEnumerable manifestUpdates = null, IList installedWorkloads = null, bool includeInstalledPacks = false, string sdkVersion = "6.0.100", @@ -444,7 +436,7 @@ public void GivenInvalidVersionInRollbackFileItErrors() var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(new[] { copiedManifestFile }), dotnetRoot); installer.WorkloadResolver = workloadResolver; var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); - var manifestUpdater = new MockWorkloadManifestUpdater(manifestUpdates, _manifestPath); + var manifestUpdater = new MockWorkloadManifestUpdater(manifestUpdates); var workloadResolverFactory = new MockWorkloadResolverFactory(dotnetRoot, sdkVersion, workloadResolver, userProfileDir: testDirectory); From eba98e2ecdb4c3a238718cc2be877dbb07aa157b Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Wed, 4 Oct 2023 16:01:44 -0700 Subject: [PATCH 029/550] Refactored GetManifestPackageDownloadsAsync to be a loop. Cleaned up a few other minor things. --- .../install/WorkloadManifestUpdater.cs | 66 ++++++------------- 1 file changed, 21 insertions(+), 45 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index 63317155864f..fbd89cedc915 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using System.Text.Json; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; @@ -25,7 +24,7 @@ internal class WorkloadManifestUpdater : IWorkloadManifestUpdater private readonly SdkFeatureBand _sdkFeatureBand; private readonly string _userProfileDir; private readonly PackageSourceLocation _packageSourceLocation; - Func _getEnvironmentVariable; + private readonly Func _getEnvironmentVariable; private readonly IWorkloadInstallationRecordRepository _workloadRecordRepo; private readonly IWorkloadManifestInstaller _workloadManifestInstaller; private readonly bool _displayManifestUpdates; @@ -225,42 +224,33 @@ public async Task> GetManifestPackageDownloadsAsyn { try { - var packageId = _workloadManifestInstaller.GetManifestPackageId(new ManifestId(manifest.Id), providedSdkFeatureBand); - - bool success; - // After checking the --sdk-version, check the current sdk band, and then the manifest band in that order - (success, var latestVersion) = await GetPackageVersion(packageId, packageSourceLocation: _packageSourceLocation, includePreview: includePreviews); - if (success) - { - downloads.Add(new WorkloadDownload(manifest.Id, packageId.ToString(), latestVersion.ToString())); - } - - if (!success && !installedSdkFeatureBand.Equals(providedSdkFeatureBand)) + PackageId? providedPackageId = null; + var fallbackFeatureBand = new SdkFeatureBand(manifest.ManifestFeatureBand); + SdkFeatureBand[] bands = [providedSdkFeatureBand, installedSdkFeatureBand, fallbackFeatureBand]; + var success = false; + var bandIndex = 0; + do { - var newPackageId = _workloadManifestInstaller.GetManifestPackageId(new ManifestId(manifest.Id), installedSdkFeatureBand); - - (success, latestVersion) = await GetPackageVersion(newPackageId, packageSourceLocation: _packageSourceLocation, includePreview: includePreviews); + var packageId = _workloadManifestInstaller.GetManifestPackageId(new ManifestId(manifest.Id), bands[bandIndex]); + providedPackageId ??= packageId; - if (success) + try { - downloads.Add(new WorkloadDownload(manifest.Id, newPackageId.ToString(), latestVersion.ToString())); + var latestVersion = await _nugetPackageDownloader.GetLatestPackageVersion(packageId, _packageSourceLocation, includePreviews); + success = true; + downloads.Add(new WorkloadDownload(manifest.Id, packageId.ToString(), latestVersion.ToString())); } - } - var fallbackFeatureBand = new SdkFeatureBand(manifest.ManifestFeatureBand); - if (!success && !fallbackFeatureBand.Equals(installedSdkFeatureBand)) - { - var newPackageId = _workloadManifestInstaller.GetManifestPackageId(new ManifestId(manifest.Id), fallbackFeatureBand); - - (success, latestVersion) = await GetPackageVersion(newPackageId, packageSourceLocation: _packageSourceLocation, includePreview: includePreviews); - - if (success) + catch (NuGetPackageNotFoundException) { - downloads.Add(new WorkloadDownload(manifest.Id, newPackageId.ToString(), latestVersion.ToString())); } - } + + bandIndex++; + // If unsuccessful and the previous band doesn't equal the current one, we'll attempt to get the package version again with the new band. + } while (bandIndex < bands.Length && !success && !bands[bandIndex].Equals(bands[bandIndex - 1])); + if (!success) { - _reporter.WriteLine(string.Format(LocalizableStrings.ManifestPackageUrlNotResolved, packageId)); + _reporter.WriteLine(string.Format(LocalizableStrings.ManifestPackageUrlNotResolved, providedPackageId)); } } catch @@ -377,8 +367,7 @@ private ManifestVersionWithBand GetInstalledManifestVersion(ManifestId manifestI private bool AdManifestSentinelIsDueForUpdate() { var sentinelPath = GetAdvertisingManifestSentinelPath(_sdkFeatureBand); - int updateIntervalHours; - if (!int.TryParse(_getEnvironmentVariable(EnvironmentVariableNames.WORKLOAD_UPDATE_NOTIFY_INTERVAL_HOURS), out updateIntervalHours)) + if (!int.TryParse(_getEnvironmentVariable(EnvironmentVariableNames.WORKLOAD_UPDATE_NOTIFY_INTERVAL_HOURS), out int updateIntervalHours)) { updateIntervalHours = 24; } @@ -494,19 +483,6 @@ private string GetOfflinePackagePath(SdkFeatureBand sdkFeatureBand, ManifestId m return (Success: offlinePath != null, PackagePath: offlinePath); } - private async Task<(bool Success, NuGetVersion LatestVersion)> GetPackageVersion(PackageId packageId, PackageSourceLocation packageSourceLocation = null, bool includePreview = false) - { - try - { - var latestVersion = await _nugetPackageDownloader.GetLatestPackageVersion(packageId, packageSourceLocation: packageSourceLocation, includePreview: includePreview); - return (Success: true, LatestVersion: latestVersion); - } - catch (NuGetPackageNotFoundException) - { - return (Success: false, LatestVersion: null); - } - } - private string GetAdvertisingManifestPath(SdkFeatureBand featureBand, ManifestId manifestId) => Path.Combine(_userProfileDir, "sdk-advertising", featureBand.ToString(), manifestId.ToString()); private record ManifestVersionWithBand(ManifestVersion Version, SdkFeatureBand Band); From a6311ae1b3061b052b2f1224880cf2474bbb2ca3 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Wed, 4 Oct 2023 16:15:29 -0700 Subject: [PATCH 030/550] Removed extra empty line. --- .../commands/dotnet-workload/install/WorkloadManifestUpdater.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index fbd89cedc915..772ec871ee15 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -216,7 +216,6 @@ public IEnumerable CalculateManifestRollbacks(string roll return manifestUpdates; } - public async Task> GetManifestPackageDownloadsAsync(bool includePreviews, SdkFeatureBand providedSdkFeatureBand, SdkFeatureBand installedSdkFeatureBand) { var downloads = new List(); From 6fb2d3a14e4fc5ad9fa36927eed403ed5617dcd2 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Wed, 4 Oct 2023 17:51:51 -0700 Subject: [PATCH 031/550] Modified GetManifestPackageDownloadsAsync to use a foreach with Distinct to eliminate duplicates. --- .../install/WorkloadManifestUpdater.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index 772ec871ee15..8a08a23cbfcd 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -227,10 +227,9 @@ public async Task> GetManifestPackageDownloadsAsyn var fallbackFeatureBand = new SdkFeatureBand(manifest.ManifestFeatureBand); SdkFeatureBand[] bands = [providedSdkFeatureBand, installedSdkFeatureBand, fallbackFeatureBand]; var success = false; - var bandIndex = 0; - do + foreach (var band in bands.Distinct()) { - var packageId = _workloadManifestInstaller.GetManifestPackageId(new ManifestId(manifest.Id), bands[bandIndex]); + var packageId = _workloadManifestInstaller.GetManifestPackageId(new ManifestId(manifest.Id), band); providedPackageId ??= packageId; try @@ -238,14 +237,12 @@ public async Task> GetManifestPackageDownloadsAsyn var latestVersion = await _nugetPackageDownloader.GetLatestPackageVersion(packageId, _packageSourceLocation, includePreviews); success = true; downloads.Add(new WorkloadDownload(manifest.Id, packageId.ToString(), latestVersion.ToString())); + break; } catch (NuGetPackageNotFoundException) { } - - bandIndex++; - // If unsuccessful and the previous band doesn't equal the current one, we'll attempt to get the package version again with the new band. - } while (bandIndex < bands.Length && !success && !bands[bandIndex].Equals(bands[bandIndex - 1])); + } if (!success) { From 4315a53177c211a0bdcc1807a6d29f9fba770908 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 5 Oct 2023 19:26:57 -0700 Subject: [PATCH 032/550] Cleaned up GetManifestPackageUpdate. --- .../install/WorkloadManifestUpdater.cs | 55 ++++++------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index 8a08a23cbfcd..ab0ca82896ad 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -433,50 +433,27 @@ private async Task NewerManifestPackageExists(ManifestId manifest) private static string GetAdvertisingWorkloadsFilePath(string userProfileDir, SdkFeatureBand featureBand) => Path.Combine(userProfileDir, $".workloadAdvertisingUpdates{featureBand}"); - private async Task GetOnlinePackagePath(SdkFeatureBand sdkFeatureBand, ManifestId manifestId, bool includePreviews) - { - string packagePath = await _nugetPackageDownloader.DownloadPackageAsync( - _workloadManifestInstaller.GetManifestPackageId(manifestId, sdkFeatureBand), - packageSourceLocation: _packageSourceLocation, - includePreview: includePreviews); - - return packagePath; - } - - private string GetOfflinePackagePath(SdkFeatureBand sdkFeatureBand, ManifestId manifestId, DirectoryPath? offlineCache = null) - { - string packagePath = Directory.GetFiles(offlineCache.Value.Value) - .Where(path => - { - if (!path.EndsWith(".nupkg")) - { - return false; - } - var manifestPackageId = _workloadManifestInstaller.GetManifestPackageId(manifestId, sdkFeatureBand).ToString(); - return Path.GetFileName(path).StartsWith(manifestPackageId, StringComparison.OrdinalIgnoreCase); - }) - .Max(); - - return packagePath; - } - private async Task<(bool Success, string PackagePath)> GetManifestPackageUpdate(SdkFeatureBand sdkFeatureBand, ManifestId manifestId, bool includePreviews, DirectoryPath? offlineCache = null) { - if (offlineCache == null || !offlineCache.HasValue) + var manifestPackageId = _workloadManifestInstaller.GetManifestPackageId(manifestId, sdkFeatureBand); + if (offlineCache != null) { - try - { - string onlinePath = await GetOnlinePackagePath(sdkFeatureBand, manifestId, includePreviews); - return (Success: true, PackagePath: onlinePath); - } - catch (NuGetPackageNotFoundException) - { - return (Success: false, PackagePath: null); - } + string offlinePackagePath = Directory.GetFiles(offlineCache.Value.Value) + .Where(path => path.EndsWith(".nupkg") && Path.GetFileName(path).StartsWith(manifestPackageId.ToString(), StringComparison.OrdinalIgnoreCase)) + .Max(); + return (Success: offlinePackagePath != null, PackagePath: offlinePackagePath); } - string offlinePath = GetOfflinePackagePath(sdkFeatureBand, manifestId, offlineCache); - return (Success: offlinePath != null, PackagePath: offlinePath); + try + { + string onlinePackagePath = await _nugetPackageDownloader.DownloadPackageAsync( + manifestPackageId, packageSourceLocation: _packageSourceLocation, includePreview: includePreviews); + return (Success: true, PackagePath: onlinePackagePath); + } + catch (NuGetPackageNotFoundException) + { + return (Success: false, PackagePath: null); + } } private string GetAdvertisingManifestPath(SdkFeatureBand featureBand, ManifestId manifestId) => Path.Combine(_userProfileDir, "sdk-advertising", featureBand.ToString(), manifestId.ToString()); From 98a75210a015c5af91f8a860a021ae926805a83f Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 6 Oct 2023 12:53:23 -0700 Subject: [PATCH 033/550] Moved a call in CalculateManifestUpdates to be closer to its usage. --- .../dotnet-workload/install/WorkloadManifestUpdater.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index ab0ca82896ad..e0128ddd8f99 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -163,14 +163,14 @@ public IEnumerable CalculateManifestUpdates() var currentManifestIds = GetInstalledManifestIds(); foreach (var manifestId in currentManifestIds) { - var (installedVersion, installedBand) = GetInstalledManifestVersion(manifestId); var advertisingInfo = GetAdvertisingManifestVersionAndWorkloads(manifestId); if (advertisingInfo == null) { continue; } - var ((adVersion, adBand), adWorkloads) = advertisingInfo.Value; + var (installedVersion, installedBand) = GetInstalledManifestVersion(manifestId); + var ((adVersion, adBand), adWorkloads) = advertisingInfo.Value; if ((adVersion.CompareTo(installedVersion) > 0 && adBand.Equals(installedBand)) || adBand.CompareTo(installedBand) > 0) { From 6f54c4b7f385ee75c5bf9e38e5f4989219b46598 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Fri, 6 Oct 2023 18:27:15 -0700 Subject: [PATCH 034/550] Removed unused statements in the GivenNoWorkloadsInstalledInfoOptionRemarksOnThat test. --- .../dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs index cc219543e599..45eb8d7ef262 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs @@ -169,10 +169,8 @@ public void GivenNoWorkloadsInstalledInfoOptionRemarksOnThat() // However, we can test a setup where no workloads are installed and --info is provided. _reporter.Clear(); - _ = new WorkloadId[] { new WorkloadId("xamarin-android"), new WorkloadId("xamarin-android-build") }; var testDirectory = _testAssetsManager.CreateTestDirectory().Path; var dotnetRoot = Path.Combine(testDirectory, "dotnet"); - _ = new MockPackWorkloadInstaller(); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(new[] { _manifestPath }), dotnetRoot); var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android"}); From 919c98512e1774cf0cb2b3c814a6fe6eff68f33c Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Mon, 9 Oct 2023 15:29:56 -0700 Subject: [PATCH 035/550] Removed string.Format use for reporter.WriteLine since it has an interface that does this automatically. --- .../dotnet-workload/install/WorkloadManifestUpdater.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index e0128ddd8f99..f91628199871 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -246,12 +246,12 @@ public async Task> GetManifestPackageDownloadsAsyn if (!success) { - _reporter.WriteLine(string.Format(LocalizableStrings.ManifestPackageUrlNotResolved, providedPackageId)); + _reporter.WriteLine(LocalizableStrings.ManifestPackageUrlNotResolved, providedPackageId); } } catch { - _reporter.WriteLine(string.Format(LocalizableStrings.ManifestPackageUrlNotResolved, manifest.Id)); + _reporter.WriteLine(LocalizableStrings.ManifestPackageUrlNotResolved, manifest.Id); } } return downloads; @@ -281,7 +281,7 @@ private async Task UpdateAdvertisingManifestAsync(WorkloadManifestInfo manifest, } if (!success) { - _reporter.WriteLine(string.Format(LocalizableStrings.AdManifestPackageDoesNotExist, manifestId)); + _reporter.WriteLine(LocalizableStrings.AdManifestPackageDoesNotExist, manifestId); return; } @@ -292,13 +292,13 @@ private async Task UpdateAdvertisingManifestAsync(WorkloadManifestInfo manifest, if (_displayManifestUpdates) { - _reporter.WriteLine(string.Format(LocalizableStrings.AdManifestUpdated, manifestId)); + _reporter.WriteLine(LocalizableStrings.AdManifestUpdated, manifestId); } } catch (Exception e) { - _reporter.WriteLine(string.Format(LocalizableStrings.FailedAdManifestUpdate, manifestId, e.Message)); + _reporter.WriteLine(LocalizableStrings.FailedAdManifestUpdate, manifestId, e.Message); } finally { From 64f8fe69d957c378c9e2e6a8f4894892cadf1bda Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Mon, 9 Oct 2023 16:21:15 -0700 Subject: [PATCH 036/550] Fix build issue after rebase to feature/8.0.2xx. --- .../dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs b/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs index ea20fd8ae088..6cbd58fb52cd 100644 --- a/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs +++ b/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs @@ -330,7 +330,7 @@ public void ApplyRollbackAcrossFeatureBand(string existingSdkFeatureBand, string { new(new ManifestVersionUpdate(new ManifestId("mock-manifest"), new ManifestVersion("1.0.0"), existingSdkFeatureBand, new ManifestVersion("2.0.0"), newSdkFeatureBand), null), }; - (_, var updateCommand, var packInstaller, _, _, _) = GetTestInstallers(parseResult, manifestUpdates: manifestsToUpdate, sdkVersion: "6.0.300", identifier: existingSdkFeatureBand + newSdkFeatureBand, installedFeatureBand: existingSdkFeatureBand); + (var dotnetPath, var updateCommand, var packInstaller, _, _, _) = GetTestInstallers(parseResult, manifestUpdates: manifestsToUpdate, sdkVersion: "6.0.300", identifier: existingSdkFeatureBand + newSdkFeatureBand, installedFeatureBand: existingSdkFeatureBand); updateCommand.UpdateWorkloads(); @@ -348,7 +348,7 @@ public void ApplyRollbackAcrossFeatureBand(string existingSdkFeatureBand, string json.RootElement.GetProperty("manifests").GetProperty("mock-manifest").GetString().Should().Be("2.0.0/" + newSdkFeatureBand); } - [Fact] + [Fact] public void ApplyRollbackWithMultipleManifestsAcrossFeatureBand() { var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "update", "--from-rollback-file", "rollback.json" }); From e0d73f4cc413beed5873afada38fe65c340cf714 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Mon, 9 Oct 2023 16:25:57 -0700 Subject: [PATCH 037/550] Changed return value construction based on feedback. --- .../dotnet-workload/install/WorkloadManifestUpdater.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index f91628199871..68eb8c188c83 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -355,9 +355,7 @@ private ManifestVersionWithBand GetInstalledManifestVersion(ManifestId manifestI { throw new Exception(string.Format(LocalizableStrings.ManifestDoesNotExist, manifestId.ToString())); } - var version = new ManifestVersion(manifest.Version); - var band = new SdkFeatureBand(manifest.ManifestFeatureBand); - return new(version, band); + return new(new ManifestVersion(manifest.Version), new SdkFeatureBand(manifest.ManifestFeatureBand)); } private bool AdManifestSentinelIsDueForUpdate() From b402558304ad5c52d78e8e97e4bd7c775215dccb Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Mon, 9 Oct 2023 16:59:37 -0700 Subject: [PATCH 038/550] Added code comments to GetManifestPackageDownloadsAsync. Updated UpdateAdvertisingManifestAsync to match the same pattern as GetManifestPackageDownloadsAsync, since it was using the same previous pattern except with 2 bands instead of 3. --- .../install/WorkloadManifestUpdater.cs | 68 +++++++++---------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index 68eb8c188c83..6178356a142c 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -225,8 +225,10 @@ public async Task> GetManifestPackageDownloadsAsyn { PackageId? providedPackageId = null; var fallbackFeatureBand = new SdkFeatureBand(manifest.ManifestFeatureBand); + // The bands should be checked in the order defined here. SdkFeatureBand[] bands = [providedSdkFeatureBand, installedSdkFeatureBand, fallbackFeatureBand]; var success = false; + // Use Distinct to eliminate bands that are the same. foreach (var band in bands.Distinct()) { var packageId = _workloadManifestInstaller.GetManifestPackageId(new ManifestId(manifest.Id), band); @@ -254,6 +256,7 @@ public async Task> GetManifestPackageDownloadsAsyn _reporter.WriteLine(LocalizableStrings.ManifestPackageUrlNotResolved, manifest.Id); } } + return downloads; } @@ -263,32 +266,50 @@ private async Task UpdateAdvertisingManifestAsync(WorkloadManifestInfo manifest, { string packagePath = null; var manifestId = new ManifestId(manifest.Id); - string currentFeatureBand = _sdkFeatureBand.ToString(); - try { - var adManifestPath = GetAdvertisingManifestPath(_sdkFeatureBand, manifestId); - - bool success; - (success, packagePath) = await GetManifestPackageUpdate(_sdkFeatureBand, manifestId, includePreviews, offlineCache); - if (!success) + SdkFeatureBand? currentFeatureBand = null; + var fallbackFeatureBand = new SdkFeatureBand(manifest.ManifestFeatureBand); + // The bands should be checked in the order defined here. + SdkFeatureBand[] bands = [_sdkFeatureBand, fallbackFeatureBand]; + var success = false; + // Use Distinct to eliminate bands that are the same. + foreach (var band in bands.Distinct()) { - if (!(manifest.ManifestFeatureBand).Equals(_sdkFeatureBand)) + var manifestPackageId = _workloadManifestInstaller.GetManifestPackageId(manifestId, band); + currentFeatureBand = band; + + try + { + // If an offline cache is present, use that. Otherwise, try to acquire the package online. + packagePath = offlineCache != null ? + Directory.GetFiles(offlineCache.Value.Value) + .Where(path => path.EndsWith(".nupkg") && Path.GetFileName(path).StartsWith(manifestPackageId.ToString(), StringComparison.OrdinalIgnoreCase)) + .Max() : + await _nugetPackageDownloader.DownloadPackageAsync(manifestPackageId, packageSourceLocation: _packageSourceLocation, includePreview: includePreviews); + + if (packagePath != null) + { + success = true; + break; + } + } + catch (NuGetPackageNotFoundException) { - (success, packagePath) = await GetManifestPackageUpdate(new SdkFeatureBand(manifest.ManifestFeatureBand), manifestId, includePreviews, offlineCache); - currentFeatureBand = manifest.ManifestFeatureBand.ToString(); } } + if (!success) { _reporter.WriteLine(LocalizableStrings.AdManifestPackageDoesNotExist, manifestId); return; } + var adManifestPath = GetAdvertisingManifestPath(_sdkFeatureBand, manifestId); await _workloadManifestInstaller.ExtractManifestAsync(packagePath, adManifestPath); - // add file that contains the advertisted manifest feature band so GetAdvertisingManifestVersionAndWorkloads will use correct feature band, regardless of if rollback occurred or not - File.WriteAllText(Path.Combine(adManifestPath, "AdvertisedManifestFeatureBand.txt"), currentFeatureBand); + // add file that contains the advertised manifest feature band so GetAdvertisingManifestVersionAndWorkloads will use correct feature band, regardless of if rollback occurred or not + File.WriteAllText(Path.Combine(adManifestPath, "AdvertisedManifestFeatureBand.txt"), currentFeatureBand.ToString()); if (_displayManifestUpdates) { @@ -431,29 +452,6 @@ private async Task NewerManifestPackageExists(ManifestId manifest) private static string GetAdvertisingWorkloadsFilePath(string userProfileDir, SdkFeatureBand featureBand) => Path.Combine(userProfileDir, $".workloadAdvertisingUpdates{featureBand}"); - private async Task<(bool Success, string PackagePath)> GetManifestPackageUpdate(SdkFeatureBand sdkFeatureBand, ManifestId manifestId, bool includePreviews, DirectoryPath? offlineCache = null) - { - var manifestPackageId = _workloadManifestInstaller.GetManifestPackageId(manifestId, sdkFeatureBand); - if (offlineCache != null) - { - string offlinePackagePath = Directory.GetFiles(offlineCache.Value.Value) - .Where(path => path.EndsWith(".nupkg") && Path.GetFileName(path).StartsWith(manifestPackageId.ToString(), StringComparison.OrdinalIgnoreCase)) - .Max(); - return (Success: offlinePackagePath != null, PackagePath: offlinePackagePath); - } - - try - { - string onlinePackagePath = await _nugetPackageDownloader.DownloadPackageAsync( - manifestPackageId, packageSourceLocation: _packageSourceLocation, includePreview: includePreviews); - return (Success: true, PackagePath: onlinePackagePath); - } - catch (NuGetPackageNotFoundException) - { - return (Success: false, PackagePath: null); - } - } - private string GetAdvertisingManifestPath(SdkFeatureBand featureBand, ManifestId manifestId) => Path.Combine(_userProfileDir, "sdk-advertising", featureBand.ToString(), manifestId.ToString()); private record ManifestVersionWithBand(ManifestVersion Version, SdkFeatureBand Band); From 8d354f3a83e573b133da13af3962232a693cc360 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Oct 2023 12:54:48 +0000 Subject: [PATCH 039/550] Update dependencies from https://github.com/dotnet/templating build 20231010.1 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23507.4 -> To Version 8.0.100-rtm.23510.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a427628c23a..a10fade4fba1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 9c9c9443df3a8c1ea48f5c5cff08582e8a415f31 + 077de14b37aa9e40895bb321d4c12a4be9645aac - + https://github.com/dotnet/templating - 9c9c9443df3a8c1ea48f5c5cff08582e8a415f31 + 077de14b37aa9e40895bb321d4c12a4be9645aac https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9ca9ae5097ae..bbdcfef9e72b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23507.4 + 8.0.100-rtm.23510.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23507.4 + 8.0.100-rtm.23510.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 081f38cba1c8294772fb7fd2988054f5a00dfc6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:48:08 +0000 Subject: [PATCH 040/550] [release/8.0.2xx] Update dependencies from dotnet/windowsdesktop (#35966) [release/8.0.2xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 8.0.0-rtm.23504.3 to 8.0.0-rtm.23509.3 (parent: Microsoft.WindowsDesktop.App.Ref) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a427628c23a..f815305ab54d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,25 +213,25 @@ https://github.com/dotnet/runtime b17a34c818bd5e01fdb9827fea64727a5fc51025 - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + 28cb6ed29636b7db978e83ba1a8a2369584e71f4 - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + 28cb6ed29636b7db978e83ba1a8a2369584e71f4 - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + 28cb6ed29636b7db978e83ba1a8a2369584e71f4 - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + 28cb6ed29636b7db978e83ba1a8a2369584e71f4 - + https://github.com/dotnet/wpf - b892ae845b9832e0873ef2f7c958c46dc6b3d637 + 50d7731991f3d1c4f1efb94821ecc8c2cb7a1c35 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9ca9ae5097ae..3edf1f5ae172 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ - 8.0.0-rtm.23504.3 + 8.0.0-rtm.23509.3 From 2bfafba10d3a0cfe9f329aa67eab9753ee8b97db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:48:44 +0000 Subject: [PATCH 041/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#35968) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f815305ab54d..6b16394560e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 - + https://github.com/dotnet/fsharp - 39ef9ca10f63a99de12f9b348a877d32c6446857 + 736b7454a057e390bf46a05c0f2d8b5760fd5ce9 - + https://github.com/dotnet/fsharp - 39ef9ca10f63a99de12f9b348a877d32c6446857 + 736b7454a057e390bf46a05c0f2d8b5760fd5ce9 diff --git a/eng/Versions.props b/eng/Versions.props index 3edf1f5ae172..b039e12ab785 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23509.1 + 12.8.0-beta.23510.3 From ca4f35fae458fe40927ae843acde807d1b58eb87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 16:49:29 +0000 Subject: [PATCH 042/550] [release/8.0.2xx] Update dependencies from dotnet/runtime (#35970) [release/8.0.2xx] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b16394560e0..1be8d58dfb5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,42 +10,42 @@ https://github.com/dotnet/templating 9c9c9443df3a8c1ea48f5c5cff08582e8a415f31 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 https://github.com/dotnet/emsdk @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 https://github.com/dotnet/windowsdesktop @@ -386,29 +386,29 @@ - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/runtime - b17a34c818bd5e01fdb9827fea64727a5fc51025 + a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index b039e12ab785..40d054dc7cfd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23463.1 7.0.0-preview.22423.2 - 8.0.0-rtm.23506.12 + 8.0.0-rtm.23509.5 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rtm.23506.12 + 8.0.0-rtm.23509.5 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,20 +49,20 @@ - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 @@ -89,9 +89,9 @@ - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 - 8.0.0-rtm.23506.12 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 + 8.0.0-rtm.23509.5 From 0e2d6198d832ebe927e710ab3cb906da8d567b7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Oct 2023 20:11:23 +0000 Subject: [PATCH 043/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#35946) [release/8.0.2xx] Update dependencies from dotnet/razor - Update copied razor source with latest versions. --- eng/Version.Details.xml | 12 +- eng/Versions.props | 6 +- src/RazorSdk/Tool/JsonReaderExtensions.cs | 73 +- .../Tool/RazorDiagnosticJsonConverter.cs | 98 +- .../Tool/TagHelperDescriptorJsonConverter.cs | 1333 +++++++++-------- 5 files changed, 769 insertions(+), 753 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1be8d58dfb5f..2bcd0eddcf34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 6bd37340c54e3b9690102886afca6198a461cb3e - + https://github.com/dotnet/razor - 8de09384414b0f850b29991342b4c40c423a8b40 + f423515361a984e02e6c5a32ab4e8c92ffd022d9 - + https://github.com/dotnet/razor - 8de09384414b0f850b29991342b4c40c423a8b40 + f423515361a984e02e6c5a32ab4e8c92ffd022d9 - + https://github.com/dotnet/razor - 8de09384414b0f850b29991342b4c40c423a8b40 + f423515361a984e02e6c5a32ab4e8c92ffd022d9 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 40d054dc7cfd..583faef14940 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23504.1 - 7.0.0-preview.23504.1 - 7.0.0-preview.23504.1 + 7.0.0-preview.23510.1 + 7.0.0-preview.23510.1 + 7.0.0-preview.23510.1 diff --git a/src/RazorSdk/Tool/JsonReaderExtensions.cs b/src/RazorSdk/Tool/JsonReaderExtensions.cs index b27e3e009d09..af6e17715cfc 100644 --- a/src/RazorSdk/Tool/JsonReaderExtensions.cs +++ b/src/RazorSdk/Tool/JsonReaderExtensions.cs @@ -1,56 +1,57 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; using System.Diagnostics; using Newtonsoft.Json; -namespace Microsoft.CodeAnalysis.Razor.Serialization +namespace Microsoft.CodeAnalysis.Razor.Serialization; + +internal static class JsonReaderExtensions { - internal static class JsonReaderExtensions + public static bool ReadTokenAndAdvance(this JsonReader reader, JsonToken expectedTokenType, out object value) { - public static bool ReadTokenAndAdvance(this JsonReader reader, JsonToken expectedTokenType, out object value) - { - value = reader.Value; - return reader.TokenType == expectedTokenType && reader.Read(); - } + value = reader.Value; + return reader.TokenType == expectedTokenType && reader.Read(); + } - public static void ReadProperties(this JsonReader reader, Action onProperty) + public static void ReadProperties(this JsonReader reader, Action onProperty) + { + while (reader.Read()) { - while (reader.Read()) + switch (reader.TokenType) { - switch (reader.TokenType) - { - case JsonToken.PropertyName: - var propertyName = reader.Value.ToString(); - onProperty(propertyName); - break; - case JsonToken.EndObject: - return; - } + case JsonToken.PropertyName: + var propertyName = reader.Value.ToString(); + onProperty(propertyName); + break; + case JsonToken.EndObject: + return; } } + } - public static string ReadNextStringProperty(this JsonReader reader, string propertyName) + public static string ReadNextStringProperty(this JsonReader reader, string propertyName) + { + while (reader.Read()) { - while (reader.Read()) + switch (reader.TokenType) { - switch (reader.TokenType) - { - case JsonToken.PropertyName: - Debug.Assert(reader.Value.ToString() == propertyName); - if (reader.Read()) - { - var value = (string)reader.Value; - return value; - } - else - { - return null; - } - } + case JsonToken.PropertyName: + Debug.Assert(reader.Value.ToString() == propertyName); + if (reader.Read()) + { + var value = (string)reader.Value; + return value; + } + else + { + return null; + } } - - throw new JsonSerializationException($"Could not find string property '{propertyName}'."); } + + throw new JsonSerializationException($"Could not find string property '{propertyName}'."); } } diff --git a/src/RazorSdk/Tool/RazorDiagnosticJsonConverter.cs b/src/RazorSdk/Tool/RazorDiagnosticJsonConverter.cs index a475dd589c7c..e185dc75c617 100644 --- a/src/RazorSdk/Tool/RazorDiagnosticJsonConverter.cs +++ b/src/RazorSdk/Tool/RazorDiagnosticJsonConverter.cs @@ -1,73 +1,73 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Globalization; using Microsoft.AspNetCore.Razor.Language; using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Microsoft.CodeAnalysis.Razor.Serialization +namespace Microsoft.CodeAnalysis.Razor.Serialization; + +internal class RazorDiagnosticJsonConverter : JsonConverter { - internal class RazorDiagnosticJsonConverter : JsonConverter + public static readonly RazorDiagnosticJsonConverter Instance = new RazorDiagnosticJsonConverter(); + private const string RazorDiagnosticMessageKey = "Message"; + + public override bool CanConvert(Type objectType) { - public static readonly RazorDiagnosticJsonConverter Instance = new RazorDiagnosticJsonConverter(); - private const string RazorDiagnosticMessageKey = "Message"; + return typeof(RazorDiagnostic).IsAssignableFrom(objectType); + } - public override bool CanConvert(Type objectType) + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if (reader.TokenType != JsonToken.StartObject) { - return typeof(RazorDiagnostic).IsAssignableFrom(objectType); + return null; } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType != JsonToken.StartObject) - { - return null; - } - - var diagnostic = JObject.Load(reader); - var id = diagnostic[nameof(RazorDiagnostic.Id)].Value(); - var severity = diagnostic[nameof(RazorDiagnostic.Severity)].Value(); - var message = diagnostic[RazorDiagnosticMessageKey].Value(); + var diagnostic = JObject.Load(reader); + var id = diagnostic[nameof(RazorDiagnostic.Id)].Value(); + var severity = diagnostic[nameof(RazorDiagnostic.Severity)].Value(); + var message = diagnostic[RazorDiagnosticMessageKey].Value(); - var span = diagnostic[nameof(RazorDiagnostic.Span)].Value(); - var filePath = span[nameof(SourceSpan.FilePath)].Value(); - var absoluteIndex = span[nameof(SourceSpan.AbsoluteIndex)].Value(); - var lineIndex = span[nameof(SourceSpan.LineIndex)].Value(); - var characterIndex = span[nameof(SourceSpan.CharacterIndex)].Value(); - var length = span[nameof(SourceSpan.Length)].Value(); + var span = diagnostic[nameof(RazorDiagnostic.Span)].Value(); + var filePath = span[nameof(SourceSpan.FilePath)].Value(); + var absoluteIndex = span[nameof(SourceSpan.AbsoluteIndex)].Value(); + var lineIndex = span[nameof(SourceSpan.LineIndex)].Value(); + var characterIndex = span[nameof(SourceSpan.CharacterIndex)].Value(); + var length = span[nameof(SourceSpan.Length)].Value(); - var descriptor = new RazorDiagnosticDescriptor(id, () => message, (RazorDiagnosticSeverity)severity); - var sourceSpan = new SourceSpan(filePath, absoluteIndex, lineIndex, characterIndex, length); + var descriptor = new RazorDiagnosticDescriptor(id, message, (RazorDiagnosticSeverity)severity); + var sourceSpan = new SourceSpan(filePath, absoluteIndex, lineIndex, characterIndex, length); - return RazorDiagnostic.Create(descriptor, sourceSpan); - } + return RazorDiagnostic.Create(descriptor, sourceSpan); + } - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - var diagnostic = (RazorDiagnostic)value; + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + var diagnostic = (RazorDiagnostic)value; - writer.WriteStartObject(); - WriteProperty(writer, nameof(RazorDiagnostic.Id), diagnostic.Id); - WriteProperty(writer, nameof(RazorDiagnostic.Severity), (int)diagnostic.Severity); - WriteProperty(writer, RazorDiagnosticMessageKey, diagnostic.GetMessage(CultureInfo.CurrentCulture)); + writer.WriteStartObject(); + WriteProperty(writer, nameof(RazorDiagnostic.Id), diagnostic.Id); + WriteProperty(writer, nameof(RazorDiagnostic.Severity), (int)diagnostic.Severity); + WriteProperty(writer, RazorDiagnosticMessageKey, diagnostic.GetMessage(CultureInfo.CurrentCulture)); - writer.WritePropertyName(nameof(RazorDiagnostic.Span)); - writer.WriteStartObject(); - WriteProperty(writer, nameof(SourceSpan.FilePath), diagnostic.Span.FilePath); - WriteProperty(writer, nameof(SourceSpan.AbsoluteIndex), diagnostic.Span.AbsoluteIndex); - WriteProperty(writer, nameof(SourceSpan.LineIndex), diagnostic.Span.LineIndex); - WriteProperty(writer, nameof(SourceSpan.CharacterIndex), diagnostic.Span.CharacterIndex); - WriteProperty(writer, nameof(SourceSpan.Length), diagnostic.Span.Length); - writer.WriteEndObject(); + writer.WritePropertyName(nameof(RazorDiagnostic.Span)); + writer.WriteStartObject(); + WriteProperty(writer, nameof(SourceSpan.FilePath), diagnostic.Span.FilePath); + WriteProperty(writer, nameof(SourceSpan.AbsoluteIndex), diagnostic.Span.AbsoluteIndex); + WriteProperty(writer, nameof(SourceSpan.LineIndex), diagnostic.Span.LineIndex); + WriteProperty(writer, nameof(SourceSpan.CharacterIndex), diagnostic.Span.CharacterIndex); + WriteProperty(writer, nameof(SourceSpan.Length), diagnostic.Span.Length); + writer.WriteEndObject(); - writer.WriteEndObject(); - } + writer.WriteEndObject(); + } - private void WriteProperty(JsonWriter writer, string key, T value) - { - writer.WritePropertyName(key); - writer.WriteValue(value); - } + private void WriteProperty(JsonWriter writer, string key, T value) + { + writer.WritePropertyName(key); + writer.WriteValue(value); } } diff --git a/src/RazorSdk/Tool/TagHelperDescriptorJsonConverter.cs b/src/RazorSdk/Tool/TagHelperDescriptorJsonConverter.cs index f87bdf6683e7..ae0f7acc76e8 100644 --- a/src/RazorSdk/Tool/TagHelperDescriptorJsonConverter.cs +++ b/src/RazorSdk/Tool/TagHelperDescriptorJsonConverter.cs @@ -1,850 +1,865 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; +using System.Collections.Generic; using Microsoft.AspNetCore.Razor.Language; using Newtonsoft.Json; -namespace Microsoft.CodeAnalysis.Razor.Serialization +namespace Microsoft.CodeAnalysis.Razor.Serialization; + +internal class TagHelperDescriptorJsonConverter : JsonConverter { - internal class TagHelperDescriptorJsonConverter : JsonConverter + public static readonly TagHelperDescriptorJsonConverter Instance = new(); + + public override bool CanConvert(Type objectType) { - public static readonly TagHelperDescriptorJsonConverter Instance = new TagHelperDescriptorJsonConverter(); + return typeof(TagHelperDescriptor).IsAssignableFrom(objectType); + } - public override bool CanConvert(Type objectType) + public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + { + if (reader.TokenType != JsonToken.StartObject) { - return typeof(TagHelperDescriptor).IsAssignableFrom(objectType); + return null; } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) - { - if (reader.TokenType != JsonToken.StartObject) - { - return null; - } - - // Required tokens (order matters) - var descriptorKind = reader.ReadNextStringProperty(nameof(TagHelperDescriptor.Kind)); - var typeName = reader.ReadNextStringProperty(nameof(TagHelperDescriptor.Name)); - var assemblyName = reader.ReadNextStringProperty(nameof(TagHelperDescriptor.AssemblyName)); - var builder = TagHelperDescriptorBuilder.Create(descriptorKind, typeName, assemblyName); + // Required tokens (order matters) + var descriptorKind = reader.ReadNextStringProperty(nameof(TagHelperDescriptor.Kind)); + var typeName = reader.ReadNextStringProperty(nameof(TagHelperDescriptor.Name)); + var assemblyName = reader.ReadNextStringProperty(nameof(TagHelperDescriptor.AssemblyName)); + using var _ = TagHelperDescriptorBuilder.GetPooledInstance(descriptorKind, typeName, assemblyName, out var builder); - reader.ReadProperties(propertyName => + reader.ReadProperties(propertyName => + { + switch (propertyName) { - switch (propertyName) - { - case nameof(TagHelperDescriptor.Documentation): - if (reader.Read()) - { - var documentation = (string)reader.Value; - builder.Documentation = documentation; - } - break; - case nameof(TagHelperDescriptor.TagOutputHint): - if (reader.Read()) - { - var tagOutputHint = (string)reader.Value; - builder.TagOutputHint = tagOutputHint; - } - break; - case nameof(TagHelperDescriptor.CaseSensitive): - if (reader.Read()) - { - var caseSensitive = (bool)reader.Value; - builder.CaseSensitive = caseSensitive; - } - break; - case nameof(TagHelperDescriptor.TagMatchingRules): - ReadTagMatchingRules(reader, builder); - break; - case nameof(TagHelperDescriptor.BoundAttributes): - ReadBoundAttributes(reader, builder); - break; - case nameof(TagHelperDescriptor.AllowedChildTags): - ReadAllowedChildTags(reader, builder); - break; - case nameof(TagHelperDescriptor.Diagnostics): - ReadDiagnostics(reader, builder.Diagnostics); - break; - case nameof(TagHelperDescriptor.Metadata): - ReadMetadata(reader, builder.Metadata); - break; - } - }); + case nameof(TagHelperDescriptor.Documentation): + if (reader.Read()) + { + var documentation = (string)reader.Value; + builder.SetDocumentation(documentation); + } + break; + case nameof(TagHelperDescriptor.TagOutputHint): + if (reader.Read()) + { + var tagOutputHint = (string)reader.Value; + builder.TagOutputHint = tagOutputHint; + } + break; + case nameof(TagHelperDescriptor.CaseSensitive): + if (reader.Read()) + { + var caseSensitive = (bool)reader.Value; + builder.CaseSensitive = caseSensitive; + } + break; + case nameof(TagHelperDescriptor.TagMatchingRules): + ReadTagMatchingRules(reader, builder); + break; + case nameof(TagHelperDescriptor.BoundAttributes): + ReadBoundAttributes(reader, builder); + break; + case nameof(TagHelperDescriptor.AllowedChildTags): + ReadAllowedChildTags(reader, builder); + break; + case nameof(TagHelperDescriptor.Diagnostics): + ReadDiagnostics(reader, builder.Diagnostics); + break; + case nameof(TagHelperDescriptor.Metadata): + ReadMetadata(reader, builder.Metadata); + break; + } + }); + + return builder.Build(); + } - return builder.Build(); - } + public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + { + var tagHelper = (TagHelperDescriptor)value; - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) - { - var tagHelper = (TagHelperDescriptor)value; + writer.WriteStartObject(); - writer.WriteStartObject(); + writer.WritePropertyName(nameof(TagHelperDescriptor.Kind)); + writer.WriteValue(tagHelper.Kind); - writer.WritePropertyName(nameof(TagHelperDescriptor.Kind)); - writer.WriteValue(tagHelper.Kind); + writer.WritePropertyName(nameof(TagHelperDescriptor.Name)); + writer.WriteValue(tagHelper.Name); - writer.WritePropertyName(nameof(TagHelperDescriptor.Name)); - writer.WriteValue(tagHelper.Name); + writer.WritePropertyName(nameof(TagHelperDescriptor.AssemblyName)); + writer.WriteValue(tagHelper.AssemblyName); - writer.WritePropertyName(nameof(TagHelperDescriptor.AssemblyName)); - writer.WriteValue(tagHelper.AssemblyName); + if (tagHelper.Documentation != null) + { + writer.WritePropertyName(nameof(TagHelperDescriptor.Documentation)); + writer.WriteValue(tagHelper.Documentation); + } - if (tagHelper.Documentation != null) - { - writer.WritePropertyName(nameof(TagHelperDescriptor.Documentation)); - writer.WriteValue(tagHelper.Documentation); - } + if (tagHelper.TagOutputHint != null) + { + writer.WritePropertyName(nameof(TagHelperDescriptor.TagOutputHint)); + writer.WriteValue(tagHelper.TagOutputHint); + } - if (tagHelper.TagOutputHint != null) - { - writer.WritePropertyName(nameof(TagHelperDescriptor.TagOutputHint)); - writer.WriteValue(tagHelper.TagOutputHint); - } + writer.WritePropertyName(nameof(TagHelperDescriptor.CaseSensitive)); + writer.WriteValue(tagHelper.CaseSensitive); - writer.WritePropertyName(nameof(TagHelperDescriptor.CaseSensitive)); - writer.WriteValue(tagHelper.CaseSensitive); + writer.WritePropertyName(nameof(TagHelperDescriptor.TagMatchingRules)); + writer.WriteStartArray(); + foreach (var ruleDescriptor in tagHelper.TagMatchingRules) + { + WriteTagMatchingRule(writer, ruleDescriptor, serializer); + } + writer.WriteEndArray(); - writer.WritePropertyName(nameof(TagHelperDescriptor.TagMatchingRules)); + if (tagHelper.BoundAttributes != null && tagHelper.BoundAttributes.Length > 0) + { + writer.WritePropertyName(nameof(TagHelperDescriptor.BoundAttributes)); writer.WriteStartArray(); - foreach (var ruleDescriptor in tagHelper.TagMatchingRules) + foreach (var boundAttribute in tagHelper.BoundAttributes) { - WriteTagMatchingRule(writer, ruleDescriptor, serializer); + WriteBoundAttribute(writer, boundAttribute, serializer); } writer.WriteEndArray(); + } - if (tagHelper.BoundAttributes != null && tagHelper.BoundAttributes.Count > 0) - { - writer.WritePropertyName(nameof(TagHelperDescriptor.BoundAttributes)); - writer.WriteStartArray(); - foreach (var boundAttribute in tagHelper.BoundAttributes) - { - WriteBoundAttribute(writer, boundAttribute, serializer); - } - writer.WriteEndArray(); - } - - if (tagHelper.AllowedChildTags != null && tagHelper.AllowedChildTags.Count > 0) - { - writer.WritePropertyName(nameof(TagHelperDescriptor.AllowedChildTags)); - writer.WriteStartArray(); - foreach (var allowedChildTag in tagHelper.AllowedChildTags) - { - WriteAllowedChildTags(writer, allowedChildTag, serializer); - } - writer.WriteEndArray(); - } - - if (tagHelper.Diagnostics != null && tagHelper.Diagnostics.Count > 0) + if (tagHelper.AllowedChildTags != null && tagHelper.AllowedChildTags.Length > 0) + { + writer.WritePropertyName(nameof(TagHelperDescriptor.AllowedChildTags)); + writer.WriteStartArray(); + foreach (var allowedChildTag in tagHelper.AllowedChildTags) { - writer.WritePropertyName(nameof(TagHelperDescriptor.Diagnostics)); - serializer.Serialize(writer, tagHelper.Diagnostics); + WriteAllowedChildTags(writer, allowedChildTag, serializer); } - - writer.WritePropertyName(nameof(TagHelperDescriptor.Metadata)); - WriteMetadata(writer, tagHelper.Metadata); - - writer.WriteEndObject(); + writer.WriteEndArray(); } - private static void WriteAllowedChildTags(JsonWriter writer, AllowedChildTagDescriptor allowedChildTag, JsonSerializer serializer) + if (tagHelper.Diagnostics != null && tagHelper.Diagnostics.Length > 0) { - writer.WriteStartObject(); - - writer.WritePropertyName(nameof(AllowedChildTagDescriptor.Name)); - writer.WriteValue(allowedChildTag.Name); + writer.WritePropertyName(nameof(TagHelperDescriptor.Diagnostics)); + serializer.Serialize(writer, tagHelper.Diagnostics); + } - writer.WritePropertyName(nameof(AllowedChildTagDescriptor.DisplayName)); - writer.WriteValue(allowedChildTag.DisplayName); + writer.WritePropertyName(nameof(TagHelperDescriptor.Metadata)); + WriteMetadata(writer, tagHelper.Metadata); - writer.WritePropertyName(nameof(AllowedChildTagDescriptor.Diagnostics)); - serializer.Serialize(writer, allowedChildTag.Diagnostics); + writer.WriteEndObject(); + } - writer.WriteEndObject(); - } + private static void WriteAllowedChildTags(JsonWriter writer, AllowedChildTagDescriptor allowedChildTag, JsonSerializer serializer) + { + writer.WriteStartObject(); - private static void WriteBoundAttribute(JsonWriter writer, BoundAttributeDescriptor boundAttribute, JsonSerializer serializer) - { - writer.WriteStartObject(); + writer.WritePropertyName(nameof(AllowedChildTagDescriptor.Name)); + writer.WriteValue(allowedChildTag.Name); - writer.WritePropertyName(nameof(BoundAttributeDescriptor.Kind)); - writer.WriteValue(boundAttribute.Kind); + writer.WritePropertyName(nameof(AllowedChildTagDescriptor.DisplayName)); + writer.WriteValue(allowedChildTag.DisplayName); - writer.WritePropertyName(nameof(BoundAttributeDescriptor.Name)); - writer.WriteValue(boundAttribute.Name); + writer.WritePropertyName(nameof(AllowedChildTagDescriptor.Diagnostics)); + serializer.Serialize(writer, allowedChildTag.Diagnostics); - writer.WritePropertyName(nameof(BoundAttributeDescriptor.TypeName)); - writer.WriteValue(boundAttribute.TypeName); + writer.WriteEndObject(); + } - if (boundAttribute.IsEnum) - { - writer.WritePropertyName(nameof(BoundAttributeDescriptor.IsEnum)); - writer.WriteValue(boundAttribute.IsEnum); - } + private static void WriteBoundAttribute(JsonWriter writer, BoundAttributeDescriptor boundAttribute, JsonSerializer serializer) + { + writer.WriteStartObject(); - if (boundAttribute.IndexerNamePrefix != null) - { - writer.WritePropertyName(nameof(BoundAttributeDescriptor.IndexerNamePrefix)); - writer.WriteValue(boundAttribute.IndexerNamePrefix); - } + writer.WritePropertyName(nameof(BoundAttributeDescriptor.Kind)); + writer.WriteValue(boundAttribute.Kind); - if (boundAttribute.IndexerTypeName != null) - { - writer.WritePropertyName(nameof(BoundAttributeDescriptor.IndexerTypeName)); - writer.WriteValue(boundAttribute.IndexerTypeName); - } + writer.WritePropertyName(nameof(BoundAttributeDescriptor.Name)); + writer.WriteValue(boundAttribute.Name); - if (boundAttribute.Documentation != null) - { - writer.WritePropertyName(nameof(BoundAttributeDescriptor.Documentation)); - writer.WriteValue(boundAttribute.Documentation); - } + writer.WritePropertyName(nameof(BoundAttributeDescriptor.TypeName)); + writer.WriteValue(boundAttribute.TypeName); - if (boundAttribute.Diagnostics != null && boundAttribute.Diagnostics.Count > 0) - { - writer.WritePropertyName(nameof(BoundAttributeDescriptor.Diagnostics)); - serializer.Serialize(writer, boundAttribute.Diagnostics); - } + if (boundAttribute.IsEnum) + { + writer.WritePropertyName(nameof(BoundAttributeDescriptor.IsEnum)); + writer.WriteValue(boundAttribute.IsEnum); + } - writer.WritePropertyName(nameof(BoundAttributeDescriptor.Metadata)); - WriteMetadata(writer, boundAttribute.Metadata); + if (boundAttribute.IndexerNamePrefix != null) + { + writer.WritePropertyName(nameof(BoundAttributeDescriptor.IndexerNamePrefix)); + writer.WriteValue(boundAttribute.IndexerNamePrefix); + } - if (boundAttribute.BoundAttributeParameters != null && boundAttribute.BoundAttributeParameters.Count > 0) - { - writer.WritePropertyName(nameof(BoundAttributeDescriptor.BoundAttributeParameters)); - writer.WriteStartArray(); - foreach (var boundAttributeParameter in boundAttribute.BoundAttributeParameters) - { - WriteBoundAttributeParameter(writer, boundAttributeParameter, serializer); - } - writer.WriteEndArray(); - } + if (boundAttribute.IsEditorRequired) + { + writer.WritePropertyName(nameof(BoundAttributeDescriptor.IsEditorRequired)); + writer.WriteValue(boundAttribute.IsEditorRequired); + } - writer.WriteEndObject(); + if (boundAttribute.IndexerTypeName != null) + { + writer.WritePropertyName(nameof(BoundAttributeDescriptor.IndexerTypeName)); + writer.WriteValue(boundAttribute.IndexerTypeName); } - private static void WriteBoundAttributeParameter(JsonWriter writer, BoundAttributeParameterDescriptor boundAttributeParameter, JsonSerializer serializer) + if (boundAttribute.Documentation != null) { - writer.WriteStartObject(); + writer.WritePropertyName(nameof(BoundAttributeDescriptor.Documentation)); + writer.WriteValue(boundAttribute.Documentation); + } - writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Name)); - writer.WriteValue(boundAttributeParameter.Name); + if (boundAttribute.Diagnostics != null && boundAttribute.Diagnostics.Length > 0) + { + writer.WritePropertyName(nameof(BoundAttributeDescriptor.Diagnostics)); + serializer.Serialize(writer, boundAttribute.Diagnostics); + } - writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.TypeName)); - writer.WriteValue(boundAttributeParameter.TypeName); + writer.WritePropertyName(nameof(BoundAttributeDescriptor.Metadata)); + WriteMetadata(writer, boundAttribute.Metadata); - if (boundAttributeParameter.IsEnum != default) + if (boundAttribute.Parameters != null && boundAttribute.Parameters.Length > 0) + { + writer.WritePropertyName(nameof(BoundAttributeDescriptor.Parameters)); + writer.WriteStartArray(); + foreach (var boundAttributeParameter in boundAttribute.Parameters) { - writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.IsEnum)); - writer.WriteValue(boundAttributeParameter.IsEnum); + WriteBoundAttributeParameter(writer, boundAttributeParameter, serializer); } + writer.WriteEndArray(); + } - if (boundAttributeParameter.Documentation != null) - { - writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Documentation)); - writer.WriteValue(boundAttributeParameter.Documentation); - } + writer.WriteEndObject(); + } - if (boundAttributeParameter.Diagnostics != null && boundAttributeParameter.Diagnostics.Count > 0) - { - writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Diagnostics)); - serializer.Serialize(writer, boundAttributeParameter.Diagnostics); - } + private static void WriteBoundAttributeParameter(JsonWriter writer, BoundAttributeParameterDescriptor boundAttributeParameter, JsonSerializer serializer) + { + writer.WriteStartObject(); + + writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Name)); + writer.WriteValue(boundAttributeParameter.Name); - writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Metadata)); - WriteMetadata(writer, boundAttributeParameter.Metadata); + writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.TypeName)); + writer.WriteValue(boundAttributeParameter.TypeName); - writer.WriteEndObject(); + if (boundAttributeParameter.IsEnum != default) + { + writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.IsEnum)); + writer.WriteValue(boundAttributeParameter.IsEnum); } - private static void WriteMetadata(JsonWriter writer, IReadOnlyDictionary metadata) + if (boundAttributeParameter.Documentation != null) { - writer.WriteStartObject(); - foreach (var kvp in metadata) - { - writer.WritePropertyName(kvp.Key); - writer.WriteValue(kvp.Value); - } - writer.WriteEndObject(); + writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Documentation)); + writer.WriteValue(boundAttributeParameter.Documentation); } - private static void WriteTagMatchingRule(JsonWriter writer, TagMatchingRuleDescriptor ruleDescriptor, JsonSerializer serializer) + if (boundAttributeParameter.Diagnostics != null && boundAttributeParameter.Diagnostics.Length > 0) { - writer.WriteStartObject(); + writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Diagnostics)); + serializer.Serialize(writer, boundAttributeParameter.Diagnostics); + } - writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.TagName)); - writer.WriteValue(ruleDescriptor.TagName); + writer.WritePropertyName(nameof(BoundAttributeParameterDescriptor.Metadata)); + WriteMetadata(writer, boundAttributeParameter.Metadata); - if (ruleDescriptor.ParentTag != null) - { - writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.ParentTag)); - writer.WriteValue(ruleDescriptor.ParentTag); - } + writer.WriteEndObject(); + } - if (ruleDescriptor.TagStructure != default) - { - writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.TagStructure)); - writer.WriteValue(ruleDescriptor.TagStructure); - } + private static void WriteMetadata(JsonWriter writer, MetadataCollection metadata) + { + writer.WriteStartObject(); + foreach (var kvp in metadata) + { + writer.WritePropertyName(kvp.Key); + writer.WriteValue(kvp.Value); + } + writer.WriteEndObject(); + } - if (ruleDescriptor.Attributes != null && ruleDescriptor.Attributes.Count > 0) - { - writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.Attributes)); - writer.WriteStartArray(); - foreach (var requiredAttribute in ruleDescriptor.Attributes) - { - WriteRequiredAttribute(writer, requiredAttribute, serializer); - } - writer.WriteEndArray(); - } + private static void WriteTagMatchingRule(JsonWriter writer, TagMatchingRuleDescriptor ruleDescriptor, JsonSerializer serializer) + { + writer.WriteStartObject(); - if (ruleDescriptor.Diagnostics != null && ruleDescriptor.Diagnostics.Count > 0) - { - writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.Diagnostics)); - serializer.Serialize(writer, ruleDescriptor.Diagnostics); - } + writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.TagName)); + writer.WriteValue(ruleDescriptor.TagName); - writer.WriteEndObject(); + if (ruleDescriptor.ParentTag != null) + { + writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.ParentTag)); + writer.WriteValue(ruleDescriptor.ParentTag); } - private static void WriteRequiredAttribute(JsonWriter writer, RequiredAttributeDescriptor requiredAttribute, JsonSerializer serializer) + if (ruleDescriptor.TagStructure != default) { - writer.WriteStartObject(); - - writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Name)); - writer.WriteValue(requiredAttribute.Name); + writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.TagStructure)); + writer.WriteValue(ruleDescriptor.TagStructure); + } - if (requiredAttribute.NameComparison != default) + if (ruleDescriptor.Attributes != null && ruleDescriptor.Attributes.Length > 0) + { + writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.Attributes)); + writer.WriteStartArray(); + foreach (var requiredAttribute in ruleDescriptor.Attributes) { - writer.WritePropertyName(nameof(RequiredAttributeDescriptor.NameComparison)); - writer.WriteValue(requiredAttribute.NameComparison); + WriteRequiredAttribute(writer, requiredAttribute, serializer); } + writer.WriteEndArray(); + } - if (requiredAttribute.Value != null) - { - writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Value)); - writer.WriteValue(requiredAttribute.Value); - } + if (ruleDescriptor.Diagnostics != null && ruleDescriptor.Diagnostics.Length > 0) + { + writer.WritePropertyName(nameof(TagMatchingRuleDescriptor.Diagnostics)); + serializer.Serialize(writer, ruleDescriptor.Diagnostics); + } - if (requiredAttribute.ValueComparison != default) - { - writer.WritePropertyName(nameof(RequiredAttributeDescriptor.ValueComparison)); - writer.WriteValue(requiredAttribute.ValueComparison); - } + writer.WriteEndObject(); + } - if (requiredAttribute.Diagnostics != null && requiredAttribute.Diagnostics.Count > 0) - { - writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Diagnostics)); - serializer.Serialize(writer, requiredAttribute.Diagnostics); - } + private static void WriteRequiredAttribute(JsonWriter writer, RequiredAttributeDescriptor requiredAttribute, JsonSerializer serializer) + { + writer.WriteStartObject(); - if (requiredAttribute.Metadata != null && requiredAttribute.Metadata.Count > 0) - { - writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Metadata)); - WriteMetadata(writer, requiredAttribute.Metadata); - } + writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Name)); + writer.WriteValue(requiredAttribute.Name); - writer.WriteEndObject(); + if (requiredAttribute.NameComparison != default) + { + writer.WritePropertyName(nameof(RequiredAttributeDescriptor.NameComparison)); + writer.WriteValue(requiredAttribute.NameComparison); } - private static void ReadBoundAttributes(JsonReader reader, TagHelperDescriptorBuilder builder) + if (requiredAttribute.Value != null) { - if (!reader.Read()) - { - return; - } - - if (reader.TokenType != JsonToken.StartArray) - { - return; - } - - do - { - ReadBoundAttribute(reader, builder); - } while (reader.TokenType != JsonToken.EndArray); + writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Value)); + writer.WriteValue(requiredAttribute.Value); } - private static void ReadBoundAttribute(JsonReader reader, TagHelperDescriptorBuilder builder) + if (requiredAttribute.ValueComparison != default) { - if (!reader.Read()) - { - return; - } - - if (reader.TokenType != JsonToken.StartObject) - { - return; - } - - builder.BindAttribute(attribute => - { - reader.ReadProperties(propertyName => - { - switch (propertyName) - { - case nameof(BoundAttributeDescriptor.Name): - if (reader.Read()) - { - var name = (string)reader.Value; - attribute.Name = name; - } - break; - case nameof(BoundAttributeDescriptor.TypeName): - if (reader.Read()) - { - var typeName = (string)reader.Value; - attribute.TypeName = typeName; - } - break; - case nameof(BoundAttributeDescriptor.Documentation): - if (reader.Read()) - { - var documentation = (string)reader.Value; - attribute.Documentation = documentation; - } - break; - case nameof(BoundAttributeDescriptor.IndexerNamePrefix): - if (reader.Read()) - { - var indexerNamePrefix = (string)reader.Value; - if (indexerNamePrefix != null) - { - attribute.IsDictionary = true; - attribute.IndexerAttributeNamePrefix = indexerNamePrefix; - } - } - break; - case nameof(BoundAttributeDescriptor.IndexerTypeName): - if (reader.Read()) - { - var indexerTypeName = (string)reader.Value; - if (indexerTypeName != null) - { - attribute.IsDictionary = true; - attribute.IndexerValueTypeName = indexerTypeName; - } - } - break; - case nameof(BoundAttributeDescriptor.IsEnum): - if (reader.Read()) - { - var isEnum = (bool)reader.Value; - attribute.IsEnum = isEnum; - } - break; - case nameof(BoundAttributeDescriptor.BoundAttributeParameters): - ReadBoundAttributeParameters(reader, attribute); - break; - case nameof(BoundAttributeDescriptor.Diagnostics): - ReadDiagnostics(reader, attribute.Diagnostics); - break; - case nameof(BoundAttributeDescriptor.Metadata): - ReadMetadata(reader, attribute.Metadata); - break; - } - }); - }); + writer.WritePropertyName(nameof(RequiredAttributeDescriptor.ValueComparison)); + writer.WriteValue(requiredAttribute.ValueComparison); } - private static void ReadBoundAttributeParameters(JsonReader reader, BoundAttributeDescriptorBuilder builder) + if (requiredAttribute.Diagnostics != null && requiredAttribute.Diagnostics.Length > 0) { - if (!reader.Read()) - { - return; - } - - if (reader.TokenType != JsonToken.StartArray) - { - return; - } - - do - { - ReadBoundAttributeParameter(reader, builder); - } while (reader.TokenType != JsonToken.EndArray); + writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Diagnostics)); + serializer.Serialize(writer, requiredAttribute.Diagnostics); } - private static void ReadBoundAttributeParameter(JsonReader reader, BoundAttributeDescriptorBuilder builder) + if (requiredAttribute.Metadata != null && requiredAttribute.Metadata.Count > 0) { - if (!reader.Read()) - { - return; - } + writer.WritePropertyName(nameof(RequiredAttributeDescriptor.Metadata)); + WriteMetadata(writer, requiredAttribute.Metadata); + } - if (reader.TokenType != JsonToken.StartObject) - { - return; - } + writer.WriteEndObject(); + } - builder.BindAttributeParameter(parameter => - { - reader.ReadProperties(propertyName => - { - switch (propertyName) - { - case nameof(BoundAttributeParameterDescriptor.Name): - if (reader.Read()) - { - var name = (string)reader.Value; - parameter.Name = name; - } - break; - case nameof(BoundAttributeParameterDescriptor.TypeName): - if (reader.Read()) - { - var typeName = (string)reader.Value; - parameter.TypeName = typeName; - } - break; - case nameof(BoundAttributeParameterDescriptor.IsEnum): - if (reader.Read()) - { - var isEnum = (bool)reader.Value; - parameter.IsEnum = isEnum; - } - break; - case nameof(BoundAttributeParameterDescriptor.Documentation): - if (reader.Read()) - { - var documentation = (string)reader.Value; - parameter.Documentation = documentation; - } - break; - case nameof(BoundAttributeParameterDescriptor.Metadata): - ReadMetadata(reader, parameter.Metadata); - break; - case nameof(BoundAttributeParameterDescriptor.Diagnostics): - ReadDiagnostics(reader, parameter.Diagnostics); - break; - } - }); - }); + private static void ReadBoundAttributes(JsonReader reader, TagHelperDescriptorBuilder builder) + { + if (!reader.Read()) + { + return; } - private static void ReadTagMatchingRules(JsonReader reader, TagHelperDescriptorBuilder builder) + if (reader.TokenType != JsonToken.StartArray) { - if (!reader.Read()) - { - return; - } + return; + } - if (reader.TokenType != JsonToken.StartArray) - { - return; - } + do + { + ReadBoundAttribute(reader, builder); + } while (reader.TokenType != JsonToken.EndArray); + } - do - { - ReadTagMatchingRule(reader, builder); - } while (reader.TokenType != JsonToken.EndArray); + private static void ReadBoundAttribute(JsonReader reader, TagHelperDescriptorBuilder builder) + { + if (!reader.Read()) + { + return; } - private static void ReadTagMatchingRule(JsonReader reader, TagHelperDescriptorBuilder builder) + if (reader.TokenType != JsonToken.StartObject) { - if (!reader.Read()) - { - return; - } - - if (reader.TokenType != JsonToken.StartObject) - { - return; - } + return; + } - builder.TagMatchingRule(rule => + builder.BindAttribute(attribute => + { + reader.ReadProperties(propertyName => { - reader.ReadProperties(propertyName => + switch (propertyName) { - switch (propertyName) - { - case nameof(TagMatchingRuleDescriptor.TagName): - if (reader.Read()) + case nameof(BoundAttributeDescriptor.Name): + if (reader.Read()) + { + var name = (string)reader.Value; + attribute.Name = name; + } + break; + case nameof(BoundAttributeDescriptor.TypeName): + if (reader.Read()) + { + var typeName = (string)reader.Value; + attribute.TypeName = typeName; + } + break; + case nameof(BoundAttributeDescriptor.Documentation): + if (reader.Read()) + { + var documentation = (string)reader.Value; + attribute.SetDocumentation(documentation); + } + break; + case nameof(BoundAttributeDescriptor.IndexerNamePrefix): + if (reader.Read()) + { + var indexerNamePrefix = (string)reader.Value; + if (indexerNamePrefix != null) { - var tagName = (string)reader.Value; - rule.TagName = tagName; + attribute.IsDictionary = true; + attribute.IndexerAttributeNamePrefix = indexerNamePrefix; } - break; - case nameof(TagMatchingRuleDescriptor.ParentTag): - if (reader.Read()) + } + break; + case nameof(BoundAttributeDescriptor.IndexerTypeName): + if (reader.Read()) + { + var indexerTypeName = (string)reader.Value; + if (indexerTypeName != null) { - var parentTag = (string)reader.Value; - rule.ParentTag = parentTag; + attribute.IsDictionary = true; + attribute.IndexerValueTypeName = indexerTypeName; } - break; - case nameof(TagMatchingRuleDescriptor.TagStructure): - rule.TagStructure = (TagStructure)reader.ReadAsInt32(); - break; - case nameof(TagMatchingRuleDescriptor.Attributes): - ReadRequiredAttributeValues(reader, rule); - break; - case nameof(TagMatchingRuleDescriptor.Diagnostics): - ReadDiagnostics(reader, rule.Diagnostics); - break; - } - }); + } + break; + case nameof(BoundAttributeDescriptor.IsEnum): + if (reader.Read()) + { + var isEnum = (bool)reader.Value; + attribute.IsEnum = isEnum; + } + break; + case nameof(BoundAttributeDescriptor.IsEditorRequired): + if (reader.Read()) + { + var value = (bool)reader.Value; + attribute.IsEditorRequired = value; + } + break; + case nameof(BoundAttributeDescriptor.Parameters): + ReadBoundAttributeParameters(reader, attribute); + break; + case nameof(BoundAttributeDescriptor.Diagnostics): + ReadDiagnostics(reader, attribute.Diagnostics); + break; + case nameof(BoundAttributeDescriptor.Metadata): + ReadMetadata(reader, attribute.Metadata); + break; + } }); + }); + } + + private static void ReadBoundAttributeParameters(JsonReader reader, BoundAttributeDescriptorBuilder builder) + { + if (!reader.Read()) + { + return; } - private static void ReadRequiredAttributeValues(JsonReader reader, TagMatchingRuleDescriptorBuilder builder) + if (reader.TokenType != JsonToken.StartArray) { - if (!reader.Read()) - { - return; - } + return; + } - if (reader.TokenType != JsonToken.StartArray) - { - return; - } + do + { + ReadBoundAttributeParameter(reader, builder); + } while (reader.TokenType != JsonToken.EndArray); + } - do - { - ReadRequiredAttribute(reader, builder); - } while (reader.TokenType != JsonToken.EndArray); + private static void ReadBoundAttributeParameter(JsonReader reader, BoundAttributeDescriptorBuilder builder) + { + if (!reader.Read()) + { + return; } - private static void ReadRequiredAttribute(JsonReader reader, TagMatchingRuleDescriptorBuilder builder) + if (reader.TokenType != JsonToken.StartObject) { - if (!reader.Read()) - { - return; - } - - if (reader.TokenType != JsonToken.StartObject) - { - return; - } + return; + } - builder.Attribute(attribute => + builder.BindAttributeParameter(parameter => + { + reader.ReadProperties(propertyName => { - reader.ReadProperties(propertyName => + switch (propertyName) { - switch (propertyName) - { - case nameof(RequiredAttributeDescriptor.Name): - if (reader.Read()) - { - var name = (string)reader.Value; - attribute.Name = name; - } - break; - case nameof(RequiredAttributeDescriptor.NameComparison): - var nameComparison = (RequiredAttributeDescriptor.NameComparisonMode)reader.ReadAsInt32(); - attribute.NameComparisonMode = nameComparison; - break; - case nameof(RequiredAttributeDescriptor.Value): - if (reader.Read()) - { - var value = (string)reader.Value; - attribute.Value = value; - } - break; - case nameof(RequiredAttributeDescriptor.ValueComparison): - var valueComparison = (RequiredAttributeDescriptor.ValueComparisonMode)reader.ReadAsInt32(); - attribute.ValueComparisonMode = valueComparison; - break; - case nameof(RequiredAttributeDescriptor.Diagnostics): - ReadDiagnostics(reader, attribute.Diagnostics); - break; - case nameof(RequiredAttributeDescriptor.Metadata): - ReadMetadata(reader, attribute.Metadata); - break; - } - }); + case nameof(BoundAttributeParameterDescriptor.Name): + if (reader.Read()) + { + var name = (string)reader.Value; + parameter.Name = name; + } + break; + case nameof(BoundAttributeParameterDescriptor.TypeName): + if (reader.Read()) + { + var typeName = (string)reader.Value; + parameter.TypeName = typeName; + } + break; + case nameof(BoundAttributeParameterDescriptor.IsEnum): + if (reader.Read()) + { + var isEnum = (bool)reader.Value; + parameter.IsEnum = isEnum; + } + break; + case nameof(BoundAttributeParameterDescriptor.Documentation): + if (reader.Read()) + { + var documentation = (string)reader.Value; + parameter.SetDocumentation(documentation); + } + break; + case nameof(BoundAttributeParameterDescriptor.Metadata): + ReadMetadata(reader, parameter.Metadata); + break; + case nameof(BoundAttributeParameterDescriptor.Diagnostics): + ReadDiagnostics(reader, parameter.Diagnostics); + break; + } }); - } + }); + } - private static void ReadAllowedChildTags(JsonReader reader, TagHelperDescriptorBuilder builder) + private static void ReadTagMatchingRules(JsonReader reader, TagHelperDescriptorBuilder builder) + { + if (!reader.Read()) { - if (!reader.Read()) - { - return; - } - - if (reader.TokenType != JsonToken.StartArray) - { - return; - } - - do - { - ReadAllowedChildTag(reader, builder); - } while (reader.TokenType != JsonToken.EndArray); + return; } - private static void ReadAllowedChildTag(JsonReader reader, TagHelperDescriptorBuilder builder) + if (reader.TokenType != JsonToken.StartArray) { - if (!reader.Read()) - { - return; - } + return; + } - if (reader.TokenType != JsonToken.StartObject) - { - return; - } + do + { + ReadTagMatchingRule(reader, builder); + } while (reader.TokenType != JsonToken.EndArray); + } - builder.AllowChildTag(childTag => - { - reader.ReadProperties(propertyName => - { - switch (propertyName) - { - case nameof(AllowedChildTagDescriptor.Name): - if (reader.Read()) - { - var name = (string)reader.Value; - childTag.Name = name; - } - break; - case nameof(AllowedChildTagDescriptor.DisplayName): - if (reader.Read()) - { - var displayName = (string)reader.Value; - childTag.DisplayName = displayName; - } - break; - case nameof(AllowedChildTagDescriptor.Diagnostics): - ReadDiagnostics(reader, childTag.Diagnostics); - break; - } - }); - }); + private static void ReadTagMatchingRule(JsonReader reader, TagHelperDescriptorBuilder builder) + { + if (!reader.Read()) + { + return; } - private static void ReadMetadata(JsonReader reader, IDictionary metadata) + if (reader.TokenType != JsonToken.StartObject) { - if (!reader.Read()) - { - return; - } - - if (reader.TokenType != JsonToken.StartObject) - { - return; - } + return; + } + builder.TagMatchingRule(rule => + { reader.ReadProperties(propertyName => { - if (reader.Read()) + switch (propertyName) { - var value = (string)reader.Value; - metadata[propertyName] = value; + case nameof(TagMatchingRuleDescriptor.TagName): + if (reader.Read()) + { + var tagName = (string)reader.Value; + rule.TagName = tagName; + } + break; + case nameof(TagMatchingRuleDescriptor.ParentTag): + if (reader.Read()) + { + var parentTag = (string)reader.Value; + rule.ParentTag = parentTag; + } + break; + case nameof(TagMatchingRuleDescriptor.TagStructure): + rule.TagStructure = (TagStructure)reader.ReadAsInt32(); + break; + case nameof(TagMatchingRuleDescriptor.Attributes): + ReadRequiredAttributeValues(reader, rule); + break; + case nameof(TagMatchingRuleDescriptor.Diagnostics): + ReadDiagnostics(reader, rule.Diagnostics); + break; } }); - } + }); + } - private static void ReadDiagnostics(JsonReader reader, RazorDiagnosticCollection diagnostics) + private static void ReadRequiredAttributeValues(JsonReader reader, TagMatchingRuleDescriptorBuilder builder) + { + if (!reader.Read()) { - if (!reader.Read()) - { - return; - } - - if (reader.TokenType != JsonToken.StartArray) - { - return; - } + return; + } - do - { - ReadDiagnostic(reader, diagnostics); - } while (reader.TokenType != JsonToken.EndArray); + if (reader.TokenType != JsonToken.StartArray) + { + return; } - private static void ReadDiagnostic(JsonReader reader, RazorDiagnosticCollection diagnostics) + do { - if (!reader.Read()) - { - return; - } + ReadRequiredAttribute(reader, builder); + } while (reader.TokenType != JsonToken.EndArray); + } - if (reader.TokenType != JsonToken.StartObject) - { - return; - } + private static void ReadRequiredAttribute(JsonReader reader, TagMatchingRuleDescriptorBuilder builder) + { + if (!reader.Read()) + { + return; + } - string id = default; - int severity = default; - string message = default; - SourceSpan sourceSpan = default; + if (reader.TokenType != JsonToken.StartObject) + { + return; + } + builder.Attribute(attribute => + { reader.ReadProperties(propertyName => { switch (propertyName) { - case nameof(RazorDiagnostic.Id): + case nameof(RequiredAttributeDescriptor.Name): if (reader.Read()) { - id = (string)reader.Value; + var name = (string)reader.Value; + attribute.Name = name; } break; - case nameof(RazorDiagnostic.Severity): - severity = reader.ReadAsInt32().Value; + case nameof(RequiredAttributeDescriptor.NameComparison): + var nameComparison = (RequiredAttributeDescriptor.NameComparisonMode)reader.ReadAsInt32(); + attribute.NameComparisonMode = nameComparison; break; - case "Message": + case nameof(RequiredAttributeDescriptor.Value): if (reader.Read()) { - message = (string)reader.Value; + var value = (string)reader.Value; + attribute.Value = value; } break; - case nameof(RazorDiagnostic.Span): - sourceSpan = ReadSourceSpan(reader); + case nameof(RequiredAttributeDescriptor.ValueComparison): + var valueComparison = (RequiredAttributeDescriptor.ValueComparisonMode)reader.ReadAsInt32(); + attribute.ValueComparisonMode = valueComparison; + break; + case nameof(RequiredAttributeDescriptor.Diagnostics): + ReadDiagnostics(reader, attribute.Diagnostics); + break; + case nameof(RequiredAttributeDescriptor.Metadata): + ReadMetadata(reader, attribute.Metadata); break; } }); + }); + } - var descriptor = new RazorDiagnosticDescriptor(id, () => message, (RazorDiagnosticSeverity)severity); + private static void ReadAllowedChildTags(JsonReader reader, TagHelperDescriptorBuilder builder) + { + if (!reader.Read()) + { + return; + } - var diagnostic = RazorDiagnostic.Create(descriptor, sourceSpan); - diagnostics.Add(diagnostic); + if (reader.TokenType != JsonToken.StartArray) + { + return; } - private static SourceSpan ReadSourceSpan(JsonReader reader) + do { - if (!reader.Read()) - { - return SourceSpan.Undefined; - } + ReadAllowedChildTag(reader, builder); + } while (reader.TokenType != JsonToken.EndArray); + } - if (reader.TokenType != JsonToken.StartObject) - { - return SourceSpan.Undefined; - } + private static void ReadAllowedChildTag(JsonReader reader, TagHelperDescriptorBuilder builder) + { + if (!reader.Read()) + { + return; + } - string filePath = default; - int absoluteIndex = default; - int lineIndex = default; - int characterIndex = default; - int length = default; + if (reader.TokenType != JsonToken.StartObject) + { + return; + } + builder.AllowChildTag(childTag => + { reader.ReadProperties(propertyName => { switch (propertyName) { - case nameof(SourceSpan.FilePath): + case nameof(AllowedChildTagDescriptor.Name): if (reader.Read()) { - filePath = (string)reader.Value; + var name = (string)reader.Value; + childTag.Name = name; } break; - case nameof(SourceSpan.AbsoluteIndex): - absoluteIndex = reader.ReadAsInt32().Value; - break; - case nameof(SourceSpan.LineIndex): - lineIndex = reader.ReadAsInt32().Value; - break; - case nameof(SourceSpan.CharacterIndex): - characterIndex = reader.ReadAsInt32().Value; + case nameof(AllowedChildTagDescriptor.DisplayName): + if (reader.Read()) + { + var displayName = (string)reader.Value; + childTag.DisplayName = displayName; + } break; - case nameof(SourceSpan.Length): - length = reader.ReadAsInt32().Value; + case nameof(AllowedChildTagDescriptor.Diagnostics): + ReadDiagnostics(reader, childTag.Diagnostics); break; } }); + }); + } + + private static void ReadMetadata(JsonReader reader, IDictionary metadata) + { + if (!reader.Read()) + { + return; + } - var sourceSpan = new SourceSpan(filePath, absoluteIndex, lineIndex, characterIndex, length); - return sourceSpan; + if (reader.TokenType != JsonToken.StartObject) + { + return; + } + + reader.ReadProperties(propertyName => + { + if (reader.Read()) + { + var value = (string)reader.Value; + metadata[propertyName] = value; + } + }); + } + + private static void ReadDiagnostics(JsonReader reader, IList diagnostics) + { + if (!reader.Read()) + { + return; + } + + if (reader.TokenType != JsonToken.StartArray) + { + return; + } + + do + { + ReadDiagnostic(reader, diagnostics); + } + while (reader.TokenType != JsonToken.EndArray); + } + + private static void ReadDiagnostic(JsonReader reader, IList diagnostics) + { + if (!reader.Read()) + { + return; } + + if (reader.TokenType != JsonToken.StartObject) + { + return; + } + + string id = default; + int severity = default; + string message = default; + SourceSpan sourceSpan = default; + + reader.ReadProperties(propertyName => + { + switch (propertyName) + { + case nameof(RazorDiagnostic.Id): + if (reader.Read()) + { + id = (string)reader.Value; + } + break; + case nameof(RazorDiagnostic.Severity): + severity = reader.ReadAsInt32().Value; + break; + case "Message": + if (reader.Read()) + { + message = (string)reader.Value; + } + break; + case nameof(RazorDiagnostic.Span): + sourceSpan = ReadSourceSpan(reader); + break; + } + }); + + var descriptor = new RazorDiagnosticDescriptor(id, message, (RazorDiagnosticSeverity)severity); + + var diagnostic = RazorDiagnostic.Create(descriptor, sourceSpan); + diagnostics.Add(diagnostic); + } + + private static SourceSpan ReadSourceSpan(JsonReader reader) + { + if (!reader.Read()) + { + return SourceSpan.Undefined; + } + + if (reader.TokenType != JsonToken.StartObject) + { + return SourceSpan.Undefined; + } + + string filePath = default; + int absoluteIndex = default; + int lineIndex = default; + int characterIndex = default; + int length = default; + + reader.ReadProperties(propertyName => + { + switch (propertyName) + { + case nameof(SourceSpan.FilePath): + if (reader.Read()) + { + filePath = (string)reader.Value; + } + break; + case nameof(SourceSpan.AbsoluteIndex): + absoluteIndex = reader.ReadAsInt32().Value; + break; + case nameof(SourceSpan.LineIndex): + lineIndex = reader.ReadAsInt32().Value; + break; + case nameof(SourceSpan.CharacterIndex): + characterIndex = reader.ReadAsInt32().Value; + break; + case nameof(SourceSpan.Length): + length = reader.ReadAsInt32().Value; + break; + } + }); + + var sourceSpan = new SourceSpan(filePath, absoluteIndex, lineIndex, characterIndex, length); + return sourceSpan; } } From 965343d32027843d05012816e5b3df0488279520 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 00:26:07 +0000 Subject: [PATCH 044/550] [release/8.0.2xx] Update dependencies from dotnet/aspnetcore (#35967) [release/8.0.2xx] Update dependencies from dotnet/aspnetcore --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bcd0eddcf34..0703b80b34da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn 0caa880a161057559d1dcaad890e4053f520136e - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf 50d7731991f3d1c4f1efb94821ecc8c2cb7a1c35 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor f423515361a984e02e6c5a32ab4e8c92ffd022d9 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 - + https://github.com/dotnet/aspnetcore - 6bd37340c54e3b9690102886afca6198a461cb3e + cfc7ac66d89f8e38def01cc19c6d15f4c010c630 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 583faef14940..c927ca5e26df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23506.5 - 8.0.0-rtm.23506.5 - 8.0.0-rtm.23506.5 - 8.0.0-rtm.23506.5 - 8.0.0-rtm.23506.5 - 8.0.0-rtm.23506.5 - 8.0.0-rtm.23506.5 + 8.0.0-rtm.23509.3 + 8.0.0-rtm.23509.3 + 8.0.0-rtm.23509.3 + 8.0.0-rtm.23509.3 + 8.0.0-rtm.23509.3 + 8.0.0-rtm.23509.3 + 8.0.0-rtm.23509.3 From 55365faa6ded8e295778d782384a1f94dcef84ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 18:02:33 +0000 Subject: [PATCH 045/550] [release/8.0.2xx] Update dependencies from dotnet/sourcelink (#36009) [release/8.0.2xx] Update dependencies from dotnet/sourcelink --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c660e1c4e700..674012aa0066 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -348,30 +348,30 @@ https://github.com/dotnet/deployment-tools 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/sourcelink - bd296362cb0b717a4fd0146a9790eadcd8e587a8 + e2f4720f9e7411122675568b984606c405b3bb53 - + https://github.com/dotnet/sourcelink - bd296362cb0b717a4fd0146a9790eadcd8e587a8 + e2f4720f9e7411122675568b984606c405b3bb53 - + https://github.com/dotnet/sourcelink - bd296362cb0b717a4fd0146a9790eadcd8e587a8 + e2f4720f9e7411122675568b984606c405b3bb53 - + https://github.com/dotnet/sourcelink - bd296362cb0b717a4fd0146a9790eadcd8e587a8 + e2f4720f9e7411122675568b984606c405b3bb53 - + https://github.com/dotnet/sourcelink - bd296362cb0b717a4fd0146a9790eadcd8e587a8 + e2f4720f9e7411122675568b984606c405b3bb53 - + https://github.com/dotnet/sourcelink - bd296362cb0b717a4fd0146a9790eadcd8e587a8 + e2f4720f9e7411122675568b984606c405b3bb53 diff --git a/eng/Versions.props b/eng/Versions.props index 24eca1ec09ba..6817e4650d10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,12 +177,12 @@ - 8.0.0-beta.23503.2 - 8.0.0-beta.23503.2 - 8.0.0-beta.23503.2 - 8.0.0-beta.23503.2 - 8.0.0-beta.23503.2 - 8.0.0-beta.23503.2 + 8.0.0-beta.23510.2 + 8.0.0-beta.23510.2 + 8.0.0-beta.23510.2 + 8.0.0-beta.23510.2 + 8.0.0-beta.23510.2 + 8.0.0-beta.23510.2 From e4b8563923e36bc68e0a19a0e6a1448730a40372 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 18:02:49 +0000 Subject: [PATCH 046/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#36010) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 674012aa0066..f2c5e21164f0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ 0c28b5cfe0f9173000450a3edc808dc8c2b9286e - + https://github.com/dotnet/msbuild - 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 + a9341111228592c25c43ecf6858e7b39e525b5a1 - + https://github.com/dotnet/msbuild - 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 + a9341111228592c25c43ecf6858e7b39e525b5a1 - + https://github.com/dotnet/msbuild - 01bf0f2cf0a19b2c064947fba40eae80c1125fb3 + a9341111228592c25c43ecf6858e7b39e525b5a1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6817e4650d10..5dccdb87cfd5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23505-02 + 17.9.0-preview-23511-03 $(MicrosoftBuildPackageVersion) - 8.0.0-rtm.23509.3 - 8.0.0-rtm.23509.3 - 8.0.0-rtm.23509.3 - 8.0.0-rtm.23509.3 - 8.0.0-rtm.23509.3 - 8.0.0-rtm.23509.3 - 8.0.0-rtm.23509.3 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 + 8.0.0-rtm.23510.7 From 196c6f8e7d25f36c814e655ec00e98bd77ed8843 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:13:08 -0700 Subject: [PATCH 049/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#36014) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f6c099e0f62..6ebb8b60ec1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/dotnet/razor - f423515361a984e02e6c5a32ab4e8c92ffd022d9 + 2d0dfa956c515b9a72b9c6a65626f1784c15ee16 - + https://github.com/dotnet/razor - f423515361a984e02e6c5a32ab4e8c92ffd022d9 + 2d0dfa956c515b9a72b9c6a65626f1784c15ee16 - + https://github.com/dotnet/razor - f423515361a984e02e6c5a32ab4e8c92ffd022d9 + 2d0dfa956c515b9a72b9c6a65626f1784c15ee16 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 49165c56be19..94d6fc6ec47a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23510.1 - 7.0.0-preview.23510.1 - 7.0.0-preview.23510.1 + 7.0.0-preview.23511.2 + 7.0.0-preview.23511.2 + 7.0.0-preview.23511.2 From 2c26b3b6df8dc252065ebfc48e4653a4153187f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Oct 2023 17:33:23 -0700 Subject: [PATCH 050/550] [release/8.0.2xx] Update dependencies from microsoft/vstest (#36013) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ebb8b60ec1d..b09dc2a67a82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,18 +180,18 @@ https://github.com/nuget/nuget.client 6a096d0504851db695bef483801a992d65262c64 - + https://github.com/microsoft/vstest - 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 + 89a55b6ca9270e3e12e3e158104518c225f5ed46 - + https://github.com/microsoft/vstest - 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 + 89a55b6ca9270e3e12e3e158104518c225f5ed46 - + https://github.com/microsoft/vstest - 00c72706ecc6d95e1e5c7c5a9d27990ebe16c9b8 + 89a55b6ca9270e3e12e3e158104518c225f5ed46 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 94d6fc6ec47a..44ad3f6c9383 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23506-01 - 17.9.0-preview-23506-01 - 17.9.0-preview-23506-01 + 17.9.0-preview-23509-01 + 17.9.0-preview-23509-01 + 17.9.0-preview-23509-01 From 331fb16cf1e7f27f6e2c46cdce9a71551befe167 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 12:54:55 +0000 Subject: [PATCH 051/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.12 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.10 -> To Version 6.9.0-preview.1.12 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b09dc2a67a82..51420f249185 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/nuget/nuget.client - 6a096d0504851db695bef483801a992d65262c64 + 67959d51c158942cdfc2aa5e14e37429931e6579 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 44ad3f6c9383..44b637a2c540 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.10 - 6.9.0-preview.1.10 + 6.9.0-preview.1.12 + 6.9.0-preview.1.12 6.0.0-rc.278 - 6.9.0-preview.1.10 - 6.9.0-preview.1.10 - 6.9.0-preview.1.10 - 6.9.0-preview.1.10 - 6.9.0-preview.1.10 - 6.9.0-preview.1.10 - 6.9.0-preview.1.10 - 6.9.0-preview.1.10 - 6.9.0-preview.1.10 + 6.9.0-preview.1.12 + 6.9.0-preview.1.12 + 6.9.0-preview.1.12 + 6.9.0-preview.1.12 + 6.9.0-preview.1.12 + 6.9.0-preview.1.12 + 6.9.0-preview.1.12 + 6.9.0-preview.1.12 + 6.9.0-preview.1.12 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 5172e1f202293a6f3994ae4d21d2f82c0106738e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 12:55:28 +0000 Subject: [PATCH 052/550] Update dependencies from https://github.com/dotnet/arcade build 20231005.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23505.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/sdk-task.ps1 | 2 +- eng/common/sdl/trim-assets-version.ps1 | 2 +- eng/common/tools.ps1 | 6 +++--- global.json | 6 +++--- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b09dc2a67a82..41bb4120b64b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -412,30 +412,30 @@ - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 https://github.com/dotnet/runtime a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 - + https://github.com/dotnet/xliff-tasks - 194f32828726c3f1f63f79f3dc09b9e99c157b11 + 73f0850939d96131c28cf6ea6ee5aacb4da0083a diff --git a/eng/Versions.props b/eng/Versions.props index 44ad3f6c9383..03f6becd1079 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.23463.1 + 8.0.0-beta.23505.1 7.0.0-preview.22423.2 8.0.0-rtm.23509.5 4.3.0 @@ -173,7 +173,7 @@ - 1.0.0-beta.23426.1 + 1.0.0-beta.23475.1 @@ -192,7 +192,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.23463.1 + 8.0.0-beta.23505.1 4.18.4 1.3.2 6.0.0-beta.22262.1 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 6c4ac6fec1a9..91f8196cc808 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.6.0-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index d8cfec910c77..a2e004877045 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -25,7 +25,7 @@ function Install-VersionTools-Cli { Write-Host "Installing the package '$CliToolName' with a version of '$version' ..." $feed = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" - $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version") + $argumentList = @("tool", "install", "--local", "$CliToolName", "--add-source $feed", "--no-cache", "--version $Version", "--create-manifest-if-needed") Start-Process "$dotnet" -Verbose -ArgumentList $argumentList -NoNewWindow -Wait } diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index aa74ab4a81e7..84cfe7cd9cb4 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -379,13 +379,13 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = } # Minimum VS version to require. - $vsMinVersionReqdStr = '17.6' + $vsMinVersionReqdStr = '17.7' $vsMinVersionReqd = [Version]::new($vsMinVersionReqdStr) # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.6.0-2 - $defaultXCopyMSBuildVersion = '17.6.0-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 + $defaultXCopyMSBuildVersion = '17.7.2-1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index d99e702173fd..1d9a4381e59a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "8.0.100-rc.1.23455.8", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23505.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23505.1" } } From e802a724c71df398e9d1ca171eaafc69ec8c3a6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 12:56:50 +0000 Subject: [PATCH 053/550] Update dependencies from https://github.com/dotnet/aspnetcore build 20231012.4 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23510.7 -> To Version 8.0.0-rtm.23512.4 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b09dc2a67a82..a6ceef496c3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn 0caa880a161057559d1dcaad890e4053f520136e - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf 50d7731991f3d1c4f1efb94821ecc8c2cb7a1c35 - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor 2d0dfa956c515b9a72b9c6a65626f1784c15ee16 - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/aspnetcore - 7ffeb436ad029d1e1012372b7bb345ad22770f09 + 1805bbbd09a37805a271af6649eeea4fa38d0a5c https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 44ad3f6c9383..e0767f329aae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23510.7 - 8.0.0-rtm.23510.7 - 8.0.0-rtm.23510.7 - 8.0.0-rtm.23510.7 - 8.0.0-rtm.23510.7 - 8.0.0-rtm.23510.7 - 8.0.0-rtm.23510.7 + 8.0.0-rtm.23512.4 + 8.0.0-rtm.23512.4 + 8.0.0-rtm.23512.4 + 8.0.0-rtm.23512.4 + 8.0.0-rtm.23512.4 + 8.0.0-rtm.23512.4 + 8.0.0-rtm.23512.4 From 7180ef86d9d4e7dc69f3b773631732ecfcb3ea62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 12:57:51 +0000 Subject: [PATCH 054/550] Update dependencies from https://github.com/dotnet/razor build 20231012.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23511.2 -> To Version 7.0.0-preview.23512.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b09dc2a67a82..03ef34d4c923 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 7ffeb436ad029d1e1012372b7bb345ad22770f09 - + https://github.com/dotnet/razor - 2d0dfa956c515b9a72b9c6a65626f1784c15ee16 + 23afad2ca6e9de2b205bcaaa391f9758681a36f2 - + https://github.com/dotnet/razor - 2d0dfa956c515b9a72b9c6a65626f1784c15ee16 + 23afad2ca6e9de2b205bcaaa391f9758681a36f2 - + https://github.com/dotnet/razor - 2d0dfa956c515b9a72b9c6a65626f1784c15ee16 + 23afad2ca6e9de2b205bcaaa391f9758681a36f2 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 44ad3f6c9383..93a8019d63ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23511.2 - 7.0.0-preview.23511.2 - 7.0.0-preview.23511.2 + 7.0.0-preview.23512.2 + 7.0.0-preview.23512.2 + 7.0.0-preview.23512.2 From 42125e8d4cb1961d4095b62ea84ba841d49fe9ee Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Wed, 13 Sep 2023 19:01:24 +0200 Subject: [PATCH 055/550] Add escape hatch for publishing with SelfContained=true, but no RuntimeIdentifier. This is identical to issue #33414 (allow PublishAot=true without RuntimeIdentifier), except for the SelfContained property instead of the PublishAot property. This adds an escape hatch for a sanity check when trying to publish with SelfContained=true, but without a RuntimeIdentifier, because the check is not valid when building universal apps for macOS and Mac Catalyst (the netX-macos and netX-maccatalyst target frameworks). When building such an app, the project file will set RuntimeIdentifiers (plural): net8.0-macos osx-x64;osx-arm and then during the build, the macOS SDK will run two inner builds, with RuntimeIdentifiers unset, and RuntimeIdentifier set to each of the rids (and at the end merge the result into a single app). The problem is that the outer build, where RuntimeIdentifiers is set, but RuntimeIdentifier isn't, triggers the sanity check if the developer sets SelfContained=true, and that fails the build. Note that SelfContained defaults to true if PublishTrimmed=true, which means that just setting PublishTrimmed=true also triggers the sanity check. Ref: https://github.com/xamarin/xamarin-macios/issues/19142 --- .../targets/Microsoft.NET.RuntimeIdentifierInference.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets index 91eb3012aaee..b13663b614a0 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets @@ -209,7 +209,7 @@ Copyright (c) .NET Foundation. All rights reserved. Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(HasRuntimeOutput)' == 'true'"> - From 3ba8aeda512cee6f380348453663ecde3e342fba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:35:55 +0000 Subject: [PATCH 056/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#36052) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b09dc2a67a82..0152b4da5a37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ 0c28b5cfe0f9173000450a3edc808dc8c2b9286e - + https://github.com/dotnet/msbuild - a9341111228592c25c43ecf6858e7b39e525b5a1 + c36a54ed3308d1516ffe1a86b9086c42e4ca996f - + https://github.com/dotnet/msbuild - a9341111228592c25c43ecf6858e7b39e525b5a1 + c36a54ed3308d1516ffe1a86b9086c42e4ca996f - + https://github.com/dotnet/msbuild - a9341111228592c25c43ecf6858e7b39e525b5a1 + c36a54ed3308d1516ffe1a86b9086c42e4ca996f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 44ad3f6c9383..ee6cd95606cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23511-03 + 17.9.0-preview-23512-02 $(MicrosoftBuildPackageVersion) - 8.0.100-rtm.23510.1 + 8.0.100-rtm.23511.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23510.1 + 8.0.100-rtm.23511.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From d510ee5ad181d345979e564f15cc068ebac4c3f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:37:55 +0000 Subject: [PATCH 058/550] [release/8.0.2xx] Update dependencies from dotnet/runtime (#36060) [release/8.0.2xx] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51a3344ff031..8b2c7d3b5ea1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,42 +10,42 @@ https://github.com/dotnet/templating 2c2a795a0716540cda47843b5d10ba708a12900e - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 https://github.com/dotnet/emsdk @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest 89a55b6ca9270e3e12e3e158104518c225f5ed46 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 https://github.com/dotnet/windowsdesktop @@ -386,29 +386,29 @@ - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/runtime - a9cc3c80fe43d19a38cacda4c1aecc51fb6eabb1 + 256bf22a3ddf920516752701da2b95e1847ff708 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 0f7188909ab1..8a42dc3fca25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23463.1 7.0.0-preview.22423.2 - 8.0.0-rtm.23509.5 + 8.0.0-rtm.23511.16 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rtm.23509.5 + 8.0.0-rtm.23511.16 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,20 +49,20 @@ - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 @@ -89,9 +89,9 @@ - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 - 8.0.0-rtm.23509.5 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 + 8.0.0-rtm.23511.16 From 9c037f9f82b2fdcb46f0f3748caa6b3c09f0c11c Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Thu, 12 Oct 2023 20:16:46 +0200 Subject: [PATCH 059/550] SDK resolver perf: Optimize EnvironmentProvider.SearchPaths (#36065) --- .../EnvironmentProvider.cs | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/Resolvers/Microsoft.DotNet.NativeWrapper/EnvironmentProvider.cs b/src/Resolvers/Microsoft.DotNet.NativeWrapper/EnvironmentProvider.cs index 75cd6ded54c3..757f738ec7a9 100644 --- a/src/Resolvers/Microsoft.DotNet.NativeWrapper/EnvironmentProvider.cs +++ b/src/Resolvers/Microsoft.DotNet.NativeWrapper/EnvironmentProvider.cs @@ -12,6 +12,8 @@ namespace Microsoft.DotNet.NativeWrapper { public class EnvironmentProvider { + private static readonly char[] s_invalidPathChars = Path.GetInvalidPathChars(); + private IEnumerable _searchPaths; private readonly Func _getEnvironmentVariable; @@ -31,17 +33,12 @@ private IEnumerable SearchPaths { get { - if (_searchPaths == null) - { - var searchPaths = new List(); - - searchPaths.AddRange( - _getEnvironmentVariable(Constants.PATH) - .Split(new char[] { Path.PathSeparator }, options: StringSplitOptions.RemoveEmptyEntries) - .Select(p => p.Trim('"'))); - - _searchPaths = searchPaths; - } + _searchPaths ??= + _getEnvironmentVariable(Constants.PATH) + .Split(new char[] { Path.PathSeparator }, options: StringSplitOptions.RemoveEmptyEntries) + .Select(p => p.Trim('"')) + .Where(p => p.IndexOfAny(s_invalidPathChars) == -1) + .ToList(); return _searchPaths; } @@ -51,7 +48,6 @@ public string GetCommandPath(string commandName) { var commandNameWithExtension = commandName + Constants.ExeSuffix; var commandPath = SearchPaths - .Where(p => !Path.GetInvalidPathChars().Any(c => p.Contains(c))) .Select(p => Path.Combine(p, commandNameWithExtension)) .FirstOrDefault(File.Exists); From 7efeafa7eba05a73721a016f931d1ac0f590de23 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 12 Oct 2023 11:34:50 -0700 Subject: [PATCH 060/550] Enable CI builds for public 2xx branch --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3df0da1ce832..775bc568d823 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -3,7 +3,7 @@ trigger: branches: include: - main - - release/8.0.1xx + - release/8.0.2xx - internal/release/* - exp/* From 3488bf19fb3c6298d0f7fbeac66305b61c9d8e7a Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Wed, 11 Oct 2023 14:23:44 -0700 Subject: [PATCH 061/550] Update minimum MSBuild version --- src/Layout/redist/minimumMSBuildVersion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Layout/redist/minimumMSBuildVersion b/src/Layout/redist/minimumMSBuildVersion index 2d573323cace..3dff47639e32 100644 --- a/src/Layout/redist/minimumMSBuildVersion +++ b/src/Layout/redist/minimumMSBuildVersion @@ -1 +1 @@ -17.7.0 +17.7.2 From 9d68ee2022d76775fa4131246dc23a7dca4dcbbe Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Thu, 12 Oct 2023 13:51:00 -0700 Subject: [PATCH 062/550] Dedup version for workload version subcommand --- src/Cli/dotnet/CommandLineInfo.cs | 2 +- .../commands/dotnet-workload/WorkloadCommandParser.cs | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Cli/dotnet/CommandLineInfo.cs b/src/Cli/dotnet/CommandLineInfo.cs index 2a67d2bd2f14..b931a2cbe157 100644 --- a/src/Cli/dotnet/CommandLineInfo.cs +++ b/src/Cli/dotnet/CommandLineInfo.cs @@ -36,7 +36,7 @@ private static void PrintWorkloadsInfo() { Reporter.Output.WriteLine(); Reporter.Output.WriteLine($"{LocalizableStrings.DotnetWorkloadInfoLabel}"); - WorkloadCommandParser.ShowWorkloadsInfo(); + WorkloadCommandParser.ShowWorkloadsInfo(showVersion: false); } private static string GetDisplayRid(DotnetVersionFile versionFile) diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs index a66915b36625..58a178422aea 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadCommandParser.cs @@ -47,7 +47,7 @@ internal static string GetWorkloadsVersion(WorkloadInfoHelper workloadInfoHelper return workloadInfoHelper.ManifestProvider.GetWorkloadVersion(); } - internal static void ShowWorkloadsInfo(ParseResult parseResult = null, WorkloadInfoHelper workloadInfoHelper = null, IReporter reporter = null, string dotnetDir = null) + internal static void ShowWorkloadsInfo(ParseResult parseResult = null, WorkloadInfoHelper workloadInfoHelper = null, IReporter reporter = null, string dotnetDir = null, bool showVersion = true) { workloadInfoHelper ??= new WorkloadInfoHelper(parseResult != null ? parseResult.HasOption(SharedOptions.InteractiveOption) : false); IEnumerable installedList = workloadInfoHelper.InstalledSdkWorkloadIds; @@ -55,7 +55,10 @@ internal static void ShowWorkloadsInfo(ParseResult parseResult = null, WorkloadI reporter ??= Cli.Utils.Reporter.Output; string dotnetPath = dotnetDir ?? Path.GetDirectoryName(Environment.ProcessPath); - reporter.WriteLine($" Workload version: {workloadInfoHelper.ManifestProvider.GetWorkloadVersion()}"); + if (showVersion) + { + reporter.WriteLine($" Workload version: {workloadInfoHelper.ManifestProvider.GetWorkloadVersion()}"); + } if (installedWorkloads.Count == 0) { From fc49a0d8f8c5d275c52241e020cbbbdef1e209e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:32:44 +0000 Subject: [PATCH 063/550] [main] Update dependencies from dotnet/razor (#36041) [main] Update dependencies from dotnet/razor - Fix xUnit warnings - Use renamed Razor compiler DLLs (cherry picked from commit a36f703483fa026d9fc69ccad5ec8c9bd657f19d) --- .../Targets/Microsoft.NET.Sdk.Razor.Configuration.targets | 4 ++-- src/RazorSdk/Tool/DiscoverCommand.cs | 4 ++-- .../ScopedCssIntegrationTests.cs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Configuration.targets b/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Configuration.targets index 162ba3f8416b..8f0fa59ba967 100644 --- a/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Configuration.targets +++ b/src/RazorSdk/Targets/Microsoft.NET.Sdk.Razor.Configuration.targets @@ -93,8 +93,8 @@ Copyright (c) .NET Foundation. All rights reserved. - Microsoft.AspNetCore.Mvc.Razor.Extensions - $(RazorSdkDirectoryRoot)tools\Microsoft.AspNetCore.Mvc.Razor.Extensions.dll + Microsoft.CodeAnalysis.Razor.Compiler.Mvc + $(RazorSdkDirectoryRoot)tools\Microsoft.CodeAnalysis.Razor.Compiler.Mvc.dll diff --git a/src/RazorSdk/Tool/DiscoverCommand.cs b/src/RazorSdk/Tool/DiscoverCommand.cs index 26ffb93d20e8..fd67bdabc4bb 100644 --- a/src/RazorSdk/Tool/DiscoverCommand.cs +++ b/src/RazorSdk/Tool/DiscoverCommand.cs @@ -109,8 +109,8 @@ internal static void PatchExtensions(CommandOption extensionNames, CommandOption var extensionName = extensionNames.Values[i]; var replacementFileName = extensionName switch { - "MVC-1.0" or "MVC-1.1" => "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.dll", - "MVC-2.0" or "MVC-2.1" => "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.dll", + "MVC-1.0" or "MVC-1.1" => "Microsoft.CodeAnalysis.Razor.Compiler.Mvc.Version1_X.dll", + "MVC-2.0" or "MVC-2.1" => "Microsoft.CodeAnalysis.Razor.Compiler.Mvc.Version2_X.dll", _ => null, }; diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs index 1bd8241383e0..8469b0a9f7d5 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/ScopedCssIntegrationTests.cs @@ -90,7 +90,7 @@ public void CanOverrideScopeIdentifiers() var scoped = Path.Combine(intermediateOutputPath, "scopedcss", "Styles", "Pages", "Counter.rz.scp.css"); new FileInfo(scoped).Should().Exist(); new FileInfo(scoped).Should().Contain("b-overriden"); - var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.NET.Sdk.Razor.SourceGenerators", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler.SourceGenerators", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); new FileInfo(generated).Should().Exist(); new FileInfo(generated).Should().Contain("b-overriden"); new FileInfo(Path.Combine(intermediateOutputPath, "scopedcss", "Components", "Pages", "Index.razor.rz.scp.css")).Should().NotExist(); @@ -319,7 +319,7 @@ public void Build_RemovingScopedCssAndBuilding_UpdatesGeneratedCodeAndBundle() new FileInfo(generatedBundle).Should().Exist(); var generatedProjectBundle = Path.Combine(intermediateOutputPath, "scopedcss", "projectbundle", "ComponentApp.bundle.scp.css"); new FileInfo(generatedProjectBundle).Should().Exist(); - var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.NET.Sdk.Razor.SourceGenerators", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler.SourceGenerators", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); new FileInfo(generatedCounter).Should().Exist(); var componentThumbprint = FileThumbPrint.Create(generatedCounter); From 235d8a9fba4286e178207ad890fd898775cf5f74 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 23:26:49 +0000 Subject: [PATCH 064/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#36055) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b2c7d3b5ea1..248296732d45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild c36a54ed3308d1516ffe1a86b9086c42e4ca996f - + https://github.com/dotnet/fsharp - 736b7454a057e390bf46a05c0f2d8b5760fd5ce9 + a3136432b52975ba4cbd0953d930a436853f56b9 - + https://github.com/dotnet/fsharp - 736b7454a057e390bf46a05c0f2d8b5760fd5ce9 + a3136432b52975ba4cbd0953d930a436853f56b9 diff --git a/eng/Versions.props b/eng/Versions.props index 8a42dc3fca25..f810736c02ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23510.3 + 12.8.0-beta.23511.1 From 4816caa9cb9078ba47228917a248c289ddfc0af9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 23:26:55 +0000 Subject: [PATCH 065/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#36056) [release/8.0.2xx] Update dependencies from dotnet/roslyn --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 248296732d45..67e0a6df33be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ c6c3c61ee64679d41f8e69b9a8f7d4c877f5a5af - + https://github.com/dotnet/roslyn - 0caa880a161057559d1dcaad890e4053f520136e + 07f809aa569c6816010fab21c21a318dee816c68 - + https://github.com/dotnet/roslyn - 0caa880a161057559d1dcaad890e4053f520136e + 07f809aa569c6816010fab21c21a318dee816c68 - + https://github.com/dotnet/roslyn - 0caa880a161057559d1dcaad890e4053f520136e + 07f809aa569c6816010fab21c21a318dee816c68 - + https://github.com/dotnet/roslyn - 0caa880a161057559d1dcaad890e4053f520136e + 07f809aa569c6816010fab21c21a318dee816c68 - + https://github.com/dotnet/roslyn - 0caa880a161057559d1dcaad890e4053f520136e + 07f809aa569c6816010fab21c21a318dee816c68 - + https://github.com/dotnet/roslyn - 0caa880a161057559d1dcaad890e4053f520136e + 07f809aa569c6816010fab21c21a318dee816c68 - + https://github.com/dotnet/roslyn - 0caa880a161057559d1dcaad890e4053f520136e + 07f809aa569c6816010fab21c21a318dee816c68 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f810736c02ea..3b5660c536a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-1.23506.7 - 4.9.0-1.23506.7 - 4.9.0-1.23506.7 - 4.9.0-1.23506.7 - 4.9.0-1.23506.7 - 4.9.0-1.23506.7 - 4.9.0-1.23506.7 + 4.9.0-1.23511.9 + 4.9.0-1.23511.9 + 4.9.0-1.23511.9 + 4.9.0-1.23511.9 + 4.9.0-1.23511.9 + 4.9.0-1.23511.9 + 4.9.0-1.23511.9 $(MicrosoftNetCompilersToolsetPackageVersion) From ddb6f083b58682614fdd16b25e66404c5241e30b Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 12 Oct 2023 16:28:32 -0700 Subject: [PATCH 066/550] Added Directory.Build.props for both dotnet and dotnet.Tests. This file contains the WorkloadCollection alias. --- src/Cli/dotnet/Directory.Build.props | 15 +++++++++++++++ .../install/IWorkloadManifestUpdater.cs | 1 - .../install/WorkloadManifestUpdater.cs | 1 - .../dotnet-workload/list/WorkloadListCommand.cs | 1 - ...GivenWorkloadInstallerAndWorkloadsInstalled.cs | 1 - src/Tests/dotnet.Tests/Directory.Build.props | 15 +++++++++++++++ 6 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 src/Cli/dotnet/Directory.Build.props create mode 100644 src/Tests/dotnet.Tests/Directory.Build.props diff --git a/src/Cli/dotnet/Directory.Build.props b/src/Cli/dotnet/Directory.Build.props new file mode 100644 index 000000000000..c2964d3ec58f --- /dev/null +++ b/src/Cli/dotnet/Directory.Build.props @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs index a196275bae72..d9dec221ad29 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/IWorkloadManifestUpdater.cs @@ -3,7 +3,6 @@ using Microsoft.Extensions.EnvironmentAbstractions; using Microsoft.NET.Sdk.WorkloadManifestReader; -using WorkloadCollection = System.Collections.Generic.Dictionary; namespace Microsoft.DotNet.Workloads.Workload.Install { diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs index 6178356a142c..a7fe27c39f50 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadManifestUpdater.cs @@ -12,7 +12,6 @@ using Microsoft.NET.Sdk.WorkloadManifestReader; using NuGet.Common; using NuGet.Versioning; -using WorkloadCollection = System.Collections.Generic.Dictionary; namespace Microsoft.DotNet.Workloads.Workload.Install { diff --git a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs index 5d98661d4359..2a3d861b517e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/list/WorkloadListCommand.cs @@ -12,7 +12,6 @@ using Microsoft.NET.Sdk.WorkloadManifestReader; using Microsoft.TemplateEngine.Cli.Commands; using InformationStrings = Microsoft.DotNet.Workloads.Workload.LocalizableStrings; -using WorkloadCollection = System.Collections.Generic.Dictionary; namespace Microsoft.DotNet.Workloads.Workload.List { diff --git a/src/Tests/dotnet-workload-list.Tests/GivenWorkloadInstallerAndWorkloadsInstalled.cs b/src/Tests/dotnet-workload-list.Tests/GivenWorkloadInstallerAndWorkloadsInstalled.cs index c282c8f39e4e..29d942429114 100644 --- a/src/Tests/dotnet-workload-list.Tests/GivenWorkloadInstallerAndWorkloadsInstalled.cs +++ b/src/Tests/dotnet-workload-list.Tests/GivenWorkloadInstallerAndWorkloadsInstalled.cs @@ -10,7 +10,6 @@ using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; using Microsoft.DotNet.Workloads.Workload.List; using Microsoft.NET.Sdk.WorkloadManifestReader; -using WorkloadCollection = System.Collections.Generic.Dictionary; namespace Microsoft.DotNet.Cli.Workload.Update.Tests { diff --git a/src/Tests/dotnet.Tests/Directory.Build.props b/src/Tests/dotnet.Tests/Directory.Build.props new file mode 100644 index 000000000000..549915565e64 --- /dev/null +++ b/src/Tests/dotnet.Tests/Directory.Build.props @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + From 64258f60db0068b101f1042f19ff0a7baa95bef0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 12 Oct 2023 16:58:03 -0700 Subject: [PATCH 067/550] Fix the templating baselines --- ...acyCommandIsUsed_common.Linux.verified.txt | 77 ++++++++-------- ...egacyCommandIsUsed_common.OSX.verified.txt | 77 ++++++++-------- ...yCommandIsUsed_common.Windows.verified.txt | 91 +++++++++---------- ...t_WhenListCommandIsUsed.Linux.verified.txt | 77 ++++++++-------- ...est_WhenListCommandIsUsed.OSX.verified.txt | 77 ++++++++-------- ...WhenListCommandIsUsed.Windows.verified.txt | 91 +++++++++---------- 6 files changed, 242 insertions(+), 248 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt index de300f22e68f..0d4a1d78226e 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Linux.verified.txt @@ -4,42 +4,41 @@ For more information, run: These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- -------------------------------- -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ------------------------------ +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright +MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt index de300f22e68f..0d4a1d78226e 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.OSX.verified.txt @@ -4,42 +4,41 @@ For more information, run: These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- -------------------------------- -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ------------------------------ +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright +MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt index 43863371c11c..ca5c1ef0a016 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenLegacyCommandIsUsed_common.Windows.verified.txt @@ -4,49 +4,48 @@ For more information, run: These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- -------------------------------- -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Windows Forms App winforms [C#],VB Common/WinForms -Windows Forms Class Library winformslib [C#],VB Common/WinForms -Windows Forms Control Library winformscontrollib [C#],VB Common/WinForms -Worker Service worker [C#],F# Common/Worker/Web -WPF Application wpf [C#],VB Common/WPF -WPF Class Library wpflib [C#],VB Common/WPF -WPF Custom Control Library wpfcustomcontrollib [C#],VB Common/WPF -WPF User Control Library wpfusercontrollib [C#],VB Common/WPF -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ------------------------------ +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright +MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Windows Forms App winforms [C#],VB Common/WinForms +Windows Forms Class Library winformslib [C#],VB Common/WinForms +Windows Forms Control Library winformscontrollib [C#],VB Common/WinForms +Worker Service worker [C#],F# Common/Worker/Web +WPF Application wpf [C#],VB Common/WPF +WPF Class Library wpflib [C#],VB Common/WPF +WPF Custom Control Library wpfcustomcontrollib [C#],VB Common/WPF +WPF User Control Library wpfusercontrollib [C#],VB Common/WPF +xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt index dbfe3c1db2b7..f969e1c8413b 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Linux.verified.txt @@ -1,41 +1,40 @@ These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- -------------------------------- -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ------------------------------ +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright +MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt index dbfe3c1db2b7..f969e1c8413b 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.OSX.verified.txt @@ -1,41 +1,40 @@ These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- -------------------------------- -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Worker Service worker [C#],F# Common/Worker/Web -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ------------------------------ +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright +MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Worker Service worker [C#],F# Common/Worker/Web +xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt index 78e5e556da33..9b8ba3bb4084 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewListTests.BasicTest_WhenListCommandIsUsed.Windows.verified.txt @@ -1,48 +1,47 @@ These templates matched your input: -Template Name Short Name Language Tags --------------------------------------------- -------------------------- ---------- -------------------------------- -API Controller apicontroller [C#] Web/ASP.NET -ASP.NET Core Empty web [C#],F# Web/Empty -ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service -ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI -ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages -ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC -Blazor Server App blazorserver [C#] Web/Blazor -Blazor Web App blazor [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App blazorwasm [C#] Web/Blazor/WebAssembly/PWA -Blazor WebAssembly App Empty blazorwasm-empty [C#] Web/Blazor/WebAssembly/PWA/Empty -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -dotnet gitignore file gitignore,.gitignore Config -Dotnet local tool manifest file tool-manifest Config -EditorConfig file editorconfig,.editorconfig Config -global.json file globaljson,global.json Config -MSBuild Directory.Build.props file buildprops MSBuild/props -MSBuild Directory.Build.targets file buildtargets MSBuild/props -MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright -MSTest Test Project mstest [C#],F#,VB Test/MSTest -MVC Controller mvccontroller [C#] Web/ASP.NET -MVC ViewImports viewimports [C#] Web/ASP.NET -MVC ViewStart viewstart [C#] Web/ASP.NET -NuGet Config nugetconfig,nuget.config Config -NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit -NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit -NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright -Protocol Buffer File proto Web/gRPC -Razor Class Library razorclasslib [C#] Web/Razor/Library -Razor Component razorcomponent [C#] Web/ASP.NET -Razor Page page [C#] Web/ASP.NET -Razor View view [C#] Web/ASP.NET -Solution File sln,solution Solution -Web Config webconfig Config -Windows Forms App winforms [C#],VB Common/WinForms -Windows Forms Class Library winformslib [C#],VB Common/WinForms -Windows Forms Control Library winformscontrollib [C#],VB Common/WinForms -Worker Service worker [C#],F# Common/Worker/Web -WPF Application wpf [C#],VB Common/WPF -WPF Class Library wpflib [C#],VB Common/WPF -WPF Custom Control Library wpfcustomcontrollib [C#],VB Common/WPF -WPF User Control Library wpfusercontrollib [C#],VB Common/WPF -xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file +Template Name Short Name Language Tags +-------------------------------------------- -------------------------- ---------- ------------------------------ +API Controller apicontroller [C#] Web/ASP.NET +ASP.NET Core Empty web [C#],F# Web/Empty +ASP.NET Core gRPC Service grpc [C#] Web/gRPC/API/Service +ASP.NET Core Web API webapi [C#],F# Web/Web API/API/Service/WebAPI +ASP.NET Core Web API (native AOT) webapiaot [C#] Web/Web API/API/Service +ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +ASP.NET Core Web App (Model-View-Controller) mvc [C#],F# Web/MVC +Blazor Server App blazorserver [C#] Web/Blazor +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Blazor WebAssembly Standalone App blazorwasm [C#] Web/Blazor/WebAssembly/PWA +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +dotnet gitignore file gitignore,.gitignore Config +Dotnet local tool manifest file tool-manifest Config +EditorConfig file editorconfig,.editorconfig Config +global.json file globaljson,global.json Config +MSBuild Directory.Build.props file buildprops MSBuild/props +MSBuild Directory.Build.targets file buildtargets MSBuild/props +MSTest Playwright Test Project mstest-playwright [C#] Test/MSTest/Playwright +MSTest Test Project mstest [C#],F#,VB Test/MSTest +MVC Controller mvccontroller [C#] Web/ASP.NET +MVC ViewImports viewimports [C#] Web/ASP.NET +MVC ViewStart viewstart [C#] Web/ASP.NET +NuGet Config nugetconfig,nuget.config Config +NUnit 3 Test Item nunit-test [C#],F#,VB Test/NUnit +NUnit 3 Test Project nunit [C#],F#,VB Test/NUnit +NUnit Playwright Test Project nunit-playwright [C#] Test/NUnit/Playwright +Protocol Buffer File proto Web/gRPC +Razor Class Library razorclasslib [C#] Web/Razor/Library +Razor Component razorcomponent [C#] Web/ASP.NET +Razor Page page [C#] Web/ASP.NET +Razor View view [C#] Web/ASP.NET +Solution File sln,solution Solution +Web Config webconfig Config +Windows Forms App winforms [C#],VB Common/WinForms +Windows Forms Class Library winformslib [C#],VB Common/WinForms +Windows Forms Control Library winformscontrollib [C#],VB Common/WinForms +Worker Service worker [C#],F# Common/Worker/Web +WPF Application wpf [C#],VB Common/WPF +WPF Class Library wpflib [C#],VB Common/WPF +WPF Custom Control Library wpfcustomcontrollib [C#],VB Common/WPF +WPF User Control Library wpfusercontrollib [C#],VB Common/WPF +xUnit Test Project xunit [C#],F#,VB Test/xUnit \ No newline at end of file From 983d0931a3ec2f3cd1a19b37c0c74a53b7005831 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 12 Oct 2023 17:29:02 -0700 Subject: [PATCH 068/550] Moved the Using items from Directory.Build.props to the .csproj files themselves. --- src/Cli/dotnet/Directory.Build.props | 15 --------------- src/Cli/dotnet/dotnet.csproj | 9 +++++++++ src/Tests/dotnet.Tests/Directory.Build.props | 15 --------------- src/Tests/dotnet.Tests/dotnet.Tests.csproj | 8 ++++++++ 4 files changed, 17 insertions(+), 30 deletions(-) delete mode 100644 src/Cli/dotnet/Directory.Build.props delete mode 100644 src/Tests/dotnet.Tests/Directory.Build.props diff --git a/src/Cli/dotnet/Directory.Build.props b/src/Cli/dotnet/Directory.Build.props deleted file mode 100644 index c2964d3ec58f..000000000000 --- a/src/Cli/dotnet/Directory.Build.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index 461dfd6ab2f2..847bac7ab3a6 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -121,4 +121,13 @@ + + + + + + + + + diff --git a/src/Tests/dotnet.Tests/Directory.Build.props b/src/Tests/dotnet.Tests/Directory.Build.props deleted file mode 100644 index 549915565e64..000000000000 --- a/src/Tests/dotnet.Tests/Directory.Build.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/Tests/dotnet.Tests/dotnet.Tests.csproj b/src/Tests/dotnet.Tests/dotnet.Tests.csproj index 9753c7b25f8d..0179861656c2 100644 --- a/src/Tests/dotnet.Tests/dotnet.Tests.csproj +++ b/src/Tests/dotnet.Tests/dotnet.Tests.csproj @@ -170,5 +170,13 @@ + + + + + + + + From b64b18cca4da90874c86cea5739b03ae790c1cdd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:48:12 +0000 Subject: [PATCH 069/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.13 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.12 -> To Version 6.9.0-preview.1.13 --- NuGet.config | 1 - eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 3 files changed, 43 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..90b91ffc1d4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 - + https://github.com/nuget/nuget.client - 67959d51c158942cdfc2aa5e14e37429931e6579 + 5ce332fb834feea1f6c974d17456c8c9d5504e09 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..34c0de9d4ad0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.12 - 6.9.0-preview.1.12 + 6.9.0-preview.1.13 + 6.9.0-preview.1.13 6.0.0-rc.278 - 6.9.0-preview.1.12 - 6.9.0-preview.1.12 - 6.9.0-preview.1.12 - 6.9.0-preview.1.12 - 6.9.0-preview.1.12 - 6.9.0-preview.1.12 - 6.9.0-preview.1.12 - 6.9.0-preview.1.12 - 6.9.0-preview.1.12 + 6.9.0-preview.1.13 + 6.9.0-preview.1.13 + 6.9.0-preview.1.13 + 6.9.0-preview.1.13 + 6.9.0-preview.1.13 + 6.9.0-preview.1.13 + 6.9.0-preview.1.13 + 6.9.0-preview.1.13 + 6.9.0-preview.1.13 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 671600857b8164ad8bb1582240c75f2f7a2ebbd3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:48:50 +0000 Subject: [PATCH 070/550] Update dependencies from https://github.com/dotnet/arcade build 20231005.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23505.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk From b4f4bddc535ca60c372a5a9dfb85874688c95bec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:49:04 +0000 Subject: [PATCH 071/550] Update dependencies from https://github.com/dotnet/windowsdesktop build 20231012.4 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23509.3 -> To Version 8.0.0-rtm.23512.4 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-rtm.23509.3 -> To Version 8.0.0-rtm.23512.2 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 1 - eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..9208013fe947 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,25 +213,25 @@ https://github.com/dotnet/runtime 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/windowsdesktop - 28cb6ed29636b7db978e83ba1a8a2369584e71f4 + 8844f4e280a7858ab6ef3e227ef090589199956a - + https://github.com/dotnet/windowsdesktop - 28cb6ed29636b7db978e83ba1a8a2369584e71f4 + 8844f4e280a7858ab6ef3e227ef090589199956a - + https://github.com/dotnet/windowsdesktop - 28cb6ed29636b7db978e83ba1a8a2369584e71f4 + 8844f4e280a7858ab6ef3e227ef090589199956a - + https://github.com/dotnet/windowsdesktop - 28cb6ed29636b7db978e83ba1a8a2369584e71f4 + 8844f4e280a7858ab6ef3e227ef090589199956a - + https://github.com/dotnet/wpf - 50d7731991f3d1c4f1efb94821ecc8c2cb7a1c35 + c36f19f3fe41be15f7ca373c5154ea07a6cf40f5 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..d158a55ac765 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ - 8.0.0-rtm.23509.3 + 8.0.0-rtm.23512.2 From 883d7e41b229a1a035ab7a0aa97c83de3f101f82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:49:19 +0000 Subject: [PATCH 072/550] Update dependencies from https://github.com/dotnet/msbuild build 20231013.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23512-02 -> To Version 17.9.0-preview-23513-01 --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..ba06ba51e702 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ 0c28b5cfe0f9173000450a3edc808dc8c2b9286e - + https://github.com/dotnet/msbuild - c36a54ed3308d1516ffe1a86b9086c42e4ca996f + 25fdeb3c8c2608f248faec3d6d37733ae144bbbb - + https://github.com/dotnet/msbuild - c36a54ed3308d1516ffe1a86b9086c42e4ca996f + 25fdeb3c8c2608f248faec3d6d37733ae144bbbb - + https://github.com/dotnet/msbuild - c36a54ed3308d1516ffe1a86b9086c42e4ca996f + 25fdeb3c8c2608f248faec3d6d37733ae144bbbb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..d86a5fab9049 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23512-02 + 17.9.0-preview-23513-01 $(MicrosoftBuildPackageVersion) - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..92804db1d3ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn 07f809aa569c6816010fab21c21a318dee816c68 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf 50d7731991f3d1c4f1efb94821ecc8c2cb7a1c35 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor 23afad2ca6e9de2b205bcaaa391f9758681a36f2 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 - + https://github.com/dotnet/aspnetcore - 1805bbbd09a37805a271af6649eeea4fa38d0a5c + 775bf48a1d908496d1947db71ec98012d664dc54 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..5d227e43a38b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23512.4 - 8.0.0-rtm.23512.4 - 8.0.0-rtm.23512.4 - 8.0.0-rtm.23512.4 - 8.0.0-rtm.23512.4 - 8.0.0-rtm.23512.4 - 8.0.0-rtm.23512.4 + 8.0.0-rtm.23512.20 + 8.0.0-rtm.23512.20 + 8.0.0-rtm.23512.20 + 8.0.0-rtm.23512.20 + 8.0.0-rtm.23512.20 + 8.0.0-rtm.23512.20 + 8.0.0-rtm.23512.20 From 2ae385e7f099608ff5645fa4a789e93e8f3b8586 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:50:48 +0000 Subject: [PATCH 074/550] Update dependencies from https://github.com/dotnet/fsharp build 20231013.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23511.1 -> To Version 8.0.200-beta.23513.2 --- NuGet.config | 1 - eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..5456fe783be4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild c36a54ed3308d1516ffe1a86b9086c42e4ca996f - + https://github.com/dotnet/fsharp - a3136432b52975ba4cbd0953d930a436853f56b9 + d6a7683767704f606f5050b4d73edaadd358afa4 - + https://github.com/dotnet/fsharp - a3136432b52975ba4cbd0953d930a436853f56b9 + d6a7683767704f606f5050b4d73edaadd358afa4 diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..5a6f11479849 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23511.1 + 12.8.0-beta.23513.2 From 51848c6b1795995399c26b8cde49bf4a2c4626df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:50:59 +0000 Subject: [PATCH 075/550] Update dependencies from https://github.com/dotnet/roslyn build 20231012.11 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-1.23511.9 -> To Version 4.9.0-1.23512.11 --- NuGet.config | 1 - eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..896d39263ea9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ c6c3c61ee64679d41f8e69b9a8f7d4c877f5a5af - + https://github.com/dotnet/roslyn - 07f809aa569c6816010fab21c21a318dee816c68 + f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 - + https://github.com/dotnet/roslyn - 07f809aa569c6816010fab21c21a318dee816c68 + f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 - + https://github.com/dotnet/roslyn - 07f809aa569c6816010fab21c21a318dee816c68 + f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 - + https://github.com/dotnet/roslyn - 07f809aa569c6816010fab21c21a318dee816c68 + f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 - + https://github.com/dotnet/roslyn - 07f809aa569c6816010fab21c21a318dee816c68 + f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 - + https://github.com/dotnet/roslyn - 07f809aa569c6816010fab21c21a318dee816c68 + f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 - + https://github.com/dotnet/roslyn - 07f809aa569c6816010fab21c21a318dee816c68 + f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..434e83b47880 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-1.23511.9 - 4.9.0-1.23511.9 - 4.9.0-1.23511.9 - 4.9.0-1.23511.9 - 4.9.0-1.23511.9 - 4.9.0-1.23511.9 - 4.9.0-1.23511.9 + 4.9.0-1.23512.11 + 4.9.0-1.23512.11 + 4.9.0-1.23512.11 + 4.9.0-1.23512.11 + 4.9.0-1.23512.11 + 4.9.0-1.23512.11 + 4.9.0-1.23512.11 $(MicrosoftNetCompilersToolsetPackageVersion) From d0c0090e356ac6a0490a3504be54aa74b911bad9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:51:22 +0000 Subject: [PATCH 076/550] Update dependencies from https://github.com/dotnet/format build 20231013.1 dotnet-format From Version 8.0.447601 -> To Version 8.0.451301 --- NuGet.config | 1 - eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..8cc5e0c83695 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,9 +74,9 @@ a3136432b52975ba4cbd0953d930a436853f56b9 - + https://github.com/dotnet/format - c6c3c61ee64679d41f8e69b9a8f7d4c877f5a5af + c9c1bfa18a3ab335849ee4f8529e1126edd97029 diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..f26919218725 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.447601 + 8.0.451301 From 452f6c24a98b56cfd2b2de7dea3a81bf2ab0bf03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:51:34 +0000 Subject: [PATCH 077/550] Update dependencies from https://github.com/dotnet/templating build 20231012.5 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23511.1 -> To Version 8.0.100-rtm.23512.5 --- NuGet.config | 1 - eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..bfdcf804d6a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 2c2a795a0716540cda47843b5d10ba708a12900e + 8058c9011bfb9b42c592cbd5a76719e34c62e79c - + https://github.com/dotnet/templating - 2c2a795a0716540cda47843b5d10ba708a12900e + 8058c9011bfb9b42c592cbd5a76719e34c62e79c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..752dff2398a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23511.1 + 8.0.100-rtm.23512.5 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23511.1 + 8.0.100-rtm.23512.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 3f2a8d2bd34fad5c1b09493c5a30db371bb4486d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:51:46 +0000 Subject: [PATCH 078/550] Update dependencies from https://github.com/microsoft/vstest build 20231012.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23509-01 -> To Version 17.9.0-preview-23512-02 --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..9f291a6de316 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,18 +180,18 @@ https://github.com/nuget/nuget.client 67959d51c158942cdfc2aa5e14e37429931e6579 - + https://github.com/microsoft/vstest - 89a55b6ca9270e3e12e3e158104518c225f5ed46 + 8b7ab75f0b8e73febbcb18c118fdee984c7898a8 - + https://github.com/microsoft/vstest - 89a55b6ca9270e3e12e3e158104518c225f5ed46 + 8b7ab75f0b8e73febbcb18c118fdee984c7898a8 - + https://github.com/microsoft/vstest - 89a55b6ca9270e3e12e3e158104518c225f5ed46 + 8b7ab75f0b8e73febbcb18c118fdee984c7898a8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..11c4ff75e8ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23509-01 - 17.9.0-preview-23509-01 - 17.9.0-preview-23509-01 + 17.9.0-preview-23512-02 + 17.9.0-preview-23512-02 + 17.9.0-preview-23512-02 From 5f7e93e625ca5049e4532d0358b88cc0caeeaac0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Oct 2023 12:51:57 +0000 Subject: [PATCH 079/550] Update dependencies from https://github.com/dotnet/razor build 20231013.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23512.2 -> To Version 7.0.0-preview.23513.2 --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..450b39c67873 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/razor - 23afad2ca6e9de2b205bcaaa391f9758681a36f2 + 900a50ef9ac0ba1b21b76dd0fb87a0cfedafc1fb - + https://github.com/dotnet/razor - 23afad2ca6e9de2b205bcaaa391f9758681a36f2 + 900a50ef9ac0ba1b21b76dd0fb87a0cfedafc1fb - + https://github.com/dotnet/razor - 23afad2ca6e9de2b205bcaaa391f9758681a36f2 + 900a50ef9ac0ba1b21b76dd0fb87a0cfedafc1fb https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..858092407cd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23512.2 - 7.0.0-preview.23512.2 - 7.0.0-preview.23512.2 + 7.0.0-preview.23513.2 + 7.0.0-preview.23513.2 + 7.0.0-preview.23513.2 From 0f5da9aed9d320b04270de3da9de5704f7f2fc21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:50:23 +0000 Subject: [PATCH 080/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.13 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.12 -> To Version 6.9.0-preview.1.13 From f6e7a485fba2d6feb76ffc41ef3f3c54750c57c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:51:00 +0000 Subject: [PATCH 081/550] Update dependencies from https://github.com/dotnet/arcade build 20231005.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23505.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk From bab256d974dbe024e5674846437e497c9fa01daf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:51:19 +0000 Subject: [PATCH 082/550] Update dependencies from https://github.com/dotnet/windowsdesktop build 20231014.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23509.3 -> To Version 8.0.0-rtm.23514.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-rtm.23509.3 -> To Version 8.0.0-rtm.23514.1 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9208013fe947..cf840bf673d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,25 +213,25 @@ https://github.com/dotnet/runtime 256bf22a3ddf920516752701da2b95e1847ff708 - + https://github.com/dotnet/windowsdesktop - 8844f4e280a7858ab6ef3e227ef090589199956a + a90eae1160573eb1274e346881214713640de729 - + https://github.com/dotnet/windowsdesktop - 8844f4e280a7858ab6ef3e227ef090589199956a + a90eae1160573eb1274e346881214713640de729 - + https://github.com/dotnet/windowsdesktop - 8844f4e280a7858ab6ef3e227ef090589199956a + a90eae1160573eb1274e346881214713640de729 - + https://github.com/dotnet/windowsdesktop - 8844f4e280a7858ab6ef3e227ef090589199956a + a90eae1160573eb1274e346881214713640de729 - + https://github.com/dotnet/wpf - c36f19f3fe41be15f7ca373c5154ea07a6cf40f5 + ecee80556f0b2551b618c677c7f67910d4d3eb22 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d158a55ac765..4bd8e22e23dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ - 8.0.0-rtm.23512.2 + 8.0.0-rtm.23514.1 From 44b10aefa4429f3e9a49a34abb92a12e53feb0c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:51:36 +0000 Subject: [PATCH 083/550] Update dependencies from https://github.com/dotnet/msbuild build 20231013.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23512-02 -> To Version 17.9.0-preview-23513-01 From e2ce916fd39f89298d65ab6d43490868adfcb13f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:52:52 +0000 Subject: [PATCH 084/550] Update dependencies from https://github.com/dotnet/aspnetcore build 20231013.13 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23512.4 -> To Version 8.0.0-rtm.23513.13 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92804db1d3ed..75f650489305 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn 07f809aa569c6816010fab21c21a318dee816c68 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf 50d7731991f3d1c4f1efb94821ecc8c2cb7a1c35 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor 23afad2ca6e9de2b205bcaaa391f9758681a36f2 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/aspnetcore - 775bf48a1d908496d1947db71ec98012d664dc54 + cbfc558b6dd2676b47c8009e2453ddce5725c8d7 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 5d227e43a38b..613e739d1420 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23512.20 - 8.0.0-rtm.23512.20 - 8.0.0-rtm.23512.20 - 8.0.0-rtm.23512.20 - 8.0.0-rtm.23512.20 - 8.0.0-rtm.23512.20 - 8.0.0-rtm.23512.20 + 8.0.0-rtm.23513.13 + 8.0.0-rtm.23513.13 + 8.0.0-rtm.23513.13 + 8.0.0-rtm.23513.13 + 8.0.0-rtm.23513.13 + 8.0.0-rtm.23513.13 + 8.0.0-rtm.23513.13 From 839b300bd34c43c8bf549a366f3c6f28beb06f91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:53:08 +0000 Subject: [PATCH 085/550] Update dependencies from https://github.com/dotnet/fsharp build 20231013.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23511.1 -> To Version 8.0.200-beta.23513.2 From f6e5a946b68b24a950245d95fc48444748b1c5d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:53:24 +0000 Subject: [PATCH 086/550] Update dependencies from https://github.com/dotnet/roslyn build 20231013.7 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-1.23511.9 -> To Version 4.9.0-1.23513.7 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 896d39263ea9..8b3247daeb1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ c6c3c61ee64679d41f8e69b9a8f7d4c877f5a5af - + https://github.com/dotnet/roslyn - f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 + fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/roslyn - f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 + fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/roslyn - f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 + fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/roslyn - f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 + fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/roslyn - f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 + fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/roslyn - f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 + fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/roslyn - f07881f4ea5fcfcfbc5044480a17fe506d6ef6e9 + fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 434e83b47880..cea35a5d292c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-1.23512.11 - 4.9.0-1.23512.11 - 4.9.0-1.23512.11 - 4.9.0-1.23512.11 - 4.9.0-1.23512.11 - 4.9.0-1.23512.11 - 4.9.0-1.23512.11 + 4.9.0-1.23513.7 + 4.9.0-1.23513.7 + 4.9.0-1.23513.7 + 4.9.0-1.23513.7 + 4.9.0-1.23513.7 + 4.9.0-1.23513.7 + 4.9.0-1.23513.7 $(MicrosoftNetCompilersToolsetPackageVersion) From af2b6d55bae919af7d5674003d1b90d15ebd3025 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:53:52 +0000 Subject: [PATCH 087/550] Update dependencies from https://github.com/dotnet/format build 20231013.1 dotnet-format From Version 8.0.447601 -> To Version 8.0.451301 From c82e34bb9fe3baf2d67283c97804130205e4965f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:54:11 +0000 Subject: [PATCH 088/550] Update dependencies from https://github.com/dotnet/templating build 20231012.5 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23511.1 -> To Version 8.0.100-rtm.23512.5 From 0e7d3983faa20dce7ff7b572a792dab727a083df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:54:27 +0000 Subject: [PATCH 089/550] Update dependencies from https://github.com/microsoft/vstest build 20231012.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23509-01 -> To Version 17.9.0-preview-23512-02 From 1b4fcea4fcf03bc6eb60ae5036673df94e676436 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:54:41 +0000 Subject: [PATCH 090/550] Update dependencies from https://github.com/dotnet/razor build 20231013.5 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23512.2 -> To Version 7.0.0-preview.23513.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 450b39c67873..c028553b5a20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 1805bbbd09a37805a271af6649eeea4fa38d0a5c - + https://github.com/dotnet/razor - 900a50ef9ac0ba1b21b76dd0fb87a0cfedafc1fb + 70de4689362603133828586beccbfa5c0c88b29a - + https://github.com/dotnet/razor - 900a50ef9ac0ba1b21b76dd0fb87a0cfedafc1fb + 70de4689362603133828586beccbfa5c0c88b29a - + https://github.com/dotnet/razor - 900a50ef9ac0ba1b21b76dd0fb87a0cfedafc1fb + 70de4689362603133828586beccbfa5c0c88b29a https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 858092407cd6..3976991b2cbf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23513.2 - 7.0.0-preview.23513.2 - 7.0.0-preview.23513.2 + 7.0.0-preview.23513.5 + 7.0.0-preview.23513.5 + 7.0.0-preview.23513.5 From ef4cba8db9b44427beee2b7cf1f32bfbd55cbd65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Oct 2023 12:54:52 +0000 Subject: [PATCH 091/550] Update dependencies from https://github.com/dotnet/runtime build 20231013.17 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23511.16 -> To Version 8.0.0-rtm.23513.17 --- NuGet.config | 1 - eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 3 files changed, 57 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index b2068eb87601..1348db7fdadc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f71bcad97fb6..6f6390a5cec0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,42 +10,42 @@ https://github.com/dotnet/templating 2c2a795a0716540cda47843b5d10ba708a12900e - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b https://github.com/dotnet/emsdk @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest 89a55b6ca9270e3e12e3e158104518c225f5ed46 - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b https://github.com/dotnet/windowsdesktop @@ -386,29 +386,29 @@ - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/runtime - 256bf22a3ddf920516752701da2b95e1847ff708 + 60b77a63df30362ed1c66a834fcb8f8956ea113b https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index b84d68c92b68..4198527bef3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23463.1 7.0.0-preview.22423.2 - 8.0.0-rtm.23511.16 + 8.0.0-rtm.23513.17 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rtm.23511.16 + 8.0.0-rtm.23513.17 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,20 +49,20 @@ - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 @@ -89,9 +89,9 @@ - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 - 8.0.0-rtm.23511.16 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 + 8.0.0-rtm.23513.17 From 25d46f82e0fb22e14686e121703e11f5088c1511 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Oct 2023 12:45:19 +0000 Subject: [PATCH 092/550] Update dependencies from https://github.com/dotnet/arcade build 20231005.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23505.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk From 39d44a8a2280a2f2e2aba670ff3ebf782f95e442 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 12:46:05 -0700 Subject: [PATCH 093/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#36142) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c9c9d30df1b..06b57b9bc39e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore cbfc558b6dd2676b47c8009e2453ddce5725c8d7 - + https://github.com/dotnet/razor - 70de4689362603133828586beccbfa5c0c88b29a + 99a4eb1ae6a785a12094fd40a415c57046d471b0 - + https://github.com/dotnet/razor - 70de4689362603133828586beccbfa5c0c88b29a + 99a4eb1ae6a785a12094fd40a415c57046d471b0 - + https://github.com/dotnet/razor - 70de4689362603133828586beccbfa5c0c88b29a + 99a4eb1ae6a785a12094fd40a415c57046d471b0 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index fed7fb258303..f4388245cdaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23513.5 - 7.0.0-preview.23513.5 - 7.0.0-preview.23513.5 + 7.0.0-preview.23515.2 + 7.0.0-preview.23515.2 + 7.0.0-preview.23515.2 From 88d3a5dfb1697cfffd1ba0cf63a79f8e7fa5cfd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:05:00 +0000 Subject: [PATCH 094/550] [release/8.0.2xx] Update dependencies from dotnet/aspnetcore (#36139) [release/8.0.2xx] Update dependencies from dotnet/aspnetcore --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06b57b9bc39e..2f9c87083c7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf ecee80556f0b2551b618c677c7f67910d4d3eb22 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor 99a4eb1ae6a785a12094fd40a415c57046d471b0 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/dotnet/aspnetcore - cbfc558b6dd2676b47c8009e2453ddce5725c8d7 + faf594a06685882b29522bede329f94db94bb3c1 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index f4388245cdaa..81693b29b0e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23513.13 - 8.0.0-rtm.23513.13 - 8.0.0-rtm.23513.13 - 8.0.0-rtm.23513.13 - 8.0.0-rtm.23513.13 - 8.0.0-rtm.23513.13 - 8.0.0-rtm.23513.13 + 8.0.0-rtm.23514.1 + 8.0.0-rtm.23514.1 + 8.0.0-rtm.23514.1 + 8.0.0-rtm.23514.1 + 8.0.0-rtm.23514.1 + 8.0.0-rtm.23514.1 + 8.0.0-rtm.23514.1 From 0298dd5f4879c03077023f05dde2912c5bbc8e6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:05:13 +0000 Subject: [PATCH 095/550] [release/8.0.2xx] Update dependencies from dotnet/templating (#36141) [release/8.0.2xx] Update dependencies from dotnet/templating --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f9c87083c7a..f9cd6e342405 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 8058c9011bfb9b42c592cbd5a76719e34c62e79c + f0e678f0045f9ed8f31fbe35101a169dc640a61d - + https://github.com/dotnet/templating - 8058c9011bfb9b42c592cbd5a76719e34c62e79c + f0e678f0045f9ed8f31fbe35101a169dc640a61d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 81693b29b0e5..005f17b690b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23512.5 + 8.0.100-rtm.23515.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23512.5 + 8.0.100-rtm.23515.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 4e4f133f4d4715ee5be125019965911ce8f50317 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 23:50:29 +0000 Subject: [PATCH 096/550] [release/8.0.2xx] Update dependencies from nuget/nuget.client (#36138) [release/8.0.2xx] Update dependencies from nuget/nuget.client --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9cd6e342405..778436fb323d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore faf594a06685882b29522bede329f94db94bb3c1 - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client - 5ce332fb834feea1f6c974d17456c8c9d5504e09 + 62c02514a26464c03574137628e33ed3690c06ef https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 005f17b690b4..e923f79cce7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.13 - 6.9.0-preview.1.13 + 6.9.0-preview.1.16 + 6.9.0-preview.1.16 6.0.0-rc.278 - 6.9.0-preview.1.13 - 6.9.0-preview.1.13 - 6.9.0-preview.1.13 - 6.9.0-preview.1.13 - 6.9.0-preview.1.13 - 6.9.0-preview.1.13 - 6.9.0-preview.1.13 - 6.9.0-preview.1.13 - 6.9.0-preview.1.13 + 6.9.0-preview.1.16 + 6.9.0-preview.1.16 + 6.9.0-preview.1.16 + 6.9.0-preview.1.16 + 6.9.0-preview.1.16 + 6.9.0-preview.1.16 + 6.9.0-preview.1.16 + 6.9.0-preview.1.16 + 6.9.0-preview.1.16 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 0340c87ab8a2561fc529b99f6dc3fa677dceb277 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 13:00:30 +0000 Subject: [PATCH 097/550] Update dependencies from https://github.com/dotnet/arcade build 20231005.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23505.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk From 7e9d29a3cc922449b700dca9be6cdeae5b6f85a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 13:01:09 +0000 Subject: [PATCH 098/550] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20231016.2 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23472.1 -> To Version 3.11.0-beta1.23516.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778436fb323d..288c05ef8be8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -312,17 +312,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - 4a7701fd72094614897b33e4cb1d9640c221d862 + 4ff28092cdb2006c30869fb35b2fd6b7b11382b1 - + https://github.com/dotnet/roslyn-analyzers - 4a7701fd72094614897b33e4cb1d9640c221d862 + 4ff28092cdb2006c30869fb35b2fd6b7b11382b1 - + https://github.com/dotnet/roslyn-analyzers - 4a7701fd72094614897b33e4cb1d9640c221d862 + 4ff28092cdb2006c30869fb35b2fd6b7b11382b1 diff --git a/eng/Versions.props b/eng/Versions.props index e923f79cce7e..a9ab4cee569b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,8 +99,8 @@ - 8.0.0-preview.23472.1 - 3.11.0-beta1.23472.1 + 8.0.0-preview.23516.2 + 3.11.0-beta1.23516.2 From d1db9b6bd3cb4b52fa42e867f75a4ef0b8dd1552 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 13:02:48 +0000 Subject: [PATCH 099/550] Update dependencies from https://github.com/dotnet/format build 20231017.2 dotnet-format From Version 8.0.451301 -> To Version 8.0.451702 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778436fb323d..e7710e01557f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,9 +74,9 @@ d6a7683767704f606f5050b4d73edaadd358afa4 - + https://github.com/dotnet/format - c9c1bfa18a3ab335849ee4f8529e1126edd97029 + e2182d1349594e2efd593bd0616df22d7e809413 diff --git a/eng/Versions.props b/eng/Versions.props index e923f79cce7e..7dd75d3c4850 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.451301 + 8.0.451702 From 9285e7569f0b41e329a4d374a662842a9b630952 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 13:03:00 +0000 Subject: [PATCH 100/550] Update dependencies from https://github.com/dotnet/templating build 20231016.16 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23515.3 -> To Version 8.0.100-rtm.23516.16 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778436fb323d..fb51c9426875 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - f0e678f0045f9ed8f31fbe35101a169dc640a61d + 95c4709f1fe9af7afba9159577f4bda10c403623 - + https://github.com/dotnet/templating - f0e678f0045f9ed8f31fbe35101a169dc640a61d + 95c4709f1fe9af7afba9159577f4bda10c403623 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e923f79cce7e..9094135582d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23515.3 + 8.0.100-rtm.23516.16 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23515.3 + 8.0.100-rtm.23516.16 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 7ee906e05fe727e74078207760c9a344c8e25d68 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:24:08 +0000 Subject: [PATCH 101/550] [release/8.0.2xx] Update dependencies from dotnet/windowsdesktop (#36168) [release/8.0.2xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 8.0.0-rtm.23514.1 to 8.0.0-rtm.23516.12 (parent: Microsoft.WindowsDesktop.App.Ref) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778436fb323d..305b8efeede2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,25 +213,25 @@ https://github.com/dotnet/runtime 60b77a63df30362ed1c66a834fcb8f8956ea113b - + https://github.com/dotnet/windowsdesktop - a90eae1160573eb1274e346881214713640de729 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/windowsdesktop - a90eae1160573eb1274e346881214713640de729 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/windowsdesktop - a90eae1160573eb1274e346881214713640de729 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/windowsdesktop - a90eae1160573eb1274e346881214713640de729 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/wpf - ecee80556f0b2551b618c677c7f67910d4d3eb22 + babeeb65b164c87633db21a20223c8d99e2185e9 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e923f79cce7e..66084979b805 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ - 8.0.0-rtm.23514.1 + 8.0.0-rtm.23516.12 From 2d200321ed1f30d4191761e523c7ef757519809f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:25:14 +0000 Subject: [PATCH 102/550] [release/8.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#36170) [release/8.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 305b8efeede2..ed247d3f84dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -339,9 +339,9 @@ ed17956dbc31097b7ba6a66be086f4a70a97d84f - + https://github.com/dotnet/source-build-reference-packages - 5dd44eb4f5ebf8d1b11152344397b5a79d7f88ea + b4fa7f2e1e65ef49881be2ab2df27624280a8c55 From 2afaeab725ff6f1daf15766f4d54a7fe829840d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:25:33 +0000 Subject: [PATCH 103/550] [release/8.0.2xx] Update dependencies from dotnet/aspnetcore (#36171) [release/8.0.2xx] Update dependencies from dotnet/aspnetcore --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed247d3f84dc..b12e0cca1eb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf babeeb65b164c87633db21a20223c8d99e2185e9 - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor 99a4eb1ae6a785a12094fd40a415c57046d471b0 - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - faf594a06685882b29522bede329f94db94bb3c1 + 02bdf7077b8d96039bd39d6189a1abdefc41e65e https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 66084979b805..92acb9f4c44c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23514.1 - 8.0.0-rtm.23514.1 - 8.0.0-rtm.23514.1 - 8.0.0-rtm.23514.1 - 8.0.0-rtm.23514.1 - 8.0.0-rtm.23514.1 - 8.0.0-rtm.23514.1 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 From f37b206deec3ba2a57e49e3b90694e89d3dd06cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:25:39 +0000 Subject: [PATCH 104/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#36172) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b12e0cca1eb0..79514ac1e4ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild 25fdeb3c8c2608f248faec3d6d37733ae144bbbb - + https://github.com/dotnet/fsharp - d6a7683767704f606f5050b4d73edaadd358afa4 + d1de6a8d1e6e18c636cf55894b5158ab0e324394 - + https://github.com/dotnet/fsharp - d6a7683767704f606f5050b4d73edaadd358afa4 + d1de6a8d1e6e18c636cf55894b5158ab0e324394 diff --git a/eng/Versions.props b/eng/Versions.props index 92acb9f4c44c..a91169e08f22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23513.2 + 12.8.0-beta.23516.2 From ff79c79c19fa8082d788b663233146069e61524b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:26:23 +0000 Subject: [PATCH 105/550] [release/8.0.2xx] Update dependencies from microsoft/vstest (#36176) [release/8.0.2xx] Update dependencies from microsoft/vstest --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79514ac1e4ee..4ca542453b34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,18 +180,18 @@ https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/microsoft/vstest - 8b7ab75f0b8e73febbcb18c118fdee984c7898a8 + 5f9cc79b6542489218124e304c7118e862ae286f - + https://github.com/microsoft/vstest - 8b7ab75f0b8e73febbcb18c118fdee984c7898a8 + 5f9cc79b6542489218124e304c7118e862ae286f - + https://github.com/microsoft/vstest - 8b7ab75f0b8e73febbcb18c118fdee984c7898a8 + 5f9cc79b6542489218124e304c7118e862ae286f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a91169e08f22..ad704fd9e570 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23512-02 - 17.9.0-preview-23512-02 - 17.9.0-preview-23512-02 + 17.9.0-preview-23515-01 + 17.9.0-preview-23515-01 + 17.9.0-preview-23515-01 From 82539a5057617f51734a4f02700fe98af8c9d446 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:26:29 +0000 Subject: [PATCH 106/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#36177) [release/8.0.2xx] Update dependencies from dotnet/razor --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ca542453b34..f1d14293e385 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/razor - 99a4eb1ae6a785a12094fd40a415c57046d471b0 + d46e13446729904fe02bb371d23cc96add0a57fd - + https://github.com/dotnet/razor - 99a4eb1ae6a785a12094fd40a415c57046d471b0 + d46e13446729904fe02bb371d23cc96add0a57fd - + https://github.com/dotnet/razor - 99a4eb1ae6a785a12094fd40a415c57046d471b0 + d46e13446729904fe02bb371d23cc96add0a57fd https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ad704fd9e570..ea8437b0bf68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23515.2 - 7.0.0-preview.23515.2 - 7.0.0-preview.23515.2 + 7.0.0-preview.23516.3 + 7.0.0-preview.23516.3 + 7.0.0-preview.23516.3 From 76231e8cd6213ed2324a375c8c5ba72620d05a5b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 17 Oct 2023 16:26:38 +0000 Subject: [PATCH 107/550] [release/8.0.2xx] Update dependencies from dotnet/runtime (#36178) [release/8.0.2xx] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1d14293e385..d13993e302ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,42 +10,42 @@ https://github.com/dotnet/templating f0e678f0045f9ed8f31fbe35101a169dc640a61d - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 https://github.com/dotnet/emsdk @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest 5f9cc79b6542489218124e304c7118e862ae286f - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 https://github.com/dotnet/windowsdesktop @@ -386,29 +386,29 @@ - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/runtime - 60b77a63df30362ed1c66a834fcb8f8956ea113b + 567f81e719091bd1ba3c751d49bacee2c6a45e66 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index ea8437b0bf68..f6ee19d0c42c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23463.1 7.0.0-preview.22423.2 - 8.0.0-rtm.23513.17 + 8.0.0-rtm.23516.15 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rtm.23513.17 + 8.0.0-rtm.23516.15 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,20 +49,20 @@ - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 @@ -89,9 +89,9 @@ - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 - 8.0.0-rtm.23513.17 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 From 608a8a3f4f94847ab3f102621b933e1956592c7b Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Mon, 16 Oct 2023 20:30:08 -0700 Subject: [PATCH 108/550] Fix pending reboot check --- src/Cli/dotnet/Installer/Windows/WindowsUtils.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Installer/Windows/WindowsUtils.cs b/src/Cli/dotnet/Installer/Windows/WindowsUtils.cs index 463d64513bf8..99e9b8f161c6 100644 --- a/src/Cli/dotnet/Installer/Windows/WindowsUtils.cs +++ b/src/Cli/dotnet/Installer/Windows/WindowsUtils.cs @@ -64,8 +64,10 @@ public static bool RebootRequired() using RegistryKey sessionKey = localMachineKey?.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\Session Manager"); string[] pendingFileRenameOperations = (string[])sessionKey?.GetValue("PendingFileRenameOperations") ?? new string[0]; + // Destination files for pending renames start with !\??\, whereas the source does not have the leading "!". + bool hasPendingFileRenames = pendingFileRenameOperations.Any(s => !string.IsNullOrWhiteSpace(s) && s.StartsWith(@"!\??\")); - return (auKey != null || cbsKey != null || pendingFileRenameOperations.Length > 0); + return (auKey != null || cbsKey != null || hasPendingFileRenames); } } } From f6f6a8d0218a3ddad2803681401748a6beb772e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 18:20:15 +0000 Subject: [PATCH 109/550] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20231016.2 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23472.1 -> To Version 3.11.0-beta1.23516.2 From 78a8295602c2e8158e7c0b272aa091a856558258 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Oct 2023 12:44:51 +0000 Subject: [PATCH 110/550] Update dependencies from https://github.com/dotnet/arcade build 20231016.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23516.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41bb4120b64b..b68f50b651cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -412,22 +412,22 @@ - + https://github.com/dotnet/arcade - e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 + 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 - + https://github.com/dotnet/arcade - e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 + 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 - + https://github.com/dotnet/arcade - e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 + 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 - + https://github.com/dotnet/arcade - e6be64c3e27aeb29f93f6aa751fad972e4ef2d52 + 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 03f6becd1079..2291d3a87176 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.23505.1 + 8.0.0-beta.23516.4 7.0.0-preview.22423.2 8.0.0-rtm.23509.5 4.3.0 @@ -192,7 +192,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.23505.1 + 8.0.0-beta.23516.4 4.18.4 1.3.2 6.0.0-beta.22262.1 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 91f8196cc808..73828dd30d31 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.7.2-1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 84cfe7cd9cb4..fdd0cbb91f85 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.7.2-1 - $defaultXCopyMSBuildVersion = '17.7.2-1' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2 + $defaultXCopyMSBuildVersion = '17.8.1-2' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 1d9a4381e59a..67a37d1b7f1b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rc.1.23455.8", + "dotnet": "8.0.100-rtm.23506.1", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23505.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23505.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23516.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23516.4" } } From 067390a41bae742637f56a747a61b050e372b2da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Oct 2023 12:46:58 +0000 Subject: [PATCH 111/550] Update dependencies from https://github.com/dotnet/templating build 20231017.24 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23516.16 -> To Version 8.0.100-rtm.23517.24 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ccf552c815d..0549340b89f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 95c4709f1fe9af7afba9159577f4bda10c403623 + 9a3fe84c815e684dc2673a70dde28a847936dc1d - + https://github.com/dotnet/templating - 95c4709f1fe9af7afba9159577f4bda10c403623 + 9a3fe84c815e684dc2673a70dde28a847936dc1d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7854282ca630..ece9eff7fdb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23516.16 + 8.0.100-rtm.23517.24 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23516.16 + 8.0.100-rtm.23517.24 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From af99ad3aed3049a312ea0e83af9751271dc38af1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:27:27 +0000 Subject: [PATCH 112/550] [release/8.0.2xx] Update dependencies from dotnet/aspnetcore (#36207) [release/8.0.2xx] Update dependencies from dotnet/aspnetcore --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ccf552c815d..125c6e0ef97e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf babeeb65b164c87633db21a20223c8d99e2185e9 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor d46e13446729904fe02bb371d23cc96add0a57fd - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + e3aba084cde27f8e718b188e3e9f7239e63d5816 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 7854282ca630..c2f546511318 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 + 8.0.0-rtm.23517.6 + 8.0.0-rtm.23517.6 + 8.0.0-rtm.23517.6 + 8.0.0-rtm.23517.6 + 8.0.0-rtm.23517.6 + 8.0.0-rtm.23517.6 + 8.0.0-rtm.23517.6 From bd89dac9d22b5860dd3232b7fcaa7f482125cb19 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:27:42 +0000 Subject: [PATCH 113/550] [release/8.0.2xx] Update dependencies from dotnet/format (#36210) [release/8.0.2xx] Update dependencies from dotnet/format --- eng/Version.Details.xml | 2 +- eng/Versions.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 125c6e0ef97e..6ca839621c10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,7 +74,7 @@ d1de6a8d1e6e18c636cf55894b5158ab0e324394 - + https://github.com/dotnet/format e2182d1349594e2efd593bd0616df22d7e809413 diff --git a/eng/Versions.props b/eng/Versions.props index c2f546511318..ca394b8cde1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.451702 + 8.0.451801 From fc9b86f8af78b7c98a7a804ab7f33a25aee9a39f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:28:08 +0000 Subject: [PATCH 114/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#36212) [release/8.0.2xx] Update dependencies from dotnet/razor --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ca839621c10..febaf37f4f1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/razor - d46e13446729904fe02bb371d23cc96add0a57fd + ecb4b595e3322a18c240f50a763868540f51eaaa - + https://github.com/dotnet/razor - d46e13446729904fe02bb371d23cc96add0a57fd + ecb4b595e3322a18c240f50a763868540f51eaaa - + https://github.com/dotnet/razor - d46e13446729904fe02bb371d23cc96add0a57fd + ecb4b595e3322a18c240f50a763868540f51eaaa https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ca394b8cde1b..dc7696ed46dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23516.3 - 7.0.0-preview.23516.3 - 7.0.0-preview.23516.3 + 7.0.0-preview.23518.1 + 7.0.0-preview.23518.1 + 7.0.0-preview.23518.1 From 99a1a71081707b5a8b15b25b34571fa0d91ad1bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:28:21 +0000 Subject: [PATCH 115/550] [release/8.0.2xx] Update dependencies from dotnet/runtime (#36213) [release/8.0.2xx] Update dependencies from dotnet/runtime - Coherency Updates: - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport: from 8.0.0-rtm.23504.4 to 8.0.0-rtm.23511.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 36 +++++++++--------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index febaf37f4f1c..bb75e72db010 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,46 +10,46 @@ https://github.com/dotnet/templating 95c4709f1fe9af7afba9159577f4bda10c403623 - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/emsdk - 0c28b5cfe0f9173000450a3edc808dc8c2b9286e + 1b7f3a6560f6fb5f32b2758603c0376037f555ea @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest 5f9cc79b6542489218124e304c7118e862ae286f - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a https://github.com/dotnet/windowsdesktop @@ -386,29 +386,29 @@ - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 1d451c32dda2314c721adbf8829e1c0cd4e681ff - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 6f7af556d2761b0c93299cb88c61e4b747d6176a https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index dc7696ed46dc..6cbb9f48756b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23463.1 7.0.0-preview.22423.2 - 8.0.0-rtm.23516.15 + 8.0.0-rtm.23517.16 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rtm.23516.15 + 8.0.0-rtm.23517.16 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,20 +49,20 @@ - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 @@ -89,9 +89,9 @@ - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 + 8.0.0-rtm.23517.16 @@ -208,7 +208,7 @@ - 8.0.0-rtm.23504.4 + 8.0.0-rtm.23511.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 0969967896bd8d399e365e1b1f9c20049c1c15cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Oct 2023 18:31:22 +0000 Subject: [PATCH 116/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#36206) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb75e72db010..552ba813d963 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 25fdeb3c8c2608f248faec3d6d37733ae144bbbb + f4fa6bde775a3f7cbb2bb90a349ee5fc759114f3 - + https://github.com/dotnet/msbuild - 25fdeb3c8c2608f248faec3d6d37733ae144bbbb + f4fa6bde775a3f7cbb2bb90a349ee5fc759114f3 - + https://github.com/dotnet/msbuild - 25fdeb3c8c2608f248faec3d6d37733ae144bbbb + f4fa6bde775a3f7cbb2bb90a349ee5fc759114f3 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6cbb9f48756b..5ef5b7d57d6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23513-01 + 17.9.0-preview-23518-01 $(MicrosoftBuildPackageVersion) - 4.9.0-1.23513.7 - 4.9.0-1.23513.7 - 4.9.0-1.23513.7 - 4.9.0-1.23513.7 - 4.9.0-1.23513.7 - 4.9.0-1.23513.7 - 4.9.0-1.23513.7 + 4.9.0-1.23518.1 + 4.9.0-1.23518.1 + 4.9.0-1.23518.1 + 4.9.0-1.23518.1 + 4.9.0-1.23518.1 + 4.9.0-1.23518.1 + 4.9.0-1.23518.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 728be2611159e5362037da31080ddbcba674bf4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Oct 2023 12:52:00 +0000 Subject: [PATCH 118/550] Update dependencies from https://github.com/dotnet/source-build-externals build 20231018.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23502.1 -> To Version 8.0.0-alpha.1.23518.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a91d67d31049..232787dec5e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -334,9 +334,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - ed17956dbc31097b7ba6a66be086f4a70a97d84f + 3dc05150cf234f76f6936dcb2853d31a0da1f60e From 769626c22889a96228b2dc4f03237e370ec3eaa9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Oct 2023 12:52:13 +0000 Subject: [PATCH 119/550] Update dependencies from https://github.com/dotnet/msbuild build 20231019.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23518-01 -> To Version 17.9.0-preview-23519-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a91d67d31049..a9b3447dc773 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - f4fa6bde775a3f7cbb2bb90a349ee5fc759114f3 + 1ee4a902535fd9199d4853a2e2568df9d90b75c5 - + https://github.com/dotnet/msbuild - f4fa6bde775a3f7cbb2bb90a349ee5fc759114f3 + 1ee4a902535fd9199d4853a2e2568df9d90b75c5 - + https://github.com/dotnet/msbuild - f4fa6bde775a3f7cbb2bb90a349ee5fc759114f3 + 1ee4a902535fd9199d4853a2e2568df9d90b75c5 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8ad68cb9e915..e2ecf4c1253a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23518-01 + 17.9.0-preview-23519-01 $(MicrosoftBuildPackageVersion) - 8.0.0-rtm.23517.6 - 8.0.0-rtm.23517.6 - 8.0.0-rtm.23517.6 - 8.0.0-rtm.23517.6 - 8.0.0-rtm.23517.6 - 8.0.0-rtm.23517.6 - 8.0.0-rtm.23517.6 + 8.0.0-rtm.23518.6 + 8.0.0-rtm.23518.6 + 8.0.0-rtm.23518.6 + 8.0.0-rtm.23518.6 + 8.0.0-rtm.23518.6 + 8.0.0-rtm.23518.6 + 8.0.0-rtm.23518.6 From cfca708335546571ab90c8294c4ed7651faac712 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Oct 2023 12:52:46 +0000 Subject: [PATCH 121/550] Update dependencies from https://github.com/dotnet/fsharp build 20231019.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23516.2 -> To Version 8.0.200-beta.23519.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a91d67d31049..af4db5742be1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild f4fa6bde775a3f7cbb2bb90a349ee5fc759114f3 - + https://github.com/dotnet/fsharp - d1de6a8d1e6e18c636cf55894b5158ab0e324394 + f4388c60f9312fb0581b8d1081faed0da19bcb00 - + https://github.com/dotnet/fsharp - d1de6a8d1e6e18c636cf55894b5158ab0e324394 + f4388c60f9312fb0581b8d1081faed0da19bcb00 diff --git a/eng/Versions.props b/eng/Versions.props index 8ad68cb9e915..27923a4db6d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23516.2 + 12.8.0-beta.23519.3 From 4252fe45191eecb845a64c16da05315114eb3002 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Oct 2023 12:52:57 +0000 Subject: [PATCH 122/550] Update dependencies from https://github.com/dotnet/roslyn build 20231018.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-1.23518.1 -> To Version 4.9.0-1.23518.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a91d67d31049..d6709db0a9de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ e2182d1349594e2efd593bd0616df22d7e809413 - + https://github.com/dotnet/roslyn - 7b22f83d395cf7529702404587a94004787b429b + 489976ea288d9cd2fa465d9037238a216cfbeeef - + https://github.com/dotnet/roslyn - 7b22f83d395cf7529702404587a94004787b429b + 489976ea288d9cd2fa465d9037238a216cfbeeef - + https://github.com/dotnet/roslyn - 7b22f83d395cf7529702404587a94004787b429b + 489976ea288d9cd2fa465d9037238a216cfbeeef - + https://github.com/dotnet/roslyn - 7b22f83d395cf7529702404587a94004787b429b + 489976ea288d9cd2fa465d9037238a216cfbeeef - + https://github.com/dotnet/roslyn - 7b22f83d395cf7529702404587a94004787b429b + 489976ea288d9cd2fa465d9037238a216cfbeeef - + https://github.com/dotnet/roslyn - 7b22f83d395cf7529702404587a94004787b429b + 489976ea288d9cd2fa465d9037238a216cfbeeef - + https://github.com/dotnet/roslyn - 7b22f83d395cf7529702404587a94004787b429b + 489976ea288d9cd2fa465d9037238a216cfbeeef https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8ad68cb9e915..2c41584ce818 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-1.23518.1 - 4.9.0-1.23518.1 - 4.9.0-1.23518.1 - 4.9.0-1.23518.1 - 4.9.0-1.23518.1 - 4.9.0-1.23518.1 - 4.9.0-1.23518.1 + 4.9.0-1.23518.3 + 4.9.0-1.23518.3 + 4.9.0-1.23518.3 + 4.9.0-1.23518.3 + 4.9.0-1.23518.3 + 4.9.0-1.23518.3 + 4.9.0-1.23518.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 79d89ac2e7256cb5d7254dacb9cf81cbebd8bfbf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Oct 2023 12:53:20 +0000 Subject: [PATCH 123/550] Update dependencies from https://github.com/dotnet/templating build 20231019.3 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23517.24 -> To Version 8.0.100-rtm.23519.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a91d67d31049..16cdd3f8b31e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 9a3fe84c815e684dc2673a70dde28a847936dc1d + a6f0106f107189e1f98d8c732625fd804f8801de - + https://github.com/dotnet/templating - 9a3fe84c815e684dc2673a70dde28a847936dc1d + a6f0106f107189e1f98d8c732625fd804f8801de https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8ad68cb9e915..b3ea6671bdb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23517.24 + 8.0.100-rtm.23519.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23517.24 + 8.0.100-rtm.23519.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 22a70e20cc8ee3bc869f4b456fa41f17ebd87c42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Oct 2023 12:53:32 +0000 Subject: [PATCH 124/550] Update dependencies from https://github.com/microsoft/vstest build 20231018.3 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23515-01 -> To Version 17.9.0-preview-23518-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a91d67d31049..de19aa7d5628 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,18 +180,18 @@ https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/microsoft/vstest - 5f9cc79b6542489218124e304c7118e862ae286f + 6d750a22cc9ce32894965cfc97071ad433465796 - + https://github.com/microsoft/vstest - 5f9cc79b6542489218124e304c7118e862ae286f + 6d750a22cc9ce32894965cfc97071ad433465796 - + https://github.com/microsoft/vstest - 5f9cc79b6542489218124e304c7118e862ae286f + 6d750a22cc9ce32894965cfc97071ad433465796 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8ad68cb9e915..6da4003cfa87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23515-01 - 17.9.0-preview-23515-01 - 17.9.0-preview-23515-01 + 17.9.0-preview-23518-03 + 17.9.0-preview-23518-03 + 17.9.0-preview-23518-03 From 830903b5573c13986259b481f2ebbda6d0a41bf0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Oct 2023 12:53:42 +0000 Subject: [PATCH 125/550] Update dependencies from https://github.com/dotnet/razor build 20231018.4 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23518.1 -> To Version 7.0.0-preview.23518.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a91d67d31049..a79f79913475 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore e3aba084cde27f8e718b188e3e9f7239e63d5816 - + https://github.com/dotnet/razor - ecb4b595e3322a18c240f50a763868540f51eaaa + dfa3607ceb58799ac3d7297401d28a564c6bc5f0 - + https://github.com/dotnet/razor - ecb4b595e3322a18c240f50a763868540f51eaaa + dfa3607ceb58799ac3d7297401d28a564c6bc5f0 - + https://github.com/dotnet/razor - ecb4b595e3322a18c240f50a763868540f51eaaa + dfa3607ceb58799ac3d7297401d28a564c6bc5f0 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8ad68cb9e915..b39308eca0e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23518.1 - 7.0.0-preview.23518.1 - 7.0.0-preview.23518.1 + 7.0.0-preview.23518.4 + 7.0.0-preview.23518.4 + 7.0.0-preview.23518.4 From 7eb5de15f4ac6adbe8d1c22bc4e401bbf0100d80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Oct 2023 12:53:54 +0000 Subject: [PATCH 126/550] Update dependencies from https://github.com/dotnet/runtime build 20231018.26 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23517.16 -> To Version 8.0.0-rtm.23518.26 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a91d67d31049..f9f699febf71 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,42 +10,42 @@ https://github.com/dotnet/templating 9a3fe84c815e684dc2673a70dde28a847936dc1d - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce https://github.com/dotnet/emsdk @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest 5f9cc79b6542489218124e304c7118e862ae286f - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce https://github.com/dotnet/windowsdesktop @@ -386,29 +386,29 @@ - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 - + https://github.com/dotnet/runtime - 6f7af556d2761b0c93299cb88c61e4b747d6176a + c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 8ad68cb9e915..45f05ca61626 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23516.4 7.0.0-preview.22423.2 - 8.0.0-rtm.23517.16 + 8.0.0-rtm.23518.26 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rtm.23517.16 + 8.0.0-rtm.23518.26 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,20 +49,20 @@ - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 @@ -89,9 +89,9 @@ - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 - 8.0.0-rtm.23517.16 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 + 8.0.0-rtm.23518.26 From bf11525605ea08d5cfda6e2e8bc73e5296232b7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:33:41 +0000 Subject: [PATCH 127/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.17 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.16 -> To Version 6.9.0-preview.1.17 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 22 +++++++++++----------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b6170831a69..4101b3402e8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,67 +116,67 @@ https://github.com/dotnet/aspnetcore 198857c8a2211931739e6e08facfbab52f8dd023 - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef diff --git a/eng/Versions.props b/eng/Versions.props index 85df1107c40e..65ee802a76a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.16 - 6.9.0-preview.1.16 + 6.9.0-preview.1.17 + 6.9.0-preview.1.17 6.0.0-rc.278 - 6.9.0-preview.1.16 - 6.9.0-preview.1.16 - 6.9.0-preview.1.16 - 6.9.0-preview.1.16 - 6.9.0-preview.1.16 - 6.9.0-preview.1.16 - 6.9.0-preview.1.16 - 6.9.0-preview.1.16 - 6.9.0-preview.1.16 + 6.9.0-preview.1.17 + 6.9.0-preview.1.17 + 6.9.0-preview.1.17 + 6.9.0-preview.1.17 + 6.9.0-preview.1.17 + 6.9.0-preview.1.17 + 6.9.0-preview.1.17 + 6.9.0-preview.1.17 + 6.9.0-preview.1.17 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 71c245302396a2fef56b63dd2bce39c26266238b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:33:54 +0000 Subject: [PATCH 128/550] Update dependencies from https://github.com/dotnet/windowsdesktop build 20231019.16 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23516.9 -> To Version 8.0.0-rtm.23519.16 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-rtm.23516.12 -> To Version 8.0.0-rtm.23519.13 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b6170831a69..10ede4acf82f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,25 +213,25 @@ https://github.com/dotnet/runtime c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/windowsdesktop - e846ac57cea8f922cd5eb9b17fb4385db5af2a0f + a317223b1af875883b26baa92a3a7248a1fa6704 - + https://github.com/dotnet/windowsdesktop - e846ac57cea8f922cd5eb9b17fb4385db5af2a0f + a317223b1af875883b26baa92a3a7248a1fa6704 - + https://github.com/dotnet/windowsdesktop - e846ac57cea8f922cd5eb9b17fb4385db5af2a0f + a317223b1af875883b26baa92a3a7248a1fa6704 - + https://github.com/dotnet/windowsdesktop - e846ac57cea8f922cd5eb9b17fb4385db5af2a0f + a317223b1af875883b26baa92a3a7248a1fa6704 - + https://github.com/dotnet/wpf - babeeb65b164c87633db21a20223c8d99e2185e9 + da674dc7850e0363e1056b7c0bab29e0ca7ed094 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 85df1107c40e..cdae54971d03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ - 8.0.0-rtm.23516.12 + 8.0.0-rtm.23519.13 From 45e87252001b948e4f4c6bfb69a1091a57c4f2e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:34:05 +0000 Subject: [PATCH 129/550] Update dependencies from https://github.com/dotnet/msbuild build 20231019.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23519-01 -> To Version 17.9.0-preview-23519-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b6170831a69..00f188fd782d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 1ee4a902535fd9199d4853a2e2568df9d90b75c5 + 221fd2e8790a22ead513eb71630557efc02060e2 - + https://github.com/dotnet/msbuild - 1ee4a902535fd9199d4853a2e2568df9d90b75c5 + 221fd2e8790a22ead513eb71630557efc02060e2 - + https://github.com/dotnet/msbuild - 1ee4a902535fd9199d4853a2e2568df9d90b75c5 + 221fd2e8790a22ead513eb71630557efc02060e2 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 85df1107c40e..093d835ad51b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23519-01 + 17.9.0-preview-23519-03 $(MicrosoftBuildPackageVersion) - 8.0.0-rtm.23518.6 - 8.0.0-rtm.23518.6 - 8.0.0-rtm.23518.6 - 8.0.0-rtm.23518.6 - 8.0.0-rtm.23518.6 - 8.0.0-rtm.23518.6 - 8.0.0-rtm.23518.6 + 8.0.0-rtm.23519.14 + 8.0.0-rtm.23519.14 + 8.0.0-rtm.23519.14 + 8.0.0-rtm.23519.14 + 8.0.0-rtm.23519.14 + 8.0.0-rtm.23519.14 + 8.0.0-rtm.23519.14 From e754528a8112e44b1bb7f95b213803de34fb287f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:34:54 +0000 Subject: [PATCH 131/550] Update dependencies from https://github.com/dotnet/fsharp build 20231019.4 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23519.3 -> To Version 8.0.200-beta.23519.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b6170831a69..cf00e6f9af44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild 1ee4a902535fd9199d4853a2e2568df9d90b75c5 - + https://github.com/dotnet/fsharp - f4388c60f9312fb0581b8d1081faed0da19bcb00 + 0ddc4d640200417429be9daa6b0d4e54a27882b8 - + https://github.com/dotnet/fsharp - f4388c60f9312fb0581b8d1081faed0da19bcb00 + 0ddc4d640200417429be9daa6b0d4e54a27882b8 diff --git a/eng/Versions.props b/eng/Versions.props index 85df1107c40e..cecacf673691 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23519.3 + 12.8.0-beta.23519.4 From ead546292a5357a64d915678aca569285136dd2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:35:05 +0000 Subject: [PATCH 132/550] Update dependencies from https://github.com/dotnet/roslyn build 20231019.18 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-1.23518.3 -> To Version 4.9.0-1.23519.18 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b6170831a69..0db5803486f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ e2182d1349594e2efd593bd0616df22d7e809413 - + https://github.com/dotnet/roslyn - 489976ea288d9cd2fa465d9037238a216cfbeeef + 3c17539d0469a782882b5efac9e72d63e7643fd4 - + https://github.com/dotnet/roslyn - 489976ea288d9cd2fa465d9037238a216cfbeeef + 3c17539d0469a782882b5efac9e72d63e7643fd4 - + https://github.com/dotnet/roslyn - 489976ea288d9cd2fa465d9037238a216cfbeeef + 3c17539d0469a782882b5efac9e72d63e7643fd4 - + https://github.com/dotnet/roslyn - 489976ea288d9cd2fa465d9037238a216cfbeeef + 3c17539d0469a782882b5efac9e72d63e7643fd4 - + https://github.com/dotnet/roslyn - 489976ea288d9cd2fa465d9037238a216cfbeeef + 3c17539d0469a782882b5efac9e72d63e7643fd4 - + https://github.com/dotnet/roslyn - 489976ea288d9cd2fa465d9037238a216cfbeeef + 3c17539d0469a782882b5efac9e72d63e7643fd4 - + https://github.com/dotnet/roslyn - 489976ea288d9cd2fa465d9037238a216cfbeeef + 3c17539d0469a782882b5efac9e72d63e7643fd4 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 85df1107c40e..ce011feb17f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-1.23518.3 - 4.9.0-1.23518.3 - 4.9.0-1.23518.3 - 4.9.0-1.23518.3 - 4.9.0-1.23518.3 - 4.9.0-1.23518.3 - 4.9.0-1.23518.3 + 4.9.0-1.23519.18 + 4.9.0-1.23519.18 + 4.9.0-1.23519.18 + 4.9.0-1.23519.18 + 4.9.0-1.23519.18 + 4.9.0-1.23519.18 + 4.9.0-1.23519.18 $(MicrosoftNetCompilersToolsetPackageVersion) From 649ed588198801040bf9ff9f2467dc7626a7a0d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:35:27 +0000 Subject: [PATCH 133/550] Update dependencies from https://github.com/dotnet/format build 20231020.1 dotnet-format From Version 8.0.451801 -> To Version 8.0.452001 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b6170831a69..bfd62fa6379b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,9 +74,9 @@ f4388c60f9312fb0581b8d1081faed0da19bcb00 - + https://github.com/dotnet/format - e2182d1349594e2efd593bd0616df22d7e809413 + 5264f2afa89ee5b056859a2f2c256820c5a8bbc3 diff --git a/eng/Versions.props b/eng/Versions.props index 85df1107c40e..62cb12c88f84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.451801 + 8.0.452001 From 91632045c8e5fbbb08c3b44c1e7dd096c91fc697 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:35:43 +0000 Subject: [PATCH 134/550] Update dependencies from https://github.com/dotnet/templating build 20231019.26 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23517.24 -> To Version 8.0.100-rtm.23519.26 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16cdd3f8b31e..0ed0b9adb80c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - a6f0106f107189e1f98d8c732625fd804f8801de + 901160aaf6aa9b238e6acf6ca9fcbe600b111f35 - + https://github.com/dotnet/templating - a6f0106f107189e1f98d8c732625fd804f8801de + 901160aaf6aa9b238e6acf6ca9fcbe600b111f35 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b3ea6671bdb9..82b58178fb15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23519.3 + 8.0.100-rtm.23519.26 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23519.3 + 8.0.100-rtm.23519.26 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 91bde68f94ab8a42d96675cdc0948c6a8bff7b83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:35:53 +0000 Subject: [PATCH 135/550] Update dependencies from https://github.com/microsoft/vstest build 20231019.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23518-03 -> To Version 17.9.0-preview-23519-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b6170831a69..cebf6d1a2948 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,18 +180,18 @@ https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef - + https://github.com/microsoft/vstest - 6d750a22cc9ce32894965cfc97071ad433465796 + fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 - + https://github.com/microsoft/vstest - 6d750a22cc9ce32894965cfc97071ad433465796 + fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 - + https://github.com/microsoft/vstest - 6d750a22cc9ce32894965cfc97071ad433465796 + fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 85df1107c40e..aab259d37fe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23518-03 - 17.9.0-preview-23518-03 - 17.9.0-preview-23518-03 + 17.9.0-preview-23519-02 + 17.9.0-preview-23519-02 + 17.9.0-preview-23519-02 From 416da458b1a4f210b0f6105b4afb84a3fd925a99 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Oct 2023 12:36:04 +0000 Subject: [PATCH 136/550] Update dependencies from https://github.com/dotnet/razor build 20231019.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23518.4 -> To Version 7.0.0-preview.23519.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b6170831a69..3aa8c66168fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 198857c8a2211931739e6e08facfbab52f8dd023 - + https://github.com/dotnet/razor - dfa3607ceb58799ac3d7297401d28a564c6bc5f0 + 2267e27f708d63469eaf9cf71baf0068fa0630c2 - + https://github.com/dotnet/razor - dfa3607ceb58799ac3d7297401d28a564c6bc5f0 + 2267e27f708d63469eaf9cf71baf0068fa0630c2 - + https://github.com/dotnet/razor - dfa3607ceb58799ac3d7297401d28a564c6bc5f0 + 2267e27f708d63469eaf9cf71baf0068fa0630c2 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 85df1107c40e..4cb79a55199f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23518.4 - 7.0.0-preview.23518.4 - 7.0.0-preview.23518.4 + 7.0.0-preview.23519.1 + 7.0.0-preview.23519.1 + 7.0.0-preview.23519.1 From e3afa10d1e3072214df2e1fb5060458ebf3f05c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Oct 2023 12:28:19 +0000 Subject: [PATCH 137/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.17 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.16 -> To Version 6.9.0-preview.1.17 From 3a6325bd35354ffc39bdfb24669c69867cb893c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Oct 2023 12:28:32 +0000 Subject: [PATCH 138/550] Update dependencies from https://github.com/dotnet/windowsdesktop build 20231021.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23519.16 -> To Version 8.0.0-rtm.23521.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-rtm.23519.13 -> To Version 8.0.0-rtm.23521.1 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a28f9ec536f0..411cf4041f66 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,25 +213,25 @@ https://github.com/dotnet/runtime c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce - + https://github.com/dotnet/windowsdesktop - a317223b1af875883b26baa92a3a7248a1fa6704 + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/windowsdesktop - a317223b1af875883b26baa92a3a7248a1fa6704 + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/windowsdesktop - a317223b1af875883b26baa92a3a7248a1fa6704 + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/windowsdesktop - a317223b1af875883b26baa92a3a7248a1fa6704 + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/wpf - da674dc7850e0363e1056b7c0bab29e0ca7ed094 + 0d629281c49061636a8a161bae6fceedd37acff7 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 65c6ace9b028..8e4f6ed16485 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ - 8.0.0-rtm.23519.13 + 8.0.0-rtm.23521.1 From b139a42ab5eddc6021aaa0abcdce0717e9e27d4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Oct 2023 12:29:06 +0000 Subject: [PATCH 139/550] Update dependencies from https://github.com/dotnet/aspnetcore build 20231020.10 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23519.14 -> To Version 8.0.0-rtm.23520.10 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a28f9ec536f0..c1b906327fe6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn 3c17539d0469a782882b5efac9e72d63e7643fd4 - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf da674dc7850e0363e1056b7c0bab29e0ca7ed094 - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor 2267e27f708d63469eaf9cf71baf0068fa0630c2 - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - e4ba445101d9bdae24baa6b332d19a11ac8922be + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 65c6ace9b028..8b0e172c45b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23519.14 - 8.0.0-rtm.23519.14 - 8.0.0-rtm.23519.14 - 8.0.0-rtm.23519.14 - 8.0.0-rtm.23519.14 - 8.0.0-rtm.23519.14 - 8.0.0-rtm.23519.14 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 From 6dde2732d206417a42992d6b538e5b2e4f9dd2da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Oct 2023 12:29:16 +0000 Subject: [PATCH 140/550] Update dependencies from https://github.com/dotnet/roslyn build 20231020.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-1.23519.18 -> To Version 4.9.0-1.23520.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a28f9ec536f0..538687464780 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 5264f2afa89ee5b056859a2f2c256820c5a8bbc3 - + https://github.com/dotnet/roslyn - 3c17539d0469a782882b5efac9e72d63e7643fd4 + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/roslyn - 3c17539d0469a782882b5efac9e72d63e7643fd4 + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/roslyn - 3c17539d0469a782882b5efac9e72d63e7643fd4 + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/roslyn - 3c17539d0469a782882b5efac9e72d63e7643fd4 + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/roslyn - 3c17539d0469a782882b5efac9e72d63e7643fd4 + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/roslyn - 3c17539d0469a782882b5efac9e72d63e7643fd4 + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/roslyn - 3c17539d0469a782882b5efac9e72d63e7643fd4 + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 65c6ace9b028..6bc9edc9af99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-1.23519.18 - 4.9.0-1.23519.18 - 4.9.0-1.23519.18 - 4.9.0-1.23519.18 - 4.9.0-1.23519.18 - 4.9.0-1.23519.18 - 4.9.0-1.23519.18 + 4.9.0-1.23520.1 + 4.9.0-1.23520.1 + 4.9.0-1.23520.1 + 4.9.0-1.23520.1 + 4.9.0-1.23520.1 + 4.9.0-1.23520.1 + 4.9.0-1.23520.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 3c3e8813a81bd7faec9a34b736c3e33381b0aef2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Oct 2023 12:29:42 +0000 Subject: [PATCH 141/550] Update dependencies from https://github.com/dotnet/templating build 20231020.1 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23519.26 -> To Version 8.0.100-rtm.23520.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a28f9ec536f0..502f1384eae1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 901160aaf6aa9b238e6acf6ca9fcbe600b111f35 + be30400baa26909ebc7b4a8f0f38eb424f8b70c9 - + https://github.com/dotnet/templating - 901160aaf6aa9b238e6acf6ca9fcbe600b111f35 + be30400baa26909ebc7b4a8f0f38eb424f8b70c9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 65c6ace9b028..535e803bff4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23519.26 + 8.0.100-rtm.23520.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23519.26 + 8.0.100-rtm.23520.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f37e8ce7ca968995a2be8764ea4a731f7fb34267 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Oct 2023 12:29:52 +0000 Subject: [PATCH 142/550] Update dependencies from https://github.com/dotnet/razor build 20231020.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23519.1 -> To Version 7.0.0-preview.23520.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a28f9ec536f0..bfb1bbd70774 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore e4ba445101d9bdae24baa6b332d19a11ac8922be - + https://github.com/dotnet/razor - 2267e27f708d63469eaf9cf71baf0068fa0630c2 + 9cf908e96c86884cce89bba653b598103cef6b8d - + https://github.com/dotnet/razor - 2267e27f708d63469eaf9cf71baf0068fa0630c2 + 9cf908e96c86884cce89bba653b598103cef6b8d - + https://github.com/dotnet/razor - 2267e27f708d63469eaf9cf71baf0068fa0630c2 + 9cf908e96c86884cce89bba653b598103cef6b8d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 65c6ace9b028..971bde11045d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23519.1 - 7.0.0-preview.23519.1 - 7.0.0-preview.23519.1 + 7.0.0-preview.23520.6 + 7.0.0-preview.23520.6 + 7.0.0-preview.23520.6 From 071c303de1a0523958097b7f8339fcb2ea0046ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Oct 2023 12:30:03 +0000 Subject: [PATCH 143/550] Update dependencies from https://github.com/dotnet/runtime build 20231020.16 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23518.26 -> To Version 8.0.0-rtm.23520.16 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a28f9ec536f0..f7daddef6d6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,42 +10,42 @@ https://github.com/dotnet/templating 901160aaf6aa9b238e6acf6ca9fcbe600b111f35 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 https://github.com/dotnet/emsdk @@ -193,25 +193,25 @@ https://github.com/microsoft/vstest fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 https://github.com/dotnet/windowsdesktop @@ -386,29 +386,29 @@ - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 @@ -429,9 +429,9 @@ https://github.com/dotnet/arcade 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 - + https://github.com/dotnet/runtime - c6e7ebdcb1b99c72990ae9f5ff95a75d5bb0f3ce + 11ad607efb2b31c5e1b906303fcd70341e9d5206 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 65c6ace9b028..cb3ae710e70a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23516.4 7.0.0-preview.22423.2 - 8.0.0-rtm.23518.26 + 8.0.0-rtm.23520.16 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rtm.23518.26 + 8.0.0-rtm.23520.16 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,20 +49,20 @@ - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 @@ -89,9 +89,9 @@ - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 - 8.0.0-rtm.23518.26 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 From 17e5246f7f1bbd53b057b0ef101f59b6222162a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Oct 2023 12:27:36 +0000 Subject: [PATCH 144/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.17 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.16 -> To Version 6.9.0-preview.1.17 From 05da86e95174005904f1eb07a0332847343b3477 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Oct 2023 12:27:54 +0000 Subject: [PATCH 145/550] Update dependencies from https://github.com/dotnet/windowsdesktop build 20231021.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23519.16 -> To Version 8.0.0-rtm.23521.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-rtm.23519.13 -> To Version 8.0.0-rtm.23521.1 (parent: Microsoft.WindowsDesktop.App.Ref From 4339f2b8358fadd1d1b492947bbe0c8d483617ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Oct 2023 12:28:34 +0000 Subject: [PATCH 146/550] Update dependencies from https://github.com/dotnet/aspnetcore build 20231020.10 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.0-rtm.23519.14 -> To Version 8.0.0-rtm.23520.10 From c2a548ea9a7c6db400ffe20fd0bfa8bd0c40b743 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Oct 2023 12:28:50 +0000 Subject: [PATCH 147/550] Update dependencies from https://github.com/dotnet/roslyn build 20231020.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-1.23519.18 -> To Version 4.9.0-1.23520.1 From 7a343bdaa41d566e3c251f0c161961e9123226c4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Oct 2023 12:29:19 +0000 Subject: [PATCH 148/550] Update dependencies from https://github.com/dotnet/templating build 20231020.1 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23519.26 -> To Version 8.0.100-rtm.23520.1 From 84488be18f2926a08773d1e83138b2c00e3e114c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Oct 2023 12:29:39 +0000 Subject: [PATCH 149/550] Update dependencies from https://github.com/dotnet/razor build 20231020.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23519.1 -> To Version 7.0.0-preview.23520.6 From 0640186b733ceb739b132407a040d9b7e963ae3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 22 Oct 2023 12:29:59 +0000 Subject: [PATCH 150/550] Update dependencies from https://github.com/dotnet/runtime build 20231020.16 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23518.26 -> To Version 8.0.0-rtm.23520.16 From 22e5b033c37c1ff022f902c69097d7956025a945 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Oct 2023 12:29:40 +0000 Subject: [PATCH 151/550] Update dependencies from https://github.com/dotnet/msbuild build 20231023.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23519-03 -> To Version 17.9.0-preview-23523-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ececd0c1ed0..3fa514f72e92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 221fd2e8790a22ead513eb71630557efc02060e2 + 08494c73128451a3f7cfb47a5e9cbd63f5507a1f - + https://github.com/dotnet/msbuild - 221fd2e8790a22ead513eb71630557efc02060e2 + 08494c73128451a3f7cfb47a5e9cbd63f5507a1f - + https://github.com/dotnet/msbuild - 221fd2e8790a22ead513eb71630557efc02060e2 + 08494c73128451a3f7cfb47a5e9cbd63f5507a1f https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f8faa0948c68..b7f51c253543 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23519-03 + 17.9.0-preview-23523-01 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23519.4 + 12.8.0-beta.23523.2 From 409b295ccdb916438201f425aa18287487730852 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Oct 2023 12:30:38 +0000 Subject: [PATCH 153/550] Update dependencies from https://github.com/dotnet/format build 20231023.1 dotnet-format From Version 8.0.452001 -> To Version 8.0.452301 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ececd0c1ed0..a27e31142903 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,9 +74,9 @@ 0ddc4d640200417429be9daa6b0d4e54a27882b8 - + https://github.com/dotnet/format - 5264f2afa89ee5b056859a2f2c256820c5a8bbc3 + 8147724f9fdfca340e6899f00a37d028cfac3599 diff --git a/eng/Versions.props b/eng/Versions.props index f8faa0948c68..b91164fc6614 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.452001 + 8.0.452301 From f7fbe083f5df6d3342660c4c39cf5d8111b7b93c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Oct 2023 12:30:49 +0000 Subject: [PATCH 154/550] Update dependencies from https://github.com/dotnet/templating build 20231022.1 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.100-rtm.23520.1 -> To Version 8.0.100-rtm.23522.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ececd0c1ed0..daf51130cc88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - be30400baa26909ebc7b4a8f0f38eb424f8b70c9 + 6fde95fe223d1315f07ac8d212391369c4d8c074 - + https://github.com/dotnet/templating - be30400baa26909ebc7b4a8f0f38eb424f8b70c9 + 6fde95fe223d1315f07ac8d212391369c4d8c074 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f8faa0948c68..1ce6b9fea288 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23520.1 + 8.0.100-rtm.23522.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23520.1 + 8.0.100-rtm.23522.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 0df79c114fcf4a64eecf6edf2345c7be9797bf82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Oct 2023 12:31:00 +0000 Subject: [PATCH 155/550] Update dependencies from https://github.com/dotnet/razor build 20231022.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23520.6 -> To Version 7.0.0-preview.23522.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ececd0c1ed0..1e6096b32655 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/razor - 9cf908e96c86884cce89bba653b598103cef6b8d + 3112f027fde820a6efe875b7fa0b7f93acca09df - + https://github.com/dotnet/razor - 9cf908e96c86884cce89bba653b598103cef6b8d + 3112f027fde820a6efe875b7fa0b7f93acca09df - + https://github.com/dotnet/razor - 9cf908e96c86884cce89bba653b598103cef6b8d + 3112f027fde820a6efe875b7fa0b7f93acca09df https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f8faa0948c68..831367c22f5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23520.6 - 7.0.0-preview.23520.6 - 7.0.0-preview.23520.6 + 7.0.0-preview.23522.1 + 7.0.0-preview.23522.1 + 7.0.0-preview.23522.1 From 4d1f5a36ebd5096d96330779888e8ac6662477c0 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Mon, 23 Oct 2023 11:49:45 -0700 Subject: [PATCH 156/550] update change to test for deadlocks for packageInstall --- src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs index 05e05396f90f..4b4c57dab3e6 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs @@ -160,7 +160,7 @@ public async Task GetPackageUrl(PackageId packageId, PackageSourceLocation packageSourceLocation = null, bool includePreview = false) { - (var source, var resolvedPackageVersion) = await GetPackageSourceAndVersion(packageId, packageVersion, packageSourceLocation, includePreview); + (var source, var resolvedPackageVersion) = await GetPackageSourceAndVersion(packageId, packageVersion, packageSourceLocation, includePreview).ConfigureAwait(false); SourceRepository repository = GetSourceRepository(source); if (repository.PackageSource.IsLocal) From 112bad8d86952eecce3181b5a7cc8e1ae682555a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Oct 2023 12:33:39 +0000 Subject: [PATCH 157/550] Update dependencies from https://github.com/dotnet/razor build 20231024.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23522.1 -> To Version 7.0.0-preview.23524.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e97265a2b73f..9699021cb3a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/razor - 3112f027fde820a6efe875b7fa0b7f93acca09df + d0583417c89f1ffaca54a2ebc9d33b15fd0a9a89 - + https://github.com/dotnet/razor - 3112f027fde820a6efe875b7fa0b7f93acca09df + d0583417c89f1ffaca54a2ebc9d33b15fd0a9a89 - + https://github.com/dotnet/razor - 3112f027fde820a6efe875b7fa0b7f93acca09df + d0583417c89f1ffaca54a2ebc9d33b15fd0a9a89 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 94db48f67fde..a4ce4c697d60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23522.1 - 7.0.0-preview.23522.1 - 7.0.0-preview.23522.1 + 7.0.0-preview.23524.1 + 7.0.0-preview.23524.1 + 7.0.0-preview.23524.1 From a9b4eca68a4273d47338ca2f70fa01d9112a13e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:11:56 +0000 Subject: [PATCH 158/550] [release/8.0.2xx] Update dependencies from nuget/nuget.client (#36420) [release/8.0.2xx] Update dependencies from nuget/nuget.client --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e97265a2b73f..222cea5001d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -116,69 +116,69 @@ https://github.com/dotnet/aspnetcore c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + b02fdbb36d34947c24496b2c0b505aa785bc657f https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 94db48f67fde..b35fb6d89889 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.17 - 6.9.0-preview.1.17 + 6.9.0-preview.1.18 + 6.9.0-preview.1.18 6.0.0-rc.278 - 6.9.0-preview.1.17 - 6.9.0-preview.1.17 - 6.9.0-preview.1.17 - 6.9.0-preview.1.17 - 6.9.0-preview.1.17 - 6.9.0-preview.1.17 - 6.9.0-preview.1.17 - 6.9.0-preview.1.17 - 6.9.0-preview.1.17 + 6.9.0-preview.1.18 + 6.9.0-preview.1.18 + 6.9.0-preview.1.18 + 6.9.0-preview.1.18 + 6.9.0-preview.1.18 + 6.9.0-preview.1.18 + 6.9.0-preview.1.18 + 6.9.0-preview.1.18 + 6.9.0-preview.1.18 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 7ca5e38014e0adee1f552ddaf8d5a0cbb2dff092 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:12:03 +0000 Subject: [PATCH 159/550] [release/8.0.2xx] Update dependencies from dotnet/windowsdesktop (#36421) [release/8.0.2xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23524.1 (parent: Microsoft.WindowsDesktop.App.Ref) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 222cea5001d3..d58bc5dede39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,25 +213,25 @@ https://github.com/dotnet/runtime 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + 544c2e622c03eef94355718e7e671b193b0102d9 - + https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + 544c2e622c03eef94355718e7e671b193b0102d9 - + https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + 544c2e622c03eef94355718e7e671b193b0102d9 - + https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + 544c2e622c03eef94355718e7e671b193b0102d9 - + https://github.com/dotnet/wpf - 0d629281c49061636a8a161bae6fceedd37acff7 + eb2c28846bd06cc11a0cd432d55639a850a829a3 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b35fb6d89889..b1a6d6afe3f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ - 8.0.0-rtm.23521.1 + 8.0.0-rtm.23524.1 From afc18aa423f6269f266dafab034348cb277d9fbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:12:45 +0000 Subject: [PATCH 160/550] [release/8.0.2xx] Update dependencies from dotnet/aspnetcore (#36422) [release/8.0.2xx] Update dependencies from dotnet/aspnetcore --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++----- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d58bc5dede39..072e16e87a44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -108,13 +108,13 @@ https://github.com/dotnet/roslyn 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 https://github.com/nuget/nuget.client @@ -233,50 +233,50 @@ https://github.com/dotnet/wpf eb2c28846bd06cc11a0cd432d55639a850a829a3 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 https://github.com/dotnet/razor @@ -291,21 +291,21 @@ https://github.com/dotnet/razor 3112f027fde820a6efe875b7fa0b7f93acca09df - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + 9e7a25f270182a1b4413583086166ab0abfbbf19 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b1a6d6afe3f0..3ee8a8776823 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 + 8.0.0-rtm.23523.8 + 8.0.0-rtm.23523.8 + 8.0.0-rtm.23523.8 + 8.0.0-rtm.23523.8 + 8.0.0-rtm.23523.8 + 8.0.0-rtm.23523.8 + 8.0.0-rtm.23523.8 From cc36e18e2dfb1e3343c562ddf38910ea858dbf69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:12:49 +0000 Subject: [PATCH 161/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#36423) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 072e16e87a44..57a399a7cb17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild 08494c73128451a3f7cfb47a5e9cbd63f5507a1f - + https://github.com/dotnet/fsharp - 507114e990861aec5444df54de1dc77bfe26a310 + 0c5e24d19dc915b00b8755a8532bfb2582aa2b47 - + https://github.com/dotnet/fsharp - 507114e990861aec5444df54de1dc77bfe26a310 + 0c5e24d19dc915b00b8755a8532bfb2582aa2b47 diff --git a/eng/Versions.props b/eng/Versions.props index 3ee8a8776823..40395c05737e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23523.2 + 12.8.0-beta.23523.7 From 3794ad1eeca1c99453e9f26a3742990dc2d48462 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 17:12:59 +0000 Subject: [PATCH 162/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#36424) [release/8.0.2xx] Update dependencies from dotnet/roslyn --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57a399a7cb17..37e0d2411c3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ 8147724f9fdfca340e6899f00a37d028cfac3599 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 8da753b65c4b05e086a29f7a2714ef40797728f7 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 8da753b65c4b05e086a29f7a2714ef40797728f7 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 8da753b65c4b05e086a29f7a2714ef40797728f7 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 8da753b65c4b05e086a29f7a2714ef40797728f7 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 8da753b65c4b05e086a29f7a2714ef40797728f7 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 8da753b65c4b05e086a29f7a2714ef40797728f7 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 8da753b65c4b05e086a29f7a2714ef40797728f7 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 40395c05737e..f8134ff36df6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-1.23520.1 - 4.9.0-1.23520.1 - 4.9.0-1.23520.1 - 4.9.0-1.23520.1 - 4.9.0-1.23520.1 - 4.9.0-1.23520.1 - 4.9.0-1.23520.1 + 4.9.0-1.23524.3 + 4.9.0-1.23524.3 + 4.9.0-1.23524.3 + 4.9.0-1.23524.3 + 4.9.0-1.23524.3 + 4.9.0-1.23524.3 + 4.9.0-1.23524.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 39e09a0c12c2d090846655dbd7126796a2c7257d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 20:30:57 +0000 Subject: [PATCH 163/550] [release/8.0.2xx] Update dependencies from dotnet/format (#36426) [release/8.0.2xx] Update dependencies from dotnet/format --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37e0d2411c3b..399fab3e2fb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,9 +74,9 @@ 0c5e24d19dc915b00b8755a8532bfb2582aa2b47 - + https://github.com/dotnet/format - 8147724f9fdfca340e6899f00a37d028cfac3599 + db7e0d5f7d6d23684be0b34dac141553d5783eb1 diff --git a/eng/Versions.props b/eng/Versions.props index f8134ff36df6..1e15f0885aaa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.452301 + 8.0.452310 From 6348fb4185d7f5ba7cedf4040fb4505eedec2baf Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Tue, 24 Oct 2023 18:57:59 -0500 Subject: [PATCH 164/550] Make a NulLogger for setup logging and use it for dotnet --info calls --- .../Installer/Windows/ISynchronizingLogger.cs | 17 +++++++++++++++ .../Windows/InstallClientElevationContext.cs | 6 +++--- .../Installer/Windows/NullInstallerLogger.cs | 21 +++++++++++++++++++ .../Windows/TimestampedFileLogger.cs | 6 +----- .../dotnet-workload/WorkloadInfoHelper.cs | 3 ++- .../install/NetSdkMsiInstallerClient.cs | 7 +++++-- .../install/WorkloadInstallerFactory.cs | 7 ++++--- 7 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 src/Cli/dotnet/Installer/Windows/ISynchronizingLogger.cs create mode 100644 src/Cli/dotnet/Installer/Windows/NullInstallerLogger.cs diff --git a/src/Cli/dotnet/Installer/Windows/ISynchronizingLogger.cs b/src/Cli/dotnet/Installer/Windows/ISynchronizingLogger.cs new file mode 100644 index 000000000000..a442a7f4401a --- /dev/null +++ b/src/Cli/dotnet/Installer/Windows/ISynchronizingLogger.cs @@ -0,0 +1,17 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.DotNet.Installer.Windows +{ + /// + /// Represents a type used to log setup operations that can manage a series of named pipes writing to it. + /// + internal interface ISynchronizingLogger : ISetupLogger + { + /// + /// Starts a new thread to listen for log requests messages from external processes. + /// + /// The name of the pipe. + void AddNamedPipe(string pipeName); + } +} diff --git a/src/Cli/dotnet/Installer/Windows/InstallClientElevationContext.cs b/src/Cli/dotnet/Installer/Windows/InstallClientElevationContext.cs index 65c24dfbe79c..045c4e0b7ea7 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallClientElevationContext.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallClientElevationContext.cs @@ -14,13 +14,13 @@ namespace Microsoft.DotNet.Installer.Windows [SupportedOSPlatform("windows")] internal sealed class InstallClientElevationContext : InstallElevationContextBase { - private TimestampedFileLogger _log; + private ISynchronizingLogger _log; private Process _serverProcess; public override bool IsClient => true; - public InstallClientElevationContext(TimestampedFileLogger logger) + public InstallClientElevationContext(ISynchronizingLogger logger) { _log = logger; } @@ -60,7 +60,7 @@ public override void Elevate() // Add a pipe to the logger to allow the server to send log requests. This avoids having an elevated process writing // to a less privileged location. It also simplifies troubleshooting because log events will be chronologically - // ordered in a single file. + // ordered in a single file. _log.AddNamedPipe(WindowsUtils.CreatePipeName(_serverProcess.Id, "log")); HasElevated = true; diff --git a/src/Cli/dotnet/Installer/Windows/NullInstallerLogger.cs b/src/Cli/dotnet/Installer/Windows/NullInstallerLogger.cs new file mode 100644 index 000000000000..2c61375d89a1 --- /dev/null +++ b/src/Cli/dotnet/Installer/Windows/NullInstallerLogger.cs @@ -0,0 +1,21 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +namespace Microsoft.DotNet.Installer.Windows; + +/// +/// A class that swallows all logging - used for code paths where logging setup operations isn't valuable, like dotnet --info. +/// +internal class NullInstallerLogger : ISynchronizingLogger +{ + public string LogPath => String.Empty; + + public void AddNamedPipe(string pipeName) + { + + } + + public void LogMessage(string message) + { + + } +} diff --git a/src/Cli/dotnet/Installer/Windows/TimestampedFileLogger.cs b/src/Cli/dotnet/Installer/Windows/TimestampedFileLogger.cs index c606499ca841..5f0d422b938f 100644 --- a/src/Cli/dotnet/Installer/Windows/TimestampedFileLogger.cs +++ b/src/Cli/dotnet/Installer/Windows/TimestampedFileLogger.cs @@ -13,7 +13,7 @@ namespace Microsoft.DotNet.Installer.Windows /// queue messages. /// [SupportedOSPlatform("windows")] - internal class TimestampedFileLogger : SetupLoggerBase, IDisposable, ISetupLogger + internal class TimestampedFileLogger : SetupLoggerBase, IDisposable, ISynchronizingLogger { /// /// Thread safe queue use to store incoming log request messages. @@ -81,10 +81,6 @@ public TimestampedFileLogger(string path, int flushThreshold, params string[] lo LogMessage($"=== Logging started ==="); } - /// - /// Starts a new thread to listen for log requests messages from external processes. - /// - /// The name of the pipe. public void AddNamedPipe(string pipeName) { Thread logRequestThread = new Thread(ProcessLogRequests) { IsBackground = true }; diff --git a/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs b/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs index b2f787ff157a..f686d494a53d 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/WorkloadInfoHelper.cs @@ -56,7 +56,8 @@ public WorkloadInfoHelper( userProfileDir, verifySignatures ?? !SignCheck.IsDotNetSigned(), restoreActionConfig: restoreConfig, - elevationRequired: false); + elevationRequired: false, + shouldLog: false); WorkloadRecordRepo = workloadRecordRepo ?? Installer.GetWorkloadInstallationRecordRepository(); } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs index a89cba962fa3..fd97f33ea929 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs @@ -1019,9 +1019,12 @@ public static NetSdkMsiInstallerClient Create( PackageSourceLocation packageSourceLocation = null, IReporter reporter = null, string tempDirPath = null, - RestoreActionConfig restoreActionConfig = null) + RestoreActionConfig restoreActionConfig = null, + bool shouldLog = true) { - TimestampedFileLogger logger = new(Path.Combine(Path.GetTempPath(), $"Microsoft.NET.Workload_{Environment.ProcessId}_{DateTime.Now:yyyyMMdd_HHmmss_fff}.log")); + ISynchronizingLogger logger = + shouldLog ? new TimestampedFileLogger(Path.Combine(Path.GetTempPath(), $"Microsoft.NET.Workload_{Environment.ProcessId}_{DateTime.Now:yyyyMMdd_HHmmss_fff}.log")) + : new NullInstallerLogger(); InstallClientElevationContext elevationContext = new(logger); if (nugetPackageDownloader == null) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallerFactory.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallerFactory.cs index aa1ae48eb1cc..ceb8fece65e8 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallerFactory.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallerFactory.cs @@ -23,7 +23,8 @@ public static IInstaller GetWorkloadInstaller( string tempDirPath = null, PackageSourceLocation packageSourceLocation = null, RestoreActionConfig restoreActionConfig = null, - bool elevationRequired = true) + bool elevationRequired = true, + bool shouldLog = true) { dotnetDir = string.IsNullOrWhiteSpace(dotnetDir) ? Path.GetDirectoryName(Environment.ProcessPath) : dotnetDir; var installType = WorkloadInstallType.GetWorkloadInstallType(sdkFeatureBand, dotnetDir); @@ -34,9 +35,9 @@ public static IInstaller GetWorkloadInstaller( { throw new InvalidOperationException(LocalizableStrings.OSDoesNotSupportMsi); } - + // TODO: should restoreActionConfig be flowed through to the client here as well like it is for the FileBasedInstaller below? return NetSdkMsiInstallerClient.Create(verifySignatures, sdkFeatureBand, workloadResolver, - nugetPackageDownloader, verbosity, packageSourceLocation, reporter, tempDirPath); + nugetPackageDownloader, verbosity, packageSourceLocation, reporter, tempDirPath, shouldLog: shouldLog); } if (elevationRequired && !WorkloadFileBasedInstall.IsUserLocal(dotnetDir, sdkFeatureBand.ToString()) && !CanWriteToDotnetRoot(dotnetDir)) From 423882721d1a0e795078edba77f506657379329a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 25 Oct 2023 12:37:06 +0000 Subject: [PATCH 165/550] Update dependencies from https://github.com/dotnet/msbuild build 20231024.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23523-01 -> To Version 17.9.0-preview-23524-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 321c18c9ba82..0e0d76e9bb87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 08494c73128451a3f7cfb47a5e9cbd63f5507a1f + 43ffadf95d0152a72c596c3ababe91f6eea9201e - + https://github.com/dotnet/msbuild - 08494c73128451a3f7cfb47a5e9cbd63f5507a1f + 43ffadf95d0152a72c596c3ababe91f6eea9201e - + https://github.com/dotnet/msbuild - 08494c73128451a3f7cfb47a5e9cbd63f5507a1f + 43ffadf95d0152a72c596c3ababe91f6eea9201e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d3f90e2b28b5..13b3a4b123d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23523-01 + 17.9.0-preview-23524-01 $(MicrosoftBuildPackageVersion) - 4.9.0-1.23524.3 - 4.9.0-1.23524.3 - 4.9.0-1.23524.3 - 4.9.0-1.23524.3 - 4.9.0-1.23524.3 - 4.9.0-1.23524.3 - 4.9.0-1.23524.3 + 4.9.0-1.23524.14 + 4.9.0-1.23524.14 + 4.9.0-1.23524.14 + 4.9.0-1.23524.14 + 4.9.0-1.23524.14 + 4.9.0-1.23524.14 + 4.9.0-1.23524.14 $(MicrosoftNetCompilersToolsetPackageVersion) From f846d1d0fbd78028f9b8dc1578cd30064d4b8a84 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:21:58 +0000 Subject: [PATCH 167/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#36459) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7acfb7ff6838..bd7e110a1080 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild 08494c73128451a3f7cfb47a5e9cbd63f5507a1f - + https://github.com/dotnet/fsharp - 0c5e24d19dc915b00b8755a8532bfb2582aa2b47 + 9a84df1cdab9308c73fc29ad5ebb5c85aca44884 - + https://github.com/dotnet/fsharp - 0c5e24d19dc915b00b8755a8532bfb2582aa2b47 + 9a84df1cdab9308c73fc29ad5ebb5c85aca44884 diff --git a/eng/Versions.props b/eng/Versions.props index 77a77d8e60a3..9b8d00f81a08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23523.7 + 12.8.0-beta.23524.5 From 69c4b2b92d3fbea181cd1d202c0b444806931ffd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:22:36 +0000 Subject: [PATCH 168/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#36463) [release/8.0.2xx] Update dependencies from dotnet/razor --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd7e110a1080..f39b86ed0a42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - d0583417c89f1ffaca54a2ebc9d33b15fd0a9a89 + 8b3eb4bb33ce55374478efc7760f1d7e7f9359df - + https://github.com/dotnet/razor - d0583417c89f1ffaca54a2ebc9d33b15fd0a9a89 + 8b3eb4bb33ce55374478efc7760f1d7e7f9359df - + https://github.com/dotnet/razor - d0583417c89f1ffaca54a2ebc9d33b15fd0a9a89 + 8b3eb4bb33ce55374478efc7760f1d7e7f9359df https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9b8d00f81a08..277650193936 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23524.1 - 7.0.0-preview.23524.1 - 7.0.0-preview.23524.1 + 7.0.0-preview.23525.1 + 7.0.0-preview.23525.1 + 7.0.0-preview.23525.1 From 1307f53c751365f339e92bc75ec0668a360a8d2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:25:53 +0000 Subject: [PATCH 169/550] [release/8.0.2xx] Update dependencies from dotnet/windowsdesktop (#36456) [release/8.0.2xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 8.0.0-rtm.23524.1 to 8.0.0-rtm.23524.4 (parent: Microsoft.WindowsDesktop.App.Ref) --- NuGet.config | 1 + eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1348db7fdadc..26eb813e241f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,6 +14,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f39b86ed0a42..c7b2419ecf78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -213,25 +213,25 @@ https://github.com/dotnet/runtime 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 - + https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 - + https://github.com/dotnet/wpf - eb2c28846bd06cc11a0cd432d55639a850a829a3 + daef397783c969da29b77e4b4021d38faafbd575 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 277650193936..dc282856a3fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -164,7 +164,7 @@ - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23524.4 From 1636f4a6a9d35dbaad89aabdad2a0416a260f719 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 16:27:22 +0000 Subject: [PATCH 170/550] [release/8.0.2xx] Update dependencies from dotnet/format (#36462) [release/8.0.2xx] Update dependencies from dotnet/format --- NuGet.config | 3 +++ eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 26eb813e241f..fe779f3474ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7b2419ecf78..9e9e2bba858a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -74,9 +74,9 @@ 9a84df1cdab9308c73fc29ad5ebb5c85aca44884 - + https://github.com/dotnet/format - db7e0d5f7d6d23684be0b34dac141553d5783eb1 + aadaa166c39c8686c55dbec3462355b1ca033b62 diff --git a/eng/Versions.props b/eng/Versions.props index dc282856a3fc..a375c2ba836b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.452310 + 8.0.452414 From 20626542f5c2cd54ee7a47de0b2a403c0749b5b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 18:59:37 +0000 Subject: [PATCH 171/550] [release/8.0.2xx] Update dependencies from dotnet/templating (#36470) [release/8.0.2xx] Update dependencies from dotnet/templating --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e9e2bba858a..7b24566424ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 6fde95fe223d1315f07ac8d212391369c4d8c074 + 98fd40c81c31ece1b03a99c5cab1254c5f361a3d - + https://github.com/dotnet/templating - 6fde95fe223d1315f07ac8d212391369c4d8c074 + 98fd40c81c31ece1b03a99c5cab1254c5f361a3d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a375c2ba836b..4ca13d3ecf38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.100-rtm.23522.1 + 8.0.200-preview.23520.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.100-rtm.23522.1 + 8.0.200-preview.23520.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From fc46323a1fa97bb27cbfacc83cbe21b62f6742a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Oct 2023 12:43:44 +0000 Subject: [PATCH 172/550] Update dependencies from https://github.com/microsoft/vstest build 20231025.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23519-02 -> To Version 17.9.0-preview-23525-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8ede7ab7f99..4b805fe3a4d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -180,18 +180,18 @@ https://github.com/nuget/nuget.client b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/microsoft/vstest - fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 + f82bfa7cad1d5a6beaf08a789e4534623a78f53f - + https://github.com/microsoft/vstest - fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 + f82bfa7cad1d5a6beaf08a789e4534623a78f53f - + https://github.com/microsoft/vstest - fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 + f82bfa7cad1d5a6beaf08a789e4534623a78f53f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 71ec9e136e15..54130cc9b2f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23519-02 - 17.9.0-preview-23519-02 - 17.9.0-preview-23519-02 + 17.9.0-preview-23525-02 + 17.9.0-preview-23525-02 + 17.9.0-preview-23525-02 From ad7cffdcb6394df85a499e71c006861a69fc96c8 Mon Sep 17 00:00:00 2001 From: Djuradj Kurepa <91743470+dkurepa@users.noreply.github.com> Date: Thu, 26 Oct 2023 15:54:50 +0200 Subject: [PATCH 173/550] add Internal args to AOT tests (#36480) --- eng/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/build.yml b/eng/build.yml index 10c777243af5..3126b7b5c240 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -272,6 +272,7 @@ jobs: -configuration $(_BuildConfig) /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\TestInHelix.binlog /p:_CustomHelixTargetQueue=${{ parameters.helixTargetQueue }} + $(_InternalRuntimeDownloadArgs) displayName: Run AoT Tests in Helix env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) @@ -304,6 +305,7 @@ jobs: --projects $(Build.SourcesDirectory)/src/Tests/UnitTests.proj /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/TestInHelix.binlog /p:_CustomHelixTargetQueue=${{ parameters.helixTargetQueue }} + $(_InternalRuntimeDownloadArgs) displayName: Run AoT Tests in Helix env: SYSTEM_ACCESSTOKEN: $(System.AccessToken) From 04455c38901ff7ff782b9481d81a8821c316a878 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:07:41 +0000 Subject: [PATCH 174/550] [release/8.0.2xx] Update dependencies from dotnet/arcade (#36485) [release/8.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8ede7ab7f99..9fcdbfd1065e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -412,22 +412,22 @@ - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + a57022b44f3ff23de925530ea1d27da9701aed57 - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + a57022b44f3ff23de925530ea1d27da9701aed57 - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + a57022b44f3ff23de925530ea1d27da9701aed57 - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + a57022b44f3ff23de925530ea1d27da9701aed57 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 71ec9e136e15..2df09cafad54 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.23516.4 + 8.0.0-beta.23525.4 7.0.0-preview.22423.2 8.0.0-rtm.23520.16 4.3.0 @@ -192,7 +192,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.23516.4 + 8.0.0-beta.23525.4 4.18.4 1.3.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 67a37d1b7f1b..203964418359 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23516.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23516.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23525.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23525.4" } } From 7df4a93e4bc63cfa4ff31f7c3f2872e84f58f3f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:07:59 +0000 Subject: [PATCH 175/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#36486) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fcdbfd1065e..b7b1e5ab7cd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,18 +52,18 @@ 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 43ffadf95d0152a72c596c3ababe91f6eea9201e + ed404c0d68dc073a09c5c9402a5c56f65e7a29a8 - + https://github.com/dotnet/msbuild - 43ffadf95d0152a72c596c3ababe91f6eea9201e + ed404c0d68dc073a09c5c9402a5c56f65e7a29a8 - + https://github.com/dotnet/msbuild - 43ffadf95d0152a72c596c3ababe91f6eea9201e + ed404c0d68dc073a09c5c9402a5c56f65e7a29a8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2df09cafad54..97a36c1f00ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23524-01 + 17.9.0-preview-23525-03 $(MicrosoftBuildPackageVersion) - 8.0.0-preview.23516.2 - 3.11.0-beta1.23516.2 + 8.0.0-preview.23525.2 + 3.11.0-beta1.23525.2 From d63d5f3654315d744c621ff80d76bb3328ec2eeb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:09:13 +0000 Subject: [PATCH 177/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#36489) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f7af5a1c898..aa17797a9ce4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,13 +65,13 @@ https://github.com/dotnet/msbuild ed404c0d68dc073a09c5c9402a5c56f65e7a29a8 - + https://github.com/dotnet/fsharp - 9a84df1cdab9308c73fc29ad5ebb5c85aca44884 + c040d25693a071efb0df0deb24fca347802d0f22 - + https://github.com/dotnet/fsharp - 9a84df1cdab9308c73fc29ad5ebb5c85aca44884 + c040d25693a071efb0df0deb24fca347802d0f22 diff --git a/eng/Versions.props b/eng/Versions.props index 8841694077e0..8410bc171c5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23524.5 + 12.8.0-beta.23525.2 From 0062196957676f936bafe4b2f46492550295c8a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:09:18 +0000 Subject: [PATCH 178/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#36490) [release/8.0.2xx] Update dependencies from dotnet/roslyn --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa17797a9ce4..18db14db5637 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -79,34 +79,34 @@ aadaa166c39c8686c55dbec3462355b1ca033b62 - + https://github.com/dotnet/roslyn - 586a7b1f901e49088176bd759b3e4c9dec258bad + 21bf9a49939411ab683f1a272fd184ed9e459f45 - + https://github.com/dotnet/roslyn - 586a7b1f901e49088176bd759b3e4c9dec258bad + 21bf9a49939411ab683f1a272fd184ed9e459f45 - + https://github.com/dotnet/roslyn - 586a7b1f901e49088176bd759b3e4c9dec258bad + 21bf9a49939411ab683f1a272fd184ed9e459f45 - + https://github.com/dotnet/roslyn - 586a7b1f901e49088176bd759b3e4c9dec258bad + 21bf9a49939411ab683f1a272fd184ed9e459f45 - + https://github.com/dotnet/roslyn - 586a7b1f901e49088176bd759b3e4c9dec258bad + 21bf9a49939411ab683f1a272fd184ed9e459f45 - + https://github.com/dotnet/roslyn - 586a7b1f901e49088176bd759b3e4c9dec258bad + 21bf9a49939411ab683f1a272fd184ed9e459f45 - + https://github.com/dotnet/roslyn - 586a7b1f901e49088176bd759b3e4c9dec258bad + 21bf9a49939411ab683f1a272fd184ed9e459f45 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8410bc171c5c..846be26e5db3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-1.23524.14 - 4.9.0-1.23524.14 - 4.9.0-1.23524.14 - 4.9.0-1.23524.14 - 4.9.0-1.23524.14 - 4.9.0-1.23524.14 - 4.9.0-1.23524.14 + 4.9.0-1.23525.14 + 4.9.0-1.23525.14 + 4.9.0-1.23525.14 + 4.9.0-1.23525.14 + 4.9.0-1.23525.14 + 4.9.0-1.23525.14 + 4.9.0-1.23525.14 $(MicrosoftNetCompilersToolsetPackageVersion) From 232d0ee1892253dce820e6c99876b1fa6eb7ab21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 26 Oct 2023 23:09:46 +0000 Subject: [PATCH 179/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#36493) [release/8.0.2xx] Update dependencies from dotnet/razor --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18db14db5637..247c1df1fedb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -278,18 +278,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 8b3eb4bb33ce55374478efc7760f1d7e7f9359df + 3957cf7ff18e03e6d444c3050ebc12227b89e365 - + https://github.com/dotnet/razor - 8b3eb4bb33ce55374478efc7760f1d7e7f9359df + 3957cf7ff18e03e6d444c3050ebc12227b89e365 - + https://github.com/dotnet/razor - 8b3eb4bb33ce55374478efc7760f1d7e7f9359df + 3957cf7ff18e03e6d444c3050ebc12227b89e365 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 846be26e5db3..be9ed84588c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23525.1 - 7.0.0-preview.23525.1 - 7.0.0-preview.23525.1 + 7.0.0-preview.23525.7 + 7.0.0-preview.23525.7 + 7.0.0-preview.23525.7 From c57717fd59eba090b5d4ad8c82b4b574465a0266 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:46:32 -0700 Subject: [PATCH 180/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#36520) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Mitchell --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 9 +++++---- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index e2054e4e599d..0255b514a5c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70acd2e8ce07..0579bbf89e99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,9 +47,9 @@ https://github.com/dotnet/runtime 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/emsdk - f7ae2160cecd2209121757647d28e64ab8525202 + 1b7f3a6560f6fb5f32b2758603c0376037f555ea https://github.com/dotnet/msbuild @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 3957cf7ff18e03e6d444c3050ebc12227b89e365 + 50409b08f909984fa4de13c3f0461f932b9cda43 - + https://github.com/dotnet/razor - 3957cf7ff18e03e6d444c3050ebc12227b89e365 + 50409b08f909984fa4de13c3f0461f932b9cda43 - + https://github.com/dotnet/razor - 3957cf7ff18e03e6d444c3050ebc12227b89e365 + 50409b08f909984fa4de13c3f0461f932b9cda43 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8d35ca440be4..212dba4631c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23525.7 - 7.0.0-preview.23525.7 - 7.0.0-preview.23525.7 + 7.0.0-preview.23530.7 + 7.0.0-preview.23530.7 + 7.0.0-preview.23530.7 @@ -208,7 +208,8 @@ - 8.0.0 + 8.0.0-rtm.23511.3 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From fb69fc9a444c187eb8bc96c560137d9da5670ee5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:49:27 -0700 Subject: [PATCH 181/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#36516) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0579bbf89e99..bbe05a932c75 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - ed404c0d68dc073a09c5c9402a5c56f65e7a29a8 + d5e157ae4e93efb560eec5777de0b6826c7491a4 - + https://github.com/dotnet/msbuild - ed404c0d68dc073a09c5c9402a5c56f65e7a29a8 + d5e157ae4e93efb560eec5777de0b6826c7491a4 - + https://github.com/dotnet/msbuild - ed404c0d68dc073a09c5c9402a5c56f65e7a29a8 + d5e157ae4e93efb560eec5777de0b6826c7491a4 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 212dba4631c0..47f26cbadaa0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23525-03 + 17.9.0-preview-23531-02 $(MicrosoftBuildPackageVersion) - 6.9.0-preview.1.18 - 6.9.0-preview.1.18 + 6.9.0-preview.1.23 + 6.9.0-preview.1.23 6.0.0-rc.278 - 6.9.0-preview.1.18 - 6.9.0-preview.1.18 - 6.9.0-preview.1.18 - 6.9.0-preview.1.18 - 6.9.0-preview.1.18 - 6.9.0-preview.1.18 - 6.9.0-preview.1.18 - 6.9.0-preview.1.18 - 6.9.0-preview.1.18 + 6.9.0-preview.1.23 + 6.9.0-preview.1.23 + 6.9.0-preview.1.23 + 6.9.0-preview.1.23 + 6.9.0-preview.1.23 + 6.9.0-preview.1.23 + 6.9.0-preview.1.23 + 6.9.0-preview.1.23 + 6.9.0-preview.1.23 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From f7e28c5947beee86800e3401a5f929a7661abfff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Nov 2023 12:39:55 +0000 Subject: [PATCH 183/550] Update dependencies from https://github.com/dotnet/msbuild build 20231101.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23531-02 -> To Version 17.9.0-preview-23551-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbe05a932c75..f3c1ccbcb564 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - d5e157ae4e93efb560eec5777de0b6826c7491a4 + 41411e1ba9a6f231ba7ca0504927118000091956 - + https://github.com/dotnet/msbuild - d5e157ae4e93efb560eec5777de0b6826c7491a4 + 41411e1ba9a6f231ba7ca0504927118000091956 - + https://github.com/dotnet/msbuild - d5e157ae4e93efb560eec5777de0b6826c7491a4 + 41411e1ba9a6f231ba7ca0504927118000091956 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 47f26cbadaa0..1749159498de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23531-02 + 17.9.0-preview-23551-01 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23525.2 + 12.8.0-beta.23531.1 From fc7e85bda469a044c6207243c0914aa0acf48da7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Nov 2023 12:42:03 +0000 Subject: [PATCH 185/550] Update dependencies from https://github.com/microsoft/vstest build 20231031.1 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23525-02 -> To Version 17.9.0-preview-23531-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbe05a932c75..b1cf9c58eca7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client b02fdbb36d34947c24496b2c0b505aa785bc657f - + https://github.com/microsoft/vstest - f82bfa7cad1d5a6beaf08a789e4534623a78f53f + 9e360a6af7c728903882d3468d3036e173d4af6e - + https://github.com/microsoft/vstest - f82bfa7cad1d5a6beaf08a789e4534623a78f53f + 9e360a6af7c728903882d3468d3036e173d4af6e - + https://github.com/microsoft/vstest - f82bfa7cad1d5a6beaf08a789e4534623a78f53f + 9e360a6af7c728903882d3468d3036e173d4af6e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 47f26cbadaa0..c22d002de95f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23525-02 - 17.9.0-preview-23525-02 - 17.9.0-preview-23525-02 + 17.9.0-preview-23531-01 + 17.9.0-preview-23531-01 + 17.9.0-preview-23531-01 From 70ba21c49fc1a784fdc06712eb073eca35a04474 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Nov 2023 12:42:14 +0000 Subject: [PATCH 186/550] Update dependencies from https://github.com/dotnet/razor build 20231031.7 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23530.7 -> To Version 7.0.0-preview.23531.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbe05a932c75..e18f23eb56aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 50409b08f909984fa4de13c3f0461f932b9cda43 + c1d59ff18ac4e5f724fbc448fd733acb804096b5 - + https://github.com/dotnet/razor - 50409b08f909984fa4de13c3f0461f932b9cda43 + c1d59ff18ac4e5f724fbc448fd733acb804096b5 - + https://github.com/dotnet/razor - 50409b08f909984fa4de13c3f0461f932b9cda43 + c1d59ff18ac4e5f724fbc448fd733acb804096b5 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 47f26cbadaa0..d9c68029ce8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23530.7 - 7.0.0-preview.23530.7 - 7.0.0-preview.23530.7 + 7.0.0-preview.23531.7 + 7.0.0-preview.23531.7 + 7.0.0-preview.23531.7 From f486f117359d1a2fa8d80b6c5f0699ea6fc2292f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 16:04:26 +0000 Subject: [PATCH 187/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#36603) [release/8.0.2xx] Update dependencies from dotnet/roslyn --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbe05a932c75..3df2cc393a78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ aadaa166c39c8686c55dbec3462355b1ca033b62 - + https://github.com/dotnet/roslyn - 21bf9a49939411ab683f1a272fd184ed9e459f45 + 7eff5ed876f1d5f64dab9eb1b7d1c22e6ee587fa - + https://github.com/dotnet/roslyn - 21bf9a49939411ab683f1a272fd184ed9e459f45 + 7eff5ed876f1d5f64dab9eb1b7d1c22e6ee587fa - + https://github.com/dotnet/roslyn - 21bf9a49939411ab683f1a272fd184ed9e459f45 + 7eff5ed876f1d5f64dab9eb1b7d1c22e6ee587fa - + https://github.com/dotnet/roslyn - 21bf9a49939411ab683f1a272fd184ed9e459f45 + 7eff5ed876f1d5f64dab9eb1b7d1c22e6ee587fa - + https://github.com/dotnet/roslyn - 21bf9a49939411ab683f1a272fd184ed9e459f45 + 7eff5ed876f1d5f64dab9eb1b7d1c22e6ee587fa - + https://github.com/dotnet/roslyn - 21bf9a49939411ab683f1a272fd184ed9e459f45 + 7eff5ed876f1d5f64dab9eb1b7d1c22e6ee587fa - + https://github.com/dotnet/roslyn - 21bf9a49939411ab683f1a272fd184ed9e459f45 + 7eff5ed876f1d5f64dab9eb1b7d1c22e6ee587fa https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 47f26cbadaa0..c5b6f38e5a91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-1.23525.14 - 4.9.0-1.23525.14 - 4.9.0-1.23525.14 - 4.9.0-1.23525.14 - 4.9.0-1.23525.14 - 4.9.0-1.23525.14 - 4.9.0-1.23525.14 + 4.9.0-2.23531.10 + 4.9.0-2.23531.10 + 4.9.0-2.23531.10 + 4.9.0-2.23531.10 + 4.9.0-2.23531.10 + 4.9.0-2.23531.10 + 4.9.0-2.23531.10 $(MicrosoftNetCompilersToolsetPackageVersion) From d80665216887c35c6806c2445f71455a411bf365 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 18:50:48 +0000 Subject: [PATCH 188/550] [release/8.0.2xx] Update dependencies from dotnet/format (#36573) [release/8.0.2xx] Update dependencies from dotnet/format --- NuGet.config | 2 +- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0255b514a5c6..855c40e47ca2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8c23fe51128..8e7a25d08dd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ c040d25693a071efb0df0deb24fca347802d0f22 - + https://github.com/dotnet/format - aadaa166c39c8686c55dbec3462355b1ca033b62 + 798570652705e18c9b92f7724c55c3289faa9074 diff --git a/eng/Versions.props b/eng/Versions.props index 20c1753132a0..271f49caa710 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.452414 + 8.0.453102 From ddeb8748063e27ac8a6623f36e37efa8e1df7033 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Wed, 1 Nov 2023 12:57:45 -0700 Subject: [PATCH 189/550] skip packageinstall test for linux --- .../ToolPackageInstallerNugetCacheTests.cs | 4 ++-- .../ToolPackageUninstallerTests.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerNugetCacheTests.cs b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerNugetCacheTests.cs index 3aedbf9a3a98..263b8d3bba6e 100644 --- a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerNugetCacheTests.cs +++ b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageInstallerNugetCacheTests.cs @@ -18,7 +18,7 @@ public ToolPackageInstallToManagedLocationInstaller(ITestOutputHelper log) : bas { } - [Theory] + [WindowsOnlyTheory] [InlineData(false)] [InlineData(true)] public void GivenNugetConfigInstallSucceeds(bool testMockBehaviorIsInSync) @@ -61,7 +61,7 @@ public void GivenNugetConfigInstallSucceeds(bool testMockBehaviorIsInSync) } } - [Theory] + [WindowsOnlyTheory] [InlineData(false)] [InlineData(true)] public void GivenNugetConfigVersionRangeInstallSucceeds(bool testMockBehaviorIsInSync) diff --git a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageUninstallerTests.cs b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageUninstallerTests.cs index 4e5750f81d61..21c0f99477e8 100644 --- a/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageUninstallerTests.cs +++ b/src/Tests/Microsoft.DotNet.PackageInstall.Tests/ToolPackageUninstallerTests.cs @@ -15,7 +15,7 @@ namespace Microsoft.DotNet.PackageInstall.Tests { public class ToolPackageUninstallerTests : SdkTest { - [Theory] + [WindowsOnlyTheory] [InlineData(false)] [InlineData(true)] public void GivenAnInstalledPackageUninstallRemovesThePackage(bool testMockBehaviorIsInSync) From e4fe88b8cb960d51b247592e49490169b9b68046 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Nov 2023 12:35:27 +0000 Subject: [PATCH 190/550] Update dependencies from https://github.com/dotnet/msbuild build 20231101.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23551-01 -> To Version 17.9.0-preview-23551-06 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd8c854c78c6..c3e2ef600b79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 41411e1ba9a6f231ba7ca0504927118000091956 + 31c4d335325e858a3c4dba66d921d0e31bdee5ff - + https://github.com/dotnet/msbuild - 41411e1ba9a6f231ba7ca0504927118000091956 + 31c4d335325e858a3c4dba66d921d0e31bdee5ff - + https://github.com/dotnet/msbuild - 41411e1ba9a6f231ba7ca0504927118000091956 + 31c4d335325e858a3c4dba66d921d0e31bdee5ff https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 055ed1fec10c..d567b31034ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23551-01 + 17.9.0-preview-23551-06 $(MicrosoftBuildPackageVersion) - 4.9.0-2.23531.10 - 4.9.0-2.23531.10 - 4.9.0-2.23531.10 - 4.9.0-2.23531.10 - 4.9.0-2.23531.10 - 4.9.0-2.23531.10 - 4.9.0-2.23531.10 + 4.9.0-2.23552.1 + 4.9.0-2.23552.1 + 4.9.0-2.23552.1 + 4.9.0-2.23552.1 + 4.9.0-2.23552.1 + 4.9.0-2.23552.1 + 4.9.0-2.23552.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 411ea038f40f8f00e0ecd68809c66d45b3e027ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Nov 2023 12:37:13 +0000 Subject: [PATCH 192/550] Update dependencies from https://github.com/dotnet/razor build 20231101.5 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23531.7 -> To Version 7.0.0-preview.23551.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd8c854c78c6..bf85dc519f3f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - c1d59ff18ac4e5f724fbc448fd733acb804096b5 + 6a5ccd98416f265b5c6ab8d06786e1ed19861363 - + https://github.com/dotnet/razor - c1d59ff18ac4e5f724fbc448fd733acb804096b5 + 6a5ccd98416f265b5c6ab8d06786e1ed19861363 - + https://github.com/dotnet/razor - c1d59ff18ac4e5f724fbc448fd733acb804096b5 + 6a5ccd98416f265b5c6ab8d06786e1ed19861363 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 055ed1fec10c..4771cd99bfab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23531.7 - 7.0.0-preview.23531.7 - 7.0.0-preview.23531.7 + 7.0.0-preview.23551.5 + 7.0.0-preview.23551.5 + 7.0.0-preview.23551.5 From 36169a47bdf9a43b1df11197bdee1f1d9d6314ea Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Thu, 2 Nov 2023 17:39:44 -0700 Subject: [PATCH 193/550] change tool exception and nuget exceptions to be GracefulException --- src/Cli/Microsoft.DotNet.Cli.Utils/GracefulException.cs | 4 ++++ .../dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs | 3 +-- src/Cli/dotnet/NugetPackageDownloader/ToolPackageException.cs | 4 +++- src/Cli/dotnet/ToolPackage/ToolPackageException.cs | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/GracefulException.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/GracefulException.cs index 5fb7a24f9244..8de30ca1a06f 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/GracefulException.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/GracefulException.cs @@ -8,6 +8,10 @@ public class GracefulException : Exception public bool IsUserError { get; } = true; public string VerboseMessage { get; } = string.Empty; + public GracefulException() + { + } + public GracefulException(string message) : base(message) { Data.Add(ExceptionExtensions.CLI_User_Displayed_Exception, true); diff --git a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs index 4b7e57978835..ca69f1254009 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs @@ -450,10 +450,9 @@ await Task.WhenAll( throw new NuGetPackageNotFoundException( string.Format( LocalizableStrings.IsNotFoundInNuGetFeeds, - $"{packageIdentifier}::{versionRange}", + $"{packageIdentifier} of version range {versionRange}", string.Join(", ", packageSources.Select(source => source.Source)))); } - } private async Task<(PackageSource, IPackageSearchMetadata)> GetLatestVersionInternalAsync( diff --git a/src/Cli/dotnet/NugetPackageDownloader/ToolPackageException.cs b/src/Cli/dotnet/NugetPackageDownloader/ToolPackageException.cs index b2475bdeefcd..8e087629e471 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/ToolPackageException.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/ToolPackageException.cs @@ -1,9 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.DotNet.Cli.Utils; + namespace Microsoft.DotNet.Cli.NuGetPackageDownloader { - internal class NuGetPackageInstallerException : Exception + internal class NuGetPackageInstallerException : GracefulException { public NuGetPackageInstallerException() { diff --git a/src/Cli/dotnet/ToolPackage/ToolPackageException.cs b/src/Cli/dotnet/ToolPackage/ToolPackageException.cs index 5617dbc72f20..0614f662482e 100644 --- a/src/Cli/dotnet/ToolPackage/ToolPackageException.cs +++ b/src/Cli/dotnet/ToolPackage/ToolPackageException.cs @@ -1,9 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.DotNet.Cli.Utils; namespace Microsoft.DotNet.ToolPackage { - internal class ToolPackageException : Exception + internal class ToolPackageException : GracefulException { public ToolPackageException() { From 62f610cd254d0d3375abe8016e4133b97520bd28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Nov 2023 12:38:49 +0000 Subject: [PATCH 194/550] Update dependencies from https://github.com/dotnet/fsharp build 20231103.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23531.1 -> To Version 8.0.200-beta.23553.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfac0b69afe4..a2dacec4fbd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 31c4d335325e858a3c4dba66d921d0e31bdee5ff - + https://github.com/dotnet/fsharp - f15ab7bba83a6c3d0f89c48e7ec854604e21b5e4 + 20a651339d8bf8405232872cb8e39aaafc36b397 - + https://github.com/dotnet/fsharp - f15ab7bba83a6c3d0f89c48e7ec854604e21b5e4 + 20a651339d8bf8405232872cb8e39aaafc36b397 diff --git a/eng/Versions.props b/eng/Versions.props index 3fddbd91b9b1..a1ac67af4b3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23531.1 + 12.8.0-beta.23553.1 From 89b731117a7eab35fb2c32f75c3800283c6f9826 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Nov 2023 12:38:59 +0000 Subject: [PATCH 195/550] Update dependencies from https://github.com/dotnet/roslyn build 20231102.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23552.1 -> To Version 4.9.0-2.23552.8 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfac0b69afe4..19b8409a1e47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - c4f10eefa3abb66bd27be987465039896eeaf52f + 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 - + https://github.com/dotnet/roslyn - c4f10eefa3abb66bd27be987465039896eeaf52f + 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 - + https://github.com/dotnet/roslyn - c4f10eefa3abb66bd27be987465039896eeaf52f + 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 - + https://github.com/dotnet/roslyn - c4f10eefa3abb66bd27be987465039896eeaf52f + 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 - + https://github.com/dotnet/roslyn - c4f10eefa3abb66bd27be987465039896eeaf52f + 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 - + https://github.com/dotnet/roslyn - c4f10eefa3abb66bd27be987465039896eeaf52f + 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 - + https://github.com/dotnet/roslyn - c4f10eefa3abb66bd27be987465039896eeaf52f + 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3fddbd91b9b1..a80eb4376627 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23552.1 - 4.9.0-2.23552.1 - 4.9.0-2.23552.1 - 4.9.0-2.23552.1 - 4.9.0-2.23552.1 - 4.9.0-2.23552.1 - 4.9.0-2.23552.1 + 4.9.0-2.23552.8 + 4.9.0-2.23552.8 + 4.9.0-2.23552.8 + 4.9.0-2.23552.8 + 4.9.0-2.23552.8 + 4.9.0-2.23552.8 + 4.9.0-2.23552.8 $(MicrosoftNetCompilersToolsetPackageVersion) From 2852ca0d9972e40cd1590e201e8c1c2e50223807 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Nov 2023 12:39:40 +0000 Subject: [PATCH 196/550] Update dependencies from https://github.com/dotnet/razor build 20231102.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23551.5 -> To Version 7.0.0-preview.23552.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfac0b69afe4..f94f11432ea2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 6a5ccd98416f265b5c6ab8d06786e1ed19861363 + 79ded166e483ce6dce9c62c0f8381ca743a9c092 - + https://github.com/dotnet/razor - 6a5ccd98416f265b5c6ab8d06786e1ed19861363 + 79ded166e483ce6dce9c62c0f8381ca743a9c092 - + https://github.com/dotnet/razor - 6a5ccd98416f265b5c6ab8d06786e1ed19861363 + 79ded166e483ce6dce9c62c0f8381ca743a9c092 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3fddbd91b9b1..d6c3de34cc8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23551.5 - 7.0.0-preview.23551.5 - 7.0.0-preview.23551.5 + 7.0.0-preview.23552.3 + 7.0.0-preview.23552.3 + 7.0.0-preview.23552.3 From a4f6eff393cf46b773a2426d9aa70471913c3b85 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Nov 2023 16:58:57 +0000 Subject: [PATCH 197/550] [release/8.0.2xx] Update dependencies from dotnet/templating (#36519) [release/8.0.2xx] Update dependencies from dotnet/templating - Merge branch 'release/8.0.2xx' of https://github.com/dotnet/sdk into darc-release/8.0.2xx-0647b454-4ec4-4ac7-a2e5-1c560b04d695 - Fix the template discovery package version --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- .../dotnet-new.Tests/dotnet-new.IntegrationTests.csproj | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dfac0b69afe4..f135fb89b366 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 98fd40c81c31ece1b03a99c5cab1254c5f361a3d + c57a8717de8bb4d77e1a4d074d51c35186d2ea11 - + https://github.com/dotnet/templating - 98fd40c81c31ece1b03a99c5cab1254c5f361a3d + c57a8717de8bb4d77e1a4d074d51c35186d2ea11 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3fddbd91b9b1..e7da8d9c56b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.200-preview.23520.4 + 8.0.200-preview.23551.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.200-preview.23520.4 + 8.0.200-preview.23551.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) diff --git a/src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj b/src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj index 20865562ba76..3082e288c03f 100644 --- a/src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj +++ b/src/Tests/dotnet-new.Tests/dotnet-new.IntegrationTests.csproj @@ -44,7 +44,7 @@ namespace Microsoft.DotNet.Cli.New.IntegrationTests internal class TemplatePackageVersion { - public const string MicrosoftTemplateSearchTemplateDiscoveryPackageVersion = "$(MicrosoftTemplateEngineAbstractionsPackageVersion)"%3B + public const string MicrosoftTemplateSearchTemplateDiscoveryPackageVersion = "$(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion)"%3B } } ]]> From a41cd6452849fe3907edf201faabd9f2bfa522bd Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Fri, 3 Nov 2023 16:12:42 -0500 Subject: [PATCH 198/550] add missing --archiveoutputpath option to .NET Framework container tool task --- .../Tasks/CreateNewImageToolTask.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs index d68c6011b18d..6189d3d74d4e 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs @@ -187,6 +187,11 @@ internal string GenerateCommandLineCommandsInt() builder.AppendSwitchIfNotNull("--container-user ", ContainerUser); } + if (!string.IsNullOrWhiteSpace(ArchiveOutputPath)) + { + builder.AppendSwitchIfNotNull("--archiveoutputpath ", ArchiveOutputPath); + } + return builder.ToString(); void AppendSwitchIfNotNullSantized(CommandLineBuilder builder, string commandArgName, string propertyName, ITaskItem[] value) From 34b78f202dfe6f053d9fd0472bb830c1b3f16d50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Nov 2023 12:34:03 +0000 Subject: [PATCH 199/550] Update dependencies from https://github.com/dotnet/fsharp build 20231103.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23531.1 -> To Version 8.0.200-beta.23553.1 From 2b88deac72d6d32e44a4677cc01cda116fccba9c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Nov 2023 12:34:13 +0000 Subject: [PATCH 200/550] Update dependencies from https://github.com/dotnet/roslyn build 20231104.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23552.8 -> To Version 4.9.0-2.23554.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index effce394a40c..97298924f096 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 + 5234e4783dbb5b2bf94772eb2168b88d1af90076 - + https://github.com/dotnet/roslyn - 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 + 5234e4783dbb5b2bf94772eb2168b88d1af90076 - + https://github.com/dotnet/roslyn - 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 + 5234e4783dbb5b2bf94772eb2168b88d1af90076 - + https://github.com/dotnet/roslyn - 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 + 5234e4783dbb5b2bf94772eb2168b88d1af90076 - + https://github.com/dotnet/roslyn - 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 + 5234e4783dbb5b2bf94772eb2168b88d1af90076 - + https://github.com/dotnet/roslyn - 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 + 5234e4783dbb5b2bf94772eb2168b88d1af90076 - + https://github.com/dotnet/roslyn - 2e425a806f07f7f0bfa3fb5bbb3222b13564a538 + 5234e4783dbb5b2bf94772eb2168b88d1af90076 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f7b56b1baf78..3efeb8c2573e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23552.8 - 4.9.0-2.23552.8 - 4.9.0-2.23552.8 - 4.9.0-2.23552.8 - 4.9.0-2.23552.8 - 4.9.0-2.23552.8 - 4.9.0-2.23552.8 + 4.9.0-2.23554.1 + 4.9.0-2.23554.1 + 4.9.0-2.23554.1 + 4.9.0-2.23554.1 + 4.9.0-2.23554.1 + 4.9.0-2.23554.1 + 4.9.0-2.23554.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 478330571b47df31911a64e7bc063e2247a7ce73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Nov 2023 12:34:37 +0000 Subject: [PATCH 201/550] Update dependencies from https://github.com/dotnet/templating build 20231103.2 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.200-preview.23551.4 -> To Version 8.0.200-preview.23553.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index effce394a40c..1415b28cabd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - c57a8717de8bb4d77e1a4d074d51c35186d2ea11 + 96f08361269468012a98b7faf1af60ac9606c238 - + https://github.com/dotnet/templating - c57a8717de8bb4d77e1a4d074d51c35186d2ea11 + 96f08361269468012a98b7faf1af60ac9606c238 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f7b56b1baf78..e3e65d16488b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.200-preview.23551.4 + 8.0.200-preview.23553.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.200-preview.23551.4 + 8.0.200-preview.23553.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f31fcc67b90961d08dc165c7b12dc41fcec2b76b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Nov 2023 12:34:47 +0000 Subject: [PATCH 202/550] Update dependencies from https://github.com/dotnet/razor build 20231104.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23552.3 -> To Version 7.0.0-preview.23554.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index effce394a40c..43a9daee4fb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 79ded166e483ce6dce9c62c0f8381ca743a9c092 + b2c85315a056cb671164aeddacd7d94b5dc22773 - + https://github.com/dotnet/razor - 79ded166e483ce6dce9c62c0f8381ca743a9c092 + b2c85315a056cb671164aeddacd7d94b5dc22773 - + https://github.com/dotnet/razor - 79ded166e483ce6dce9c62c0f8381ca743a9c092 + b2c85315a056cb671164aeddacd7d94b5dc22773 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f7b56b1baf78..673c14ccdfe3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23552.3 - 7.0.0-preview.23552.3 - 7.0.0-preview.23552.3 + 7.0.0-preview.23554.1 + 7.0.0-preview.23554.1 + 7.0.0-preview.23554.1 From 5e23ca93f0322afec42a89d1fa49acfee14be862 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 Nov 2023 13:28:13 +0000 Subject: [PATCH 203/550] Update dependencies from https://github.com/dotnet/fsharp build 20231103.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23531.1 -> To Version 8.0.200-beta.23553.1 From eb7015261fec845faec5d971e5c1329dd3b828aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 Nov 2023 13:28:27 +0000 Subject: [PATCH 204/550] Update dependencies from https://github.com/dotnet/roslyn build 20231104.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23552.8 -> To Version 4.9.0-2.23554.1 From 63e441a1ade7abf61ad45004bddff8902299880c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 Nov 2023 13:28:56 +0000 Subject: [PATCH 205/550] Update dependencies from https://github.com/dotnet/templating build 20231103.2 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.200-preview.23551.4 -> To Version 8.0.200-preview.23553.2 From 309129bf33f28803a5d85b804a8f197d7208d5ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 Nov 2023 13:29:10 +0000 Subject: [PATCH 206/550] Update dependencies from https://github.com/dotnet/razor build 20231104.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23552.3 -> To Version 7.0.0-preview.23554.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43a9daee4fb7..2e7407a75942 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - b2c85315a056cb671164aeddacd7d94b5dc22773 + 045986af348c73f5d7906f79da5d88372ff0efa4 - + https://github.com/dotnet/razor - b2c85315a056cb671164aeddacd7d94b5dc22773 + 045986af348c73f5d7906f79da5d88372ff0efa4 - + https://github.com/dotnet/razor - b2c85315a056cb671164aeddacd7d94b5dc22773 + 045986af348c73f5d7906f79da5d88372ff0efa4 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 673c14ccdfe3..cc890caa64b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23554.1 - 7.0.0-preview.23554.1 - 7.0.0-preview.23554.1 + 7.0.0-preview.23554.3 + 7.0.0-preview.23554.3 + 7.0.0-preview.23554.3 From a16c524a39cd0ea2688783ac2b62f12dac788557 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Nov 2023 13:31:54 +0000 Subject: [PATCH 207/550] Update dependencies from https://github.com/dotnet/roslyn build 20231106.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23554.1 -> To Version 4.9.0-2.23556.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 732806a32bab..b52b10a6d812 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - 5234e4783dbb5b2bf94772eb2168b88d1af90076 + a5724a2fb9b94323923f9a9f5d6bfb345d49490d - + https://github.com/dotnet/roslyn - 5234e4783dbb5b2bf94772eb2168b88d1af90076 + a5724a2fb9b94323923f9a9f5d6bfb345d49490d - + https://github.com/dotnet/roslyn - 5234e4783dbb5b2bf94772eb2168b88d1af90076 + a5724a2fb9b94323923f9a9f5d6bfb345d49490d - + https://github.com/dotnet/roslyn - 5234e4783dbb5b2bf94772eb2168b88d1af90076 + a5724a2fb9b94323923f9a9f5d6bfb345d49490d - + https://github.com/dotnet/roslyn - 5234e4783dbb5b2bf94772eb2168b88d1af90076 + a5724a2fb9b94323923f9a9f5d6bfb345d49490d - + https://github.com/dotnet/roslyn - 5234e4783dbb5b2bf94772eb2168b88d1af90076 + a5724a2fb9b94323923f9a9f5d6bfb345d49490d - + https://github.com/dotnet/roslyn - 5234e4783dbb5b2bf94772eb2168b88d1af90076 + a5724a2fb9b94323923f9a9f5d6bfb345d49490d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b785b752c839..26c75a384491 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23554.1 - 4.9.0-2.23554.1 - 4.9.0-2.23554.1 - 4.9.0-2.23554.1 - 4.9.0-2.23554.1 - 4.9.0-2.23554.1 - 4.9.0-2.23554.1 + 4.9.0-2.23556.1 + 4.9.0-2.23556.1 + 4.9.0-2.23556.1 + 4.9.0-2.23556.1 + 4.9.0-2.23556.1 + 4.9.0-2.23556.1 + 4.9.0-2.23556.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 527420e44e373ec8423bdeafbca27cc31cbb5c5c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Nov 2023 13:32:16 +0000 Subject: [PATCH 208/550] Update dependencies from https://github.com/microsoft/vstest build 20231105.1 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23531-01 -> To Version 17.9.0-preview-23555-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 732806a32bab..1f0290dbcaa9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client b10ba996eeb40da639273848408d2628e01076f4 - + https://github.com/microsoft/vstest - 9e360a6af7c728903882d3468d3036e173d4af6e + b634ac7c414f0a1581fdf288b26ac0013bc6371d - + https://github.com/microsoft/vstest - 9e360a6af7c728903882d3468d3036e173d4af6e + b634ac7c414f0a1581fdf288b26ac0013bc6371d - + https://github.com/microsoft/vstest - 9e360a6af7c728903882d3468d3036e173d4af6e + b634ac7c414f0a1581fdf288b26ac0013bc6371d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b785b752c839..f4b4a9d3b135 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23531-01 - 17.9.0-preview-23531-01 - 17.9.0-preview-23531-01 + 17.9.0-preview-23555-01 + 17.9.0-preview-23555-01 + 17.9.0-preview-23555-01 From 1e3b4a73983d8b29082be0ecd4be84adce85abe2 Mon Sep 17 00:00:00 2001 From: Mark Li Date: Mon, 6 Nov 2023 10:47:29 -0800 Subject: [PATCH 209/550] [#17005] Make Mistyping Errors Gentler (#35939) Changed a part of the message from error output into normal output as error output is always red. --- .../CommandUnknownException.cs | 18 ++++++++----- .../LocalizableStrings.resx | 8 +++--- .../xlf/LocalizableStrings.cs.xlf | 10 ++++--- .../xlf/LocalizableStrings.de.xlf | 10 ++++--- .../xlf/LocalizableStrings.es.xlf | 10 ++++--- .../xlf/LocalizableStrings.fr.xlf | 10 ++++--- .../xlf/LocalizableStrings.it.xlf | 10 ++++--- .../xlf/LocalizableStrings.ja.xlf | 10 ++++--- .../xlf/LocalizableStrings.ko.xlf | 10 ++++--- .../xlf/LocalizableStrings.pl.xlf | 10 ++++--- .../xlf/LocalizableStrings.pt-BR.xlf | 10 ++++--- .../xlf/LocalizableStrings.ru.xlf | 10 ++++--- .../xlf/LocalizableStrings.tr.xlf | 10 ++++--- .../xlf/LocalizableStrings.zh-Hans.xlf | 10 ++++--- .../xlf/LocalizableStrings.zh-Hant.xlf | 10 ++++--- src/Cli/dotnet/Program.cs | 27 ++++++++++++------- .../GivenThatDotNetRunsCommands.cs | 3 ++- .../dotnet.Tests/PackagedCommandTests.cs | 11 +++++--- 18 files changed, 134 insertions(+), 63 deletions(-) diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/CommandUnknownException.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/CommandUnknownException.cs index ac6664bd8e42..66a162f11c39 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/CommandUnknownException.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/CommandUnknownException.cs @@ -5,18 +5,22 @@ namespace Microsoft.DotNet.Cli.Utils { public class CommandUnknownException : GracefulException { - public CommandUnknownException(string commandName) : base(string.Format( - LocalizableStrings.NoExecutableFoundMatchingCommand, - commandName)) + public string InstructionMessage { get; } = string.Empty; + + public CommandUnknownException(string commandName) : base( + LocalizableStrings.NoExecutableFoundMatchingCommandErrorMessage) { + InstructionMessage = string.Format( + LocalizableStrings.NoExecutableFoundMatchingCommand, + commandName); } public CommandUnknownException(string commandName, Exception innerException) : base( - string.Format( - LocalizableStrings.NoExecutableFoundMatchingCommand, - commandName), - innerException) + LocalizableStrings.NoExecutableFoundMatchingCommandErrorMessage) { + InstructionMessage = string.Format( + LocalizableStrings.NoExecutableFoundMatchingCommand, + commandName); } } } diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx b/src/Cli/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx index 434edc942091..f834f2498126 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx @@ -129,9 +129,11 @@ The project may not have been restored or restore failed - run `dotnet restore` + + Could not execute because the specified command or file was not found. + - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. @@ -186,4 +188,4 @@ dotnet tool install --global {1} .NET workloads installed: - \ No newline at end of file + diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf index 0a19b54165ac..d9ca65112185 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf @@ -12,6 +12,11 @@ Nesprávně naformátovaný text příkazu {0} + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer Nepodařilo se najít multiplexor dotnetu. @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Spuštění nebylo úspěšné, protože zadaný příkaz nebo soubor se nenašly. + Spuštění nebylo úspěšné, protože zadaný příkaz nebo soubor se nenašly. Mezi možné příčiny patří toto: * V integrovaném příkazu dotnet je překlep. * Chtěli jste spustit program .NET, ale {0} neexistuje. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf index 931f8681cf5a..1bf008ed744b 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf @@ -12,6 +12,11 @@ Fehlerhafter Befehlstext "{0}". + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer Dotnetmultiplexer nicht gefunden @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Die Ausführung war nicht möglich, weil der angegebene Befehl oder die Datei nicht gefunden wurde. + Die Ausführung war nicht möglich, weil der angegebene Befehl oder die Datei nicht gefunden wurde. Mögliche Ursachen: * Sie haben sich bei einem integrierten dotnet-Befehl verschrieben. * Sie wollten ein .NET-Programm ausführen, aber "{0}" ist nicht vorhanden. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf index 6c95a5a48054..369bc324ceda 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf @@ -12,6 +12,11 @@ Texto de comando con formato incorrecto "{0}" + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer No se puede ubicar el multiplexor dotnet @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - No se pudo ejecutar porque no se encontró el comando o el archivo especificado. + No se pudo ejecutar porque no se encontró el comando o el archivo especificado. Algunas de las posibles causas son : * Escribió mal un comando dotnet integrado. * Pretendía ejecutar un programa .NET, pero {0} no existe. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf index ac52d261b855..80214be6bf6a 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf @@ -12,6 +12,11 @@ Texte de commande incorrect '{0}' + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer Le multiplexeur dotnet est introuvable @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Impossible d'effectuer l'exécution, car la commande ou le fichier spécifié est introuvable. + Impossible d'effectuer l'exécution, car la commande ou le fichier spécifié est introuvable. Raisons possibles : * Vous avez mal orthographié une commande dotnet intégrée. * Vous avez voulu exécuter un programme .NET, mais {0} n'existe pas. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf index a6c286a1e24c..3d384cdff98e 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf @@ -12,6 +12,11 @@ Il testo del comando '{0}' non è corretto + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer Il multiplexer dotnet non è stato trovato @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Non è stato possibile completare l'esecuzione perché il comando o il file specificato non è stato trovato. + Non è stato possibile completare l'esecuzione perché il comando o il file specificato non è stato trovato. Motivi possibili: * Il nome di un comando dotnet predefinito non è stato digitato correttamente. * Si intendeva eseguire un programma .NET, ma {0} non esiste. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf index db28e5cadd21..a0b722dd3fa9 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf @@ -12,6 +12,11 @@ 無効な形式のコマンド テキスト '{0}' + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer dotnet マルチプレクサーが見つかりません @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - 指定されたコマンドまたはファイルが見つからなかったため、実行できませんでした。 + 指定されたコマンドまたはファイルが見つからなかったため、実行できませんでした。 次のような原因が考えられます。 * 組み込みの dotnet コマンドのスペルが間違っている。 * .NET プログラムを実行しようとしたが、{0} が存在しない。 diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf index dbe9f93adc8f..156f4131d1fb 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf @@ -12,6 +12,11 @@ 형식이 잘못된 명령 텍스트 '{0}' + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer dotnet multiplexer를 찾을 수 없음 @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - 지정된 명령 또는 파일을 찾을 수 없으므로 실행할 수 없습니다. + 지정된 명령 또는 파일을 찾을 수 없으므로 실행할 수 없습니다. 가능한 원인은 다음과 같습니다. * 기본 제공 dotnet 명령 철자가 잘못 입력되었습니다. * .NET 프로그램을 실행하려고 했지만, {0}이(가) 없습니다. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf index bb872cff6b03..9673490d2048 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf @@ -12,6 +12,11 @@ Nieprawidłowo sformułowany tekst polecenia „{0}” + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer Nie można zlokalizować multipleksera dotnet @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Nie można wykonać, ponieważ nie odnaleziono określonego polecenia lub pliku. + Nie można wykonać, ponieważ nie odnaleziono określonego polecenia lub pliku. Możliwe przyczyny: * Błąd pisowni wbudowanego polecenia dotnet . * Planowano wykonanie programu platformy .NET, ale element {0} nie istnieje. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf index c3a32a20687d..b1c76c52af00 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf @@ -12,6 +12,11 @@ Texto do comando malformado '{0}' + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer Não é possível localizar o multiplexador do dotnet @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Não foi possível executar porque o comando ou o arquivo especificado não foi encontrado. + Não foi possível executar porque o comando ou o arquivo especificado não foi encontrado. Possíveis motivos para isso incluem: * Você digitou incorretamente um comando de dotnet interno. * Você pretendia executar um programa .NET, mas {0} não existe. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf index 84b4742064c3..b019e780066b 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf @@ -12,6 +12,11 @@ Неправильный формат текста команды "{0}" + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer Не удается найти мультиплексор dotnet. @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Не удалось выполнить, так как не найдены указанная команда или указанный файл. + Не удалось выполнить, так как не найдены указанная команда или указанный файл. Возможные причины: * вы неправильно набрали встроенную команду dotnet; * вы планировали выполнить программу .NET, однако {0} не существует; diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf index 546b74e21b8f..0417d4fc04b9 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf @@ -12,6 +12,11 @@ Hatalı biçimlendirilmiş komut metni: '{0}' + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer Dotnet çoğullayıcısı bulunamadı @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Belirtilen komut veya dosya bulunamadığından yürütülemedi. + Belirtilen komut veya dosya bulunamadığından yürütülemedi. Bunun nedeni şunlardan biri olabilir: * Yerleşik bir dotnet komutunu yanlış yazdınız. * Bir .NET programını yürütmeyi amaçladınız, ancak {0} yok. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf index 5d2ec87f2da8..6a12f7ac81b8 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf @@ -12,6 +12,11 @@ 命令文本“{0}”格式错误 + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer 找不到 dotnet 多路复用器 @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - 无法执行,因为找不到指定的命令或文件。 + 无法执行,因为找不到指定的命令或文件。 可能的原因包括: *内置的 dotnet 命令拼写错误。 *你打算执行 .NET 程序,但 {0} 不存在。 diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf index 829e3039ab97..f8dbdf0147ee 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf @@ -12,6 +12,11 @@ 命令文字 '{0}' 格式錯誤 + + Could not execute because the specified command or file was not found. + Could not execute because the specified command or file was not found. + + Unable to locate dotnet multiplexer 找不到 dotnet multiplexer @@ -28,12 +33,11 @@ - Could not execute because the specified command or file was not found. -Possible reasons for this include: + Possible reasons for this include: * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - 因為找不到指定的命令或檔案,所以無法執行。 + 因為找不到指定的命令或檔案,所以無法執行。 可能的原因包括: * 內建 dotnet 命令拼寫錯誤。 * 您預計要執行 .NET 程式,但不存在 {0}。 diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs index 72307655b8af..9857dc0996ae 100644 --- a/src/Cli/dotnet/Program.cs +++ b/src/Cli/dotnet/Program.cs @@ -237,17 +237,26 @@ internal static int ProcessArgs(string[] args, TimeSpan startupTime, ITelemetry else { PerformanceLogEventSource.Log.ExtensibleCommandResolverStart(); - var resolvedCommand = CommandFactoryUsingResolver.Create( - "dotnet-" + parseResult.GetValue(Parser.DotnetSubCommand), - args.GetSubArguments(), - FrameworkConstants.CommonFrameworks.NetStandardApp15); - PerformanceLogEventSource.Log.ExtensibleCommandResolverStop(); + try + { + var resolvedCommand = CommandFactoryUsingResolver.Create( + "dotnet-" + parseResult.GetValue(Parser.DotnetSubCommand), + args.GetSubArguments(), + FrameworkConstants.CommonFrameworks.NetStandardApp15); + PerformanceLogEventSource.Log.ExtensibleCommandResolverStop(); - PerformanceLogEventSource.Log.ExtensibleCommandStart(); - var result = resolvedCommand.Execute(); - PerformanceLogEventSource.Log.ExtensibleCommandStop(); + PerformanceLogEventSource.Log.ExtensibleCommandStart(); + var result = resolvedCommand.Execute(); + PerformanceLogEventSource.Log.ExtensibleCommandStop(); - exitCode = result.ExitCode; + exitCode = result.ExitCode; + } + catch (CommandUnknownException e) + { + Reporter.Error.WriteLine(e.Message.Red()); + Reporter.Output.WriteLine(e.InstructionMessage); + exitCode = 1; + } } PerformanceLogEventSource.Log.TelemetryClientFlushStart(); diff --git a/src/Tests/dotnet.Tests/GivenThatDotNetRunsCommands.cs b/src/Tests/dotnet.Tests/GivenThatDotNetRunsCommands.cs index f7115379540a..27289c31db96 100644 --- a/src/Tests/dotnet.Tests/GivenThatDotNetRunsCommands.cs +++ b/src/Tests/dotnet.Tests/GivenThatDotNetRunsCommands.cs @@ -27,7 +27,8 @@ public void UnresolvedPlatformReferencesFailAsExpected() .WithWorkingDirectory(testInstance.Path) .Execute("crash") .Should().Fail() - .And.HaveStdErrContaining(string.Format(LocalizableStrings.NoExecutableFoundMatchingCommand, "dotnet-crash")); + .And.HaveStdErrContaining(LocalizableStrings.NoExecutableFoundMatchingCommandErrorMessage) + .And.HaveStdOutContaining(string.Format(LocalizableStrings.NoExecutableFoundMatchingCommand, "dotnet-crash")); } [Theory] diff --git a/src/Tests/dotnet.Tests/PackagedCommandTests.cs b/src/Tests/dotnet.Tests/PackagedCommandTests.cs index 96f4539b6915..771cad76eca0 100644 --- a/src/Tests/dotnet.Tests/PackagedCommandTests.cs +++ b/src/Tests/dotnet.Tests/PackagedCommandTests.cs @@ -157,7 +157,9 @@ public void ItShowsErrorWhenToolIsNotRestored() .WithWorkingDirectory(testInstance.Path) .Execute("nonexistingtool") .Should().Fail() - .And.HaveStdErrContaining(string.Format(LocalizableStrings.NoExecutableFoundMatchingCommand, "dotnet-nonexistingtool")); + .And.HaveStdErrContaining(LocalizableStrings.NoExecutableFoundMatchingCommandErrorMessage) + .And.HaveStdOutContaining( + string.Format(LocalizableStrings.NoExecutableFoundMatchingCommand, "dotnet-nonexistingtool")); } [Fact] @@ -234,9 +236,10 @@ public void TestProjectDependencyIsNotAvailableThroughDriver() .WithWorkingDirectory(testInstance.Path) .Execute(); - result.StdErr.Should().Contain(string.Format(LocalizableStrings.NoExecutableFoundMatchingCommand, "dotnet-hello")); - - result.Should().Fail(); + result.StdErr.Should().Contain(LocalizableStrings.NoExecutableFoundMatchingCommandErrorMessage); + result.StdOut.Should().Contain(string.Format(LocalizableStrings.NoExecutableFoundMatchingCommand, "dotnet-hello")); + + result.Should().Fail(); } private void SetGeneratedPackageName(FileInfo project, string packageName) From 0a956713c40f1057e99a1142b79288bd16fc7aee Mon Sep 17 00:00:00 2001 From: Mark Li Date: Thu, 26 Oct 2023 16:45:43 -0700 Subject: [PATCH 210/550] --verbosity quiet suppress success message --- .../ToolInstallGlobalOrToolPathCommand.cs | 7 ++++-- .../ToolUpdateGlobalOrToolPathCommand.cs | 6 +++-- ...ToolInstallGlobalOrToolPathCommandTests.cs | 23 +++++++++++++++++++ 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs index a9cbfe8d1a63..d94519d9e53c 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs @@ -169,13 +169,16 @@ public override int Execute() { _environmentPathInstruction.PrintAddPathInstructionIfPathDoesNotExist(); } - - _reporter.WriteLine( + if (!_verbosity.IsQuiet()) + { + _reporter.WriteLine( string.Format( LocalizableStrings.InstallationSucceeded, string.Join(", ", package.Commands.Select(c => c.Name)), package.Id, package.Version.ToNormalizedString()).Green()); + } + return 0; } catch (Exception ex) when (InstallToolCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex)) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs index 86a737cb6693..6353dd48ab25 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs @@ -120,8 +120,10 @@ public override int Execute() { shellShimRepository.CreateShim(command.Executable, command.Name, newInstalledPackage.PackagedShims); } - - PrintSuccessMessage(oldPackageNullable, newInstalledPackage); + if (!_verbosity.IsQuiet()) + { + PrintSuccessMessage(oldPackageNullable, newInstalledPackage); + } }); scope.Complete(); diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs index c432e84c8f04..f64a5b84e6e5 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs @@ -282,6 +282,29 @@ public void WhenRunWithPackageIdItShouldShowSuccessMessage() PackageVersion).Green()); } + [Fact] + public void WhenRunWithPackageIdWithQuietItShouldShowSuccessMessage() + { + var parseResultQuiet = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --verbosity quiet"); + var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( + parseResultQuiet, + _createToolPackageStoresAndDownloader, + _createShellShimRepository, + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), + _reporter); + + toolInstallGlobalOrToolPathCommand.Execute().Should().Be(0); + + _reporter + .Lines + .Should() + .NotContain(string.Format( + LocalizableStrings.InstallationSucceeded, + ToolCommandName, + PackageId, + PackageVersion).Green()); + } + [Fact] public void WhenRunWithInvalidVersionItShouldThrow() { From a137c83a081cf7200136095b5824bc2f48e91d4f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 12 Oct 2023 16:06:57 -0700 Subject: [PATCH 211/550] Reduce test timeout to speed up timeouts. This will affect ~.2% of test work items --- src/Tests/UnitTests.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/UnitTests.proj b/src/Tests/UnitTests.proj index 1fe198defc1e..ecddb9d282f6 100644 --- a/src/Tests/UnitTests.proj +++ b/src/Tests/UnitTests.proj @@ -8,7 +8,7 @@ true - 00:45:00 + 45:00 From 1da4ab21d9e221f8b71e356d71d6ed5b664c7832 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Fri, 13 Oct 2023 12:40:50 -0500 Subject: [PATCH 212/550] Update src/Tests/UnitTests.proj --- src/Tests/UnitTests.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/UnitTests.proj b/src/Tests/UnitTests.proj index ecddb9d282f6..1fe198defc1e 100644 --- a/src/Tests/UnitTests.proj +++ b/src/Tests/UnitTests.proj @@ -8,7 +8,7 @@ true - 45:00 + 00:45:00 From 125ece542c02d6c26d3f3e12a350c3dc658738f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Oct 2023 21:43:45 +0000 Subject: [PATCH 213/550] Update dependencies from https://github.com/dotnet/windowsdesktop build 20231024.9 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.0-rtm.23524.7 -> To Version 8.0.0 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 2cb284d2298a..7414cd6a13fb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,7 @@ + From ab89e3280274a16053e3f0fd8831d46886fd124d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 25 Oct 2023 18:56:49 +0000 Subject: [PATCH 214/550] [release/8.0.1xx] Update dependencies from dotnet/windowsdesktop (#36467) [release/8.0.1xx] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 8.0.0-rtm.23524.4 to 8.0.0-rtm.23524.6 (parent: Microsoft.WindowsDesktop.App.Ref) --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 7414cd6a13fb..2cb284d2298a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,7 +23,6 @@ - From 98b283c840f967e34178f370428df2b60dc49817 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Nov 2023 13:42:36 +0000 Subject: [PATCH 215/550] Update dependencies from https://github.com/dotnet/roslyn build 20231106.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23556.1 -> To Version 4.9.0-2.23556.4 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4745ae511480..e64912ed328d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - a5724a2fb9b94323923f9a9f5d6bfb345d49490d + 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 - + https://github.com/dotnet/roslyn - a5724a2fb9b94323923f9a9f5d6bfb345d49490d + 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 - + https://github.com/dotnet/roslyn - a5724a2fb9b94323923f9a9f5d6bfb345d49490d + 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 - + https://github.com/dotnet/roslyn - a5724a2fb9b94323923f9a9f5d6bfb345d49490d + 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 - + https://github.com/dotnet/roslyn - a5724a2fb9b94323923f9a9f5d6bfb345d49490d + 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 - + https://github.com/dotnet/roslyn - a5724a2fb9b94323923f9a9f5d6bfb345d49490d + 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 - + https://github.com/dotnet/roslyn - a5724a2fb9b94323923f9a9f5d6bfb345d49490d + 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5b6f2d2fbb9a..fad38f8053d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23556.1 - 4.9.0-2.23556.1 - 4.9.0-2.23556.1 - 4.9.0-2.23556.1 - 4.9.0-2.23556.1 - 4.9.0-2.23556.1 - 4.9.0-2.23556.1 + 4.9.0-2.23556.4 + 4.9.0-2.23556.4 + 4.9.0-2.23556.4 + 4.9.0-2.23556.4 + 4.9.0-2.23556.4 + 4.9.0-2.23556.4 + 4.9.0-2.23556.4 $(MicrosoftNetCompilersToolsetPackageVersion) From 1f63195f58924e4bf60ce69ce69f0e84f89cdca7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Nov 2023 13:42:58 +0000 Subject: [PATCH 216/550] Update dependencies from https://github.com/microsoft/vstest build 20231106.2 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23555-01 -> To Version 17.9.0-preview-23556-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4745ae511480..83140c966a5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client b10ba996eeb40da639273848408d2628e01076f4 - + https://github.com/microsoft/vstest - b634ac7c414f0a1581fdf288b26ac0013bc6371d + 29edc28aacd3cffbe1df086bb4111d44cc95aeb1 - + https://github.com/microsoft/vstest - b634ac7c414f0a1581fdf288b26ac0013bc6371d + 29edc28aacd3cffbe1df086bb4111d44cc95aeb1 - + https://github.com/microsoft/vstest - b634ac7c414f0a1581fdf288b26ac0013bc6371d + 29edc28aacd3cffbe1df086bb4111d44cc95aeb1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5b6f2d2fbb9a..31310e0d7e41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23555-01 - 17.9.0-preview-23555-01 - 17.9.0-preview-23555-01 + 17.9.0-preview-23556-02 + 17.9.0-preview-23556-02 + 17.9.0-preview-23556-02 From df824f6759b94951e4fab0d5274c136a759d0494 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Nov 2023 13:43:09 +0000 Subject: [PATCH 217/550] Update dependencies from https://github.com/dotnet/razor build 20231106.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23554.3 -> To Version 7.0.0-preview.23556.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4745ae511480..9037309bb26b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 045986af348c73f5d7906f79da5d88372ff0efa4 + 29c73b8df5d8410d74a9b86c088e45dc1fcfa051 - + https://github.com/dotnet/razor - 045986af348c73f5d7906f79da5d88372ff0efa4 + 29c73b8df5d8410d74a9b86c088e45dc1fcfa051 - + https://github.com/dotnet/razor - 045986af348c73f5d7906f79da5d88372ff0efa4 + 29c73b8df5d8410d74a9b86c088e45dc1fcfa051 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5b6f2d2fbb9a..dd5f734981a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23554.3 - 7.0.0-preview.23554.3 - 7.0.0-preview.23554.3 + 7.0.0-preview.23556.6 + 7.0.0-preview.23556.6 + 7.0.0-preview.23556.6 From 677596ae199006a23dcded5bcc8efaeb6d04cd04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 16:58:56 +0000 Subject: [PATCH 218/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#36685) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4745ae511480..a4421ee4ee69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 31c4d335325e858a3c4dba66d921d0e31bdee5ff + 5d1509792899a9ac25f59b8b0034dd98989a30b1 - + https://github.com/dotnet/msbuild - 31c4d335325e858a3c4dba66d921d0e31bdee5ff + 5d1509792899a9ac25f59b8b0034dd98989a30b1 - + https://github.com/dotnet/msbuild - 31c4d335325e858a3c4dba66d921d0e31bdee5ff + 5d1509792899a9ac25f59b8b0034dd98989a30b1 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5b6f2d2fbb9a..29ded6ff9ef9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23551-06 + 17.9.0-preview-23557-02 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23553.1 + 12.8.0-beta.23556.4 From d7329c901b238b4fb7174cf7e446f1b13abc9e77 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Tue, 7 Nov 2023 13:47:10 -0600 Subject: [PATCH 220/550] bump ValleySoft.DockerCredsProvider to git a bugfix for handling schemes --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index eb74dea8e7f6..da5096982740 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -102,9 +102,9 @@ - + - \ No newline at end of file + From 6c74ad6e3c814f32538e9fd2ccfece683bf6bfbb Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Tue, 7 Nov 2023 13:44:02 -0800 Subject: [PATCH 221/550] Format the output error message for versions and packageId --- .../NuGetPackageDownloader.cs | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs index ca69f1254009..4246d3119333 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs @@ -1,11 +1,13 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Text.RegularExpressions; using System.Threading; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.Tools; using Microsoft.Extensions.EnvironmentAbstractions; +using Microsoft.TemplateEngine.Abstractions; using NuGet.Common; using NuGet.Configuration; using NuGet.Credentials; @@ -162,7 +164,7 @@ public async Task GetPackageUrl(PackageId packageId, bool includePreview = false) { (var source, var resolvedPackageVersion) = await GetPackageSourceAndVersion(packageId, packageVersion, packageSourceLocation, includePreview).ConfigureAwait(false); - + SourceRepository repository = GetSourceRepository(source); if (repository.PackageSource.IsLocal) { @@ -450,14 +452,37 @@ await Task.WhenAll( throw new NuGetPackageNotFoundException( string.Format( LocalizableStrings.IsNotFoundInNuGetFeeds, - $"{packageIdentifier} of version range {versionRange}", + GenerateVersionRangeErrorDescription(packageIdentifier, versionRange), string.Join(", ", packageSources.Select(source => source.Source)))); } } - private async Task<(PackageSource, IPackageSearchMetadata)> GetLatestVersionInternalAsync( - string packageIdentifier, IEnumerable packageSources, bool includePreview, - CancellationToken cancellationToken) + private string GenerateVersionRangeErrorDescription(string packageIdentifier, VersionRange versionRange) + { + if(versionRange.HasLowerAndUpperBounds && versionRange.MinVersion == versionRange.MaxVersion) + { + return $"Version {versionRange.MinVersion} of package {packageIdentifier}"; + } + else if(versionRange.HasLowerAndUpperBounds) + { + return $"A version between {versionRange.MinVersion} and {versionRange.MaxVersion} of package {packageIdentifier}"; + } + else if(versionRange.HasLowerBound) + { + return $"A version higher than {versionRange.MinVersion} of package {packageIdentifier}"; + } + else if(versionRange.HasUpperBound) + { + return $"A version less than {versionRange.MaxVersion} of package {packageIdentifier}"; + } + + // Default message if the format doesn't match any of the expected cases + return $"A version of {versionRange} of package {packageIdentifier}"; + } + + private async Task<(PackageSource, IPackageSearchMetadata)> GetLatestVersionInternalAsync( + string packageIdentifier, IEnumerable packageSources, bool includePreview, + CancellationToken cancellationToken) { if (packageSources == null) { @@ -498,7 +523,7 @@ await Task.WhenAll( .SelectMany(result => result.foundPackages.Select(package => (result.source, package))); if (!accumulativeSearchResults.Any()) - { + { throw new NuGetPackageNotFoundException( string.Format( LocalizableStrings.IsNotFoundInNuGetFeeds, @@ -526,7 +551,7 @@ public async Task GetBestPackageVersionAsync(PackageId packageId, VersionRange versionRange, PackageSourceLocation packageSourceLocation = null) { - if(versionRange.MinVersion != null && versionRange.MaxVersion != null && versionRange.MinVersion == versionRange.MaxVersion) + if (versionRange.MinVersion != null && versionRange.MaxVersion != null && versionRange.MinVersion == versionRange.MaxVersion) { return versionRange.MinVersion; } @@ -623,7 +648,8 @@ bool TryGetPackageMetadata( } throw new NuGetPackageNotFoundException(string.Format(LocalizableStrings.IsNotFoundInNuGetFeeds, - $"{packageIdentifier}::{packageVersion}", string.Join(";", sources.Select(s => s.Source)))); + GenerateVersionRangeErrorDescription(packageIdentifier, new VersionRange(minVersion: packageVersion, maxVersion: packageVersion, includeMaxVersion: true)), + string.Join(";", sources.Select(s => s.Source)))); } private async Task<(PackageSource source, IEnumerable foundPackages)> From 774234d0c37a101d9b55a97a142eb87cf897e467 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Tue, 7 Nov 2023 14:17:37 -0800 Subject: [PATCH 222/550] add situation with no version specified --- .../dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs index 4246d3119333..67645e318a16 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs @@ -459,7 +459,11 @@ await Task.WhenAll( private string GenerateVersionRangeErrorDescription(string packageIdentifier, VersionRange versionRange) { - if(versionRange.HasLowerAndUpperBounds && versionRange.MinVersion == versionRange.MaxVersion) + if (!string.IsNullOrEmpty(versionRange.OriginalString) && versionRange.OriginalString == "*") + { + return $"{packageIdentifier}"; + } + else if(versionRange.HasLowerAndUpperBounds && versionRange.MinVersion == versionRange.MaxVersion) { return $"Version {versionRange.MinVersion} of package {packageIdentifier}"; } From f52c7cf0aebe7384259c1a778619201bc29a7e6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 22:30:54 +0000 Subject: [PATCH 223/550] [release/8.0.2xx] Update dependencies from dotnet/source-build-reference-packages (#36686) [release/8.0.2xx] Update dependencies from dotnet/source-build-reference-packages --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5fa45e7855d..9c6ffb32ac94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,9 +338,9 @@ 3dc05150cf234f76f6936dcb2853d31a0da1f60e - + https://github.com/dotnet/source-build-reference-packages - b4fa7f2e1e65ef49881be2ab2df27624280a8c55 + fa4c0e8f53ef2541a23e519af4dfb86cb88e1bae From 34bd0386f79d78b59c71dcf65ede06d7610e6de5 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Tue, 7 Nov 2023 15:03:56 -0800 Subject: [PATCH 224/550] Update the version error message to LocalizableStrings --- .../LocalizableStrings.resx | 15 +++++++++++ .../NuGetPackageDownloader.cs | 22 +++++++++------- .../xlf/LocalizableStrings.cs.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.de.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.es.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.fr.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.it.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.ja.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.ko.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.pl.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.pt-BR.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.ru.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.tr.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.zh-Hans.xlf | 25 +++++++++++++++++++ .../xlf/LocalizableStrings.zh-Hant.xlf | 25 +++++++++++++++++++ 15 files changed, 353 insertions(+), 9 deletions(-) diff --git a/src/Cli/dotnet/NugetPackageDownloader/LocalizableStrings.resx b/src/Cli/dotnet/NugetPackageDownloader/LocalizableStrings.resx index bfb61a0a4c16..cb0ad6727fe8 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/LocalizableStrings.resx +++ b/src/Cli/dotnet/NugetPackageDownloader/LocalizableStrings.resx @@ -144,4 +144,19 @@ Package Source Mapping is enabled, but no source mapped under the specified package ID: {0}. See the documentation for Package Source Mapping at https://aka.ms/nuget-package-source-mapping for more details. + + A version of {0} of package {1} + + + Version {0} of package {1} + + + A version between {0} and {1} of package {2} + + + A version higher than {0} of package {1} + + + A version less than {0} of package {1} + \ No newline at end of file diff --git a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs index 67645e318a16..933f561d985c 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs @@ -463,25 +463,29 @@ private string GenerateVersionRangeErrorDescription(string packageIdentifier, Ve { return $"{packageIdentifier}"; } - else if(versionRange.HasLowerAndUpperBounds && versionRange.MinVersion == versionRange.MaxVersion) + else if (versionRange.HasLowerAndUpperBounds && versionRange.MinVersion == versionRange.MaxVersion) { - return $"Version {versionRange.MinVersion} of package {packageIdentifier}"; + return string.Format(LocalizableStrings.PackageVersionDescriptionForExactVersionMatch, + versionRange.MinVersion, packageIdentifier); } - else if(versionRange.HasLowerAndUpperBounds) + else if (versionRange.HasLowerAndUpperBounds) { - return $"A version between {versionRange.MinVersion} and {versionRange.MaxVersion} of package {packageIdentifier}"; + return string.Format(LocalizableStrings.PackageVersionDescriptionForVersionWithLowerAndUpperBounds, + versionRange.MinVersion, versionRange.MaxVersion, packageIdentifier); } - else if(versionRange.HasLowerBound) + else if (versionRange.HasLowerBound) { - return $"A version higher than {versionRange.MinVersion} of package {packageIdentifier}"; + return string.Format(LocalizableStrings.PackageVersionDescriptionForVersionWithLowerBound, + versionRange.MinVersion, packageIdentifier); } - else if(versionRange.HasUpperBound) + else if (versionRange.HasUpperBound) { - return $"A version less than {versionRange.MaxVersion} of package {packageIdentifier}"; + return string.Format(LocalizableStrings.PackageVersionDescriptionForVersionWithUpperBound, + versionRange.MaxVersion, packageIdentifier); } // Default message if the format doesn't match any of the expected cases - return $"A version of {versionRange} of package {packageIdentifier}"; + return string.Format(LocalizableStrings.PackageVersionDescriptionDefault, versionRange, packageIdentifier); } private async Task<(PackageSource, IPackageSearchMetadata)> GetLatestVersionInternalAsync( diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf index 911fd33da0d3..2e8af2b8ad5e 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf @@ -42,6 +42,31 @@ Přeskakuje se ověření podpisu balíčku NuGet. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . Přeskočit ověřování podepisování balíčku NuGet. Ověřování podepisování balíčku NuGet není k dispozici na Linuxu nebo v macOS https://aka.ms/workloadskippackagevalidation. diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf index 59eb4441ee9b..cb86d557645f 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf @@ -42,6 +42,31 @@ Die Überprüfung der NuGet-Paketsignatur wird übersprungen. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . Überprüfung der NuGet-Paketsignierung überspringen. Die Überprüfung der NuGet-Signierung ist auf Linux- oder macOS nicht verfügbar https://aka.ms/workloadskippackagevalidation. diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf index 92ffef1b484e..988c0c10df1d 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf @@ -42,6 +42,31 @@ Omitiendo la comprobación de la firma del paquete NuGet. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . Omitir la validación de firma del paquete NuGet. La validación de firma de NuGet no está disponible en Linux o macOS https://aka.ms/workloadskippackagevalidation. diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf index 3dd83630d84a..3b01bf4ea241 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf @@ -42,6 +42,31 @@ La vérification de la signature du package NuGet est ignorée. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . Ignorer la validation de signature de package NuGet. La validation de signature NuGet n’est pas disponible sur Linux ou macOS https://aka.ms/workloadskippackagevalidation. diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf index e62cebfc5365..bd72fe8fe667 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf @@ -42,6 +42,31 @@ La verifica della firma del pacchetto NuGet verrà ignorata. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . Ignorare la convalida della firma del pacchetto NuGet. La convalida della firma NuGet non è disponibile in Linux o macOS https://aka.ms/workloadskippackagevalidation. diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf index 2f19c3d49013..941d9b1a38dd 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf @@ -42,6 +42,31 @@ NuGet パッケージ署名の認証をスキップしています。 + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . NuGet パッケージ署名の検証をスキップします。NuGet 署名の検証は、Linux または macOS https://aka.ms/workloadskippackagevalidation では使用できません。 diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf index 7510fae557a0..53cc7fcedd3b 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf @@ -42,6 +42,31 @@ NuGet 패키지 서명 확인을 건너뛰는 중입니다. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . NuGet 패키지 서명 유효성 검사를 건너뜁니다. NuGet 서명 유효성 검사는 Linux 또는 macOS https://aka.ms/workloadskippackagevalidation에서 사용할 수 없습니다. diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf index 6dc11d30cf84..265594ace17a 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf @@ -42,6 +42,31 @@ Pomijanie weryfikacji podpisu pakietu NuGet. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . Pomiń weryfikację podpisywania pakietu NuGet. Sprawdzanie podpisywania NuGet nie jest dostępne w systemie Linux ani MacOS https://aka.ms/workloadskippackagevalidation . diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf index 4cd6fd064461..bdf52cff6539 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf @@ -42,6 +42,31 @@ Ignorando a verificação de assinatura do pacote NuGet. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . Ignorar a validação da assinatura do pacote NuGet. A validação da assinatura do NuGet não está disponível no Linux ou macOS https://aka.ms/workloadskippackagevalidation . diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ru.xlf index 7a8e0b3d4166..e98cc0dea007 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ru.xlf @@ -42,6 +42,31 @@ Пропуск проверки подписи пакета NuGet. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . Пропустить проверку подписи пакета NuGet. Проверка подписи NuGet недоступна в Linux или macOS https://aka.ms/workloadskippackagevalidation. diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.tr.xlf index 449b304962f6..3457d635381d 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.tr.xlf @@ -42,6 +42,31 @@ NuGet paket imzası doğrulaması atlanıyor. + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . NuGet paketi imza doğrulamasını atlayın. NuGet imza doğrulaması Linux veya macOS üzerinde kullanılamıyor. Daha fazla bilgi için bkz. https://aka.ms/workloadskippackagevalidation. diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hans.xlf index d8fa4715311c..0311c2b4a5b2 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hans.xlf @@ -42,6 +42,31 @@ 正在跳过 NuGet 包签名验证。 + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . 跳过 NuGet 包签名验证。Linux 或 macOS 上不提供 NuGet 签名验证。https://aka.ms/workloadskippackagevalidation。 diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hant.xlf index ddafb653bcaf..f2ff0d69ff8c 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hant.xlf @@ -42,6 +42,31 @@ 正在略過 NuGet 套件簽章驗證。 + + A version of {0} of package {1} + A version of {0} of package {1} + + + + Version {0} of package {1} + Version {0} of package {1} + + + + A version between {0} and {1} of package {2} + A version between {0} and {1} of package {2} + + + + A version higher than {0} of package {1} + A version higher than {0} of package {1} + + + + A version less than {0} of package {1} + A version less than {0} of package {1} + + Skip NuGet package signing validation. NuGet signing validation is not available on Linux or macOS https://aka.ms/workloadskippackagevalidation . 略過 NuGet 套件簽署驗證。NuGet 套件簽署驗證在 Linux 或 macOS 上無法使用 https://aka.ms/workloadskippackagevalidation。 From 88c129e8115e69a2e4b9ba4b7c9792fc1c744927 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Nov 2023 13:43:33 +0000 Subject: [PATCH 225/550] Update dependencies from https://github.com/dotnet/arcade build 20231106.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23525.4 -> To Version 8.0.0-beta.23556.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c6ffb32ac94..d5877240c7dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -411,22 +411,22 @@ - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c324631b7da2..30156ada72fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.23525.4 + 8.0.0-beta.23556.5 7.0.0-preview.22423.2 8.0.0-rtm.23520.16 4.3.0 @@ -192,7 +192,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.23525.4 + 8.0.0-beta.23556.5 4.18.4 1.3.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index f37dc7f21633..061310eee146 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23525.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23525.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23556.5" } } From 830fc684b5ce4d9d2bf366d277e2b99027665e96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Nov 2023 13:44:34 +0000 Subject: [PATCH 226/550] Update dependencies from https://github.com/dotnet/roslyn build 20231108.2 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23556.4 -> To Version 4.9.0-2.23558.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c6ffb32ac94..2ce080628254 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 + 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d - + https://github.com/dotnet/roslyn - 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 + 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d - + https://github.com/dotnet/roslyn - 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 + 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d - + https://github.com/dotnet/roslyn - 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 + 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d - + https://github.com/dotnet/roslyn - 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 + 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d - + https://github.com/dotnet/roslyn - 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 + 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d - + https://github.com/dotnet/roslyn - 2b3426c46bf53bf6ba916df87b1279c7e986d3e0 + 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c324631b7da2..aa76f6da528d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23556.4 - 4.9.0-2.23556.4 - 4.9.0-2.23556.4 - 4.9.0-2.23556.4 - 4.9.0-2.23556.4 - 4.9.0-2.23556.4 - 4.9.0-2.23556.4 + 4.9.0-2.23558.2 + 4.9.0-2.23558.2 + 4.9.0-2.23558.2 + 4.9.0-2.23558.2 + 4.9.0-2.23558.2 + 4.9.0-2.23558.2 + 4.9.0-2.23558.2 $(MicrosoftNetCompilersToolsetPackageVersion) From d181c75aa99e1ed9a2a40242c2cf8ae2bb888165 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Nov 2023 13:44:56 +0000 Subject: [PATCH 227/550] Update dependencies from https://github.com/microsoft/vstest build 20231107.3 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23556-02 -> To Version 17.9.0-preview-23557-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c6ffb32ac94..de63e2e57b9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client b10ba996eeb40da639273848408d2628e01076f4 - + https://github.com/microsoft/vstest - 29edc28aacd3cffbe1df086bb4111d44cc95aeb1 + 9dce952ad80d9ff2e9979cd3924b58306c3d91ae - + https://github.com/microsoft/vstest - 29edc28aacd3cffbe1df086bb4111d44cc95aeb1 + 9dce952ad80d9ff2e9979cd3924b58306c3d91ae - + https://github.com/microsoft/vstest - 29edc28aacd3cffbe1df086bb4111d44cc95aeb1 + 9dce952ad80d9ff2e9979cd3924b58306c3d91ae https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c324631b7da2..7f7af941ab7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23556-02 - 17.9.0-preview-23556-02 - 17.9.0-preview-23556-02 + 17.9.0-preview-23557-03 + 17.9.0-preview-23557-03 + 17.9.0-preview-23557-03 From 8553ad52bb3f195fe0505835b54d81e106bec712 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Nov 2023 13:45:06 +0000 Subject: [PATCH 228/550] Update dependencies from https://github.com/dotnet/razor build 20231107.4 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23556.6 -> To Version 7.0.0-preview.23557.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c6ffb32ac94..b57e82c8c534 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 29c73b8df5d8410d74a9b86c088e45dc1fcfa051 + a3c3d1768ddb716e3186df4c6c87a9958ace1ede - + https://github.com/dotnet/razor - 29c73b8df5d8410d74a9b86c088e45dc1fcfa051 + a3c3d1768ddb716e3186df4c6c87a9958ace1ede - + https://github.com/dotnet/razor - 29c73b8df5d8410d74a9b86c088e45dc1fcfa051 + a3c3d1768ddb716e3186df4c6c87a9958ace1ede https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c324631b7da2..7587ed1c267f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23556.6 - 7.0.0-preview.23556.6 - 7.0.0-preview.23556.6 + 7.0.0-preview.23557.4 + 7.0.0-preview.23557.4 + 7.0.0-preview.23557.4 From ad3a59da79765fd774a7822912d21e434f40f66f Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 7 Nov 2023 00:36:36 -0800 Subject: [PATCH 229/550] Fix install state ACL --- .../Windows/InstallMessageDispatcher.cs | 30 ++++++++ .../Windows/InstallRequestMessage.cs | 19 +++++ .../Installer/Windows/InstallRequestType.cs | 12 ++- .../Installer/Windows/LocalizableStrings.resx | 3 + .../Installer/Windows/MsiPackageCache.cs | 27 ++++--- .../Windows/xlf/LocalizableStrings.cs.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.de.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.es.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.fr.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.it.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.ja.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.ko.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.pl.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.pt-BR.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.ru.xlf | 5 ++ .../Windows/xlf/LocalizableStrings.tr.xlf | 5 ++ .../xlf/LocalizableStrings.zh-Hans.xlf | 5 ++ .../xlf/LocalizableStrings.zh-Hant.xlf | 5 ++ .../commands/InstallingWorkloadCommand.cs | 28 +++---- .../install/FileBasedInstaller.cs | 15 +++- .../dotnet-workload/install/IInstaller.cs | 13 ++++ .../install/MsiInstallerBase.cs | 75 +++++++++++++++++++ .../install/NetSdkMsiInstallerClient.cs | 6 ++ .../install/NetSdkMsiInstallerServer.cs | 10 +++ .../install/WorkloadInstallCommand.cs | 2 +- .../update/WorkloadUpdateCommand.cs | 9 ++- src/Tests/SDDLTests/Program.cs | 41 ++++++++++ .../MockPackWorkloadInstaller.cs | 14 ++++ 28 files changed, 338 insertions(+), 31 deletions(-) diff --git a/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs b/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs index 8ca9141a9343..930983942ade 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs @@ -146,5 +146,35 @@ public InstallResponseMessage SendWorkloadRecordRequest(InstallRequestType reque SdkFeatureBand = sdkFeatureBand.ToString(), }); } + + /// + /// Send an to delete the install state file. + /// + /// The path of the install state file to delete. + /// + public InstallResponseMessage SendRemoveInstallStateFileRequest(string path) + { + return Send(new InstallRequestMessage + { + RequestType = InstallRequestType.RemoveInstallStateFile, + InstallStateFile = path + }); + } + + /// + /// Sends an to write the install state file. + /// + /// the path of the install state file to write. + /// A multi-line string containing the formatted JSON data to write. + /// + public InstallResponseMessage SendWriteInstallStateFileRequest(string path, IEnumerable jsonLines) + { + return Send(new InstallRequestMessage + { + RequestType = InstallRequestType.WriteInstallStateFile, + InstallStateFile = path, + InstallStateContents = jsonLines.ToArray() + }); + } } } diff --git a/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs b/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs index 712534d0b666..97b844d43fed 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs @@ -29,6 +29,25 @@ public string ManifestPath set; } + /// + /// The contents of the install state file. Each element corresponds to a single line of + /// the JSON file to be written. + /// + public string[] InstallStateContents + { + get; + set; + } + + /// + /// The path of the install state file. + /// + public string InstallStateFile + { + get; + set; + } + /// /// The path of the MSI log file to generate when installing, uninstalling or repairing a specific MSI. /// diff --git a/src/Cli/dotnet/Installer/Windows/InstallRequestType.cs b/src/Cli/dotnet/Installer/Windows/InstallRequestType.cs index 7bb46285b29a..b2847abb8479 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallRequestType.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallRequestType.cs @@ -53,6 +53,16 @@ public enum InstallRequestType /// /// Remove a workload installation record. /// - DeleteWorkloadInstallationRecord + DeleteWorkloadInstallationRecord, + + /// + /// Creates an install state file. + /// + WriteInstallStateFile, + + /// + /// Removes an install state file. + /// + RemoveInstallStateFile, } } diff --git a/src/Cli/dotnet/Installer/Windows/LocalizableStrings.resx b/src/Cli/dotnet/Installer/Windows/LocalizableStrings.resx index da4ab122f64b..c7e0c81cd4d0 100644 --- a/src/Cli/dotnet/Installer/Windows/LocalizableStrings.resx +++ b/src/Cli/dotnet/Installer/Windows/LocalizableStrings.resx @@ -120,4 +120,7 @@ AuthentiCode signature for {0} does not belong to a trusted organization. + + Invalid install state file: {0} + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs b/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs index 3e8b81d794e9..d857e93b89e3 100644 --- a/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs +++ b/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs @@ -173,18 +173,27 @@ public static void MoveAndSecureFile(string sourceFile, string destinationFile, }); log?.LogMessage($"Moved '{sourceFile}' to '{destinationFile}'"); - FileInfo fi = new(destinationFile); - FileSecurity fs = new(); - - // Set the owner and group to built-in administrators (BA). All other ACE values are inherited from - // the parent directory. See https://github.com/dotnet/sdk/issues/28450. If the directory's descriptor - // is correctly configured, we should end up with an inherited ACE for Everyone: (A;ID;0x1200a9;;;WD) - fs.SetOwner(s_AdministratorsSid); - fs.SetGroup(s_AdministratorsSid); - fi.SetAccessControl(fs); + SecureFile(destinationFile); } } + /// + /// Secures a file by setting the owner and group to built-in administrators (BA). All other ACE values are inherited from + /// the parent directory. + /// + /// The path of the file to secure. + public static void SecureFile(string path) + { + FileInfo fi = new(path); + FileSecurity fs = new(); + + // See https://github.com/dotnet/sdk/issues/28450. If the directory's descriptor + // is correctly configured, we should end up with an inherited ACE for Everyone: (A;ID;0x1200a9;;;WD) + fs.SetOwner(s_AdministratorsSid); + fs.SetGroup(s_AdministratorsSid); + fi.SetAccessControl(fs); + } + /// /// Determines if the workload pack MSI is cached and tries to retrieve its payload from the cache. /// diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf index 100b70e341ea..d3adde1d63d0 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf @@ -7,6 +7,11 @@ Podpis AuthentiCode pro {0} nepatří důvěryhodné organizaci. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf index a358d63a5369..962275885a37 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf @@ -7,6 +7,11 @@ Die AuthentiCode-Signatur für {0} gehört nicht zu einer vertrauenswürdigen Organisation. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf index 49c6a6af789f..c757563ea95f 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf @@ -7,6 +7,11 @@ La firma AuthentiCode para {0} no pertenece a una organización de confianza. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf index 52c9042f7e63..f028ac77e575 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf @@ -7,6 +7,11 @@ La signature AuthentiCode pour {0} n’appartient pas à une organisation approuvée. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf index 6caedf570426..97b5625d6f02 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf @@ -7,6 +7,11 @@ La firma AuthentiCode per {0} non appartiene a un'organizzazione attendibile. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf index 3d2140ab9b43..bcddd9568aa6 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf @@ -7,6 +7,11 @@ {0} の AuthentiCode 署名は、信頼されている組織に属していません。 + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf index 5504670c80dc..96ef4ebef436 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf @@ -7,6 +7,11 @@ {0}에 대한 AuthentiCode 서명이 신뢰할 수 있는 조직에 속해 있지 않습니다. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf index a89b7b61b7f9..818e21fe65a0 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf @@ -7,6 +7,11 @@ Podpis AuthentiCode dla {0} nie należy do zaufanej organizacji. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf index b9c9f365b741..101ce4c94bcd 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf @@ -7,6 +7,11 @@ A assinatura AuthentiCode para {0} não pertence a uma organização confiável. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf index 4e7c7f1c3591..e4cba58629d1 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf @@ -7,6 +7,11 @@ Подпись AuthentiCode для {0} не принадлежит доверенной организации. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf index e61cd713ac68..35194ef8c72c 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf @@ -7,6 +7,11 @@ {0} için AuthentiCode imzası güvenilir bir kuruluşa ait değil. + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf index ba5dcba91dd5..84291d5b47bf 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf @@ -7,6 +7,11 @@ {0} 的 AuthentiCode 签名不属于受信任的组织。 + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf index e5793719fa5d..6e850ef371a9 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf @@ -7,6 +7,11 @@ {0} 的 AuthentiCode 簽章不屬於信任的組織。 + + Invalid install state file: {0} + Invalid install state file: {0} + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs index 0d87f4f82e00..db349324e473 100644 --- a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs +++ b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs @@ -39,6 +39,11 @@ internal abstract class InstallingWorkloadCommand : WorkloadCommandBase protected IInstaller _workloadInstaller; protected IWorkloadManifestUpdater _workloadManifestUpdater; + /// + /// The path of the default.json file tracking the install state for the current SDK. + /// + protected readonly string _defaultJsonPath; + public InstallingWorkloadCommand( ParseResult parseResult, IReporter reporter, @@ -86,27 +91,14 @@ public InstallingWorkloadCommand( _workloadInstallerFromConstructor = workloadInstaller; _workloadManifestUpdaterFromConstructor = workloadManifestUpdater; + + _defaultJsonPath = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetPath), "default.json"); } - protected internal void UpdateInstallState(bool createDefaultJson, IEnumerable manifestVersionUpdates) - { - var defaultJsonPath = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetPath), "default.json"); - if (createDefaultJson) - { - var jsonContents = WorkloadSet.FromManifests( + protected IEnumerable GetInstallState(IEnumerable manifestVersionUpdates) => + ToJsonEnumerable(WorkloadSet.FromManifests( manifestVersionUpdates.Select(update => new WorkloadManifestInfo(update.ManifestId.ToString(), update.NewVersion.ToString(), /* We don't actually use the directory here */ string.Empty, update.NewFeatureBand)) - ).ToDictionaryForJson(); - Directory.CreateDirectory(Path.GetDirectoryName(defaultJsonPath)); - File.WriteAllLines(defaultJsonPath, ToJsonEnumerable(jsonContents)); - } - else - { - if (File.Exists(defaultJsonPath)) - { - File.Delete(defaultJsonPath); - } - } - } + ).ToDictionaryForJson()); private IEnumerable ToJsonEnumerable(Dictionary dict) { diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs index 22b073f6aa80..90f0b38cbe9e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs @@ -2,7 +2,6 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Text.Json; -using Microsoft.Deployment.DotNet.Releases; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.Utils; @@ -453,6 +452,20 @@ public void GarbageCollect(Func getResolverForWorkloa } + public void DeleteInstallState(string path) + { + if (File.Exists(path)) + { + File.Delete(path); + } + } + + public void WriteInstallState(string path, IEnumerable jsonLines) + { + Directory.CreateDirectory(Path.GetDirectoryName(path)); + File.WriteAllLines(path, jsonLines); + } + /// /// Remove all workload installation records that aren't from Visual Studio. /// diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs index 9415fa72f1de..1f0cb0d784d1 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs @@ -33,6 +33,19 @@ internal interface IInstaller : IWorkloadManifestInstaller void ReplaceWorkloadResolver(IWorkloadResolver workloadResolver); void Shutdown(); + + /// + /// Delete the install state file at the specified path. + /// + /// The full path of the default.json install state file. + void DeleteInstallState(string path); + + /// + /// Writes the specified JSON contents to the install state file. + /// + /// The full path of the default.json install state file. + /// The JSON contents describing the install state. + void WriteInstallState(string path, IEnumerable jsonLines); } // Interface to pass to workload manifest updater diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs index 59226a33a1f1..9174bb283718 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs @@ -26,6 +26,11 @@ internal abstract class MsiInstallerBase : InstallerBase /// private string _dotNetHome; + /// + /// Full path to the root directory for storing workload data. + /// + public static readonly string WorkloadDataRoot = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "dotnet", "workloads"); + /// /// Default reinstall mode (equivalent to VOMUS). /// @@ -487,5 +492,75 @@ protected void UpdateDependent(InstallRequestType requestType, string providerKe ExitOnFailure(response, $"Failed to update dependent, providerKey: {providerKeyName}, dependent: {dependent}."); } } + + /// + /// Deletes the specified install state file. + /// + /// The path of the install state file to delete. + protected void RemoveInstallStateFile(string path) + { + VerifyInstallStateFile(path); + if (File.Exists(path)) + { + Log?.LogMessage($"Install state file does not exist: {path}"); + return; + } + + Elevate(); + + if (IsElevated) + { + File.Delete(path); + } + else if (IsClient) + { + InstallResponseMessage response = Dispatcher.SendRemoveInstallStateFileRequest(path); + ExitOnFailure(response, $"Failed to remove install state file: {path}"); + } + } + + /// + /// Verify that the specified path points to an install state file. + /// + /// + /// + /// This method is intended to avoid arbitrary file creation and delete operation when executing install state + /// file related operations. + /// + private void VerifyInstallStateFile(string path) + { + if (string.IsNullOrWhiteSpace(path) || + (!path.StartsWith(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData)) && + !path.EndsWith("default.json"))) + { + throw new ArgumentException(string.Format(LocalizableStrings.InvalidInstallStateFile, path)); + } + } + + /// + /// Writes the contents of the install state JSON file. + /// + /// The path of the isntall state file to write. + /// The contents of the JSON file, formatted as a single line. + protected void WriteInstallStateFile(string path, IEnumerable jsonLines) + { + VerifyInstallStateFile(path); + Elevate(); + + if (IsElevated) + { + // Create the parent folder for the state file and set up all required ACLs + MsiPackageCache.CreateSecureDirectory(Path.GetDirectoryName(path)); + + File.WriteAllLines(path, jsonLines); + + MsiPackageCache.SecureFile(path); + } + else if (IsClient) + { + InstallResponseMessage respone = Dispatcher.SendWriteInstallStateFileRequest(path, jsonLines); + ExitOnFailure(respone, $"Failed to write install state file: {path}"); + } + } } } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs index fd97f33ea929..6dea375eceab 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs @@ -182,6 +182,12 @@ public void GarbageCollect(Func getResolverForWorkloa } } + public void DeleteInstallState(string path) => + RemoveInstallStateFile(path); + + public void WriteInstallState(string path, IEnumerable jsonLines) => + WriteInstallStateFile(path, jsonLines); + /// /// Find all the dependents that look like they belong to SDKs. We only care /// about dependents that match the SDK host we're running under. For example, an x86 SDK should not be diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs index 06e55b87c783..30184d9e9c4e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs @@ -93,6 +93,16 @@ public void Run() Dispatcher.ReplySuccess($"Updated dependent '{request.Dependent}' for provider key '{request.ProviderKeyName}'"); break; + case InstallRequestType.WriteInstallStateFile: + WriteInstallStateFile(request.InstallStateFile, request.InstallStateContents); + Dispatcher.ReplySuccess($"Created install state file: {request.InstallStateFile}"); + break; + + case InstallRequestType.RemoveInstallStateFile: + RemoveInstallStateFile(request.InstallStateFile); + Dispatcher.ReplySuccess($"Deleted install state file: {request.InstallStateFile}"); + break; + default: throw new InvalidOperationException($"Unknown message request: {(int)request.RequestType}"); } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index 84666b6ba266..954807e4125f 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -229,7 +229,7 @@ private void InstallWorkloadsWithInstallRecord( if (usingRollback) { - UpdateInstallState(true, manifestsToUpdate); + installer.WriteInstallState(_defaultJsonPath, GetInstallState(manifestsToUpdate)); } }, rollback: () => diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index 691ae4603b09..ecb29930c62e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -156,7 +156,14 @@ private void UpdateWorkloadsWithInstallRecord( _workloadInstaller.InstallWorkloads(workloads, sdkFeatureBand, context, offlineCache); - UpdateInstallState(useRollback, manifestsToUpdate); + if (useRollback) + { + _workloadInstaller.WriteInstallState(_defaultJsonPath, GetInstallState(manifestsToUpdate)); + } + else + { + _workloadInstaller.DeleteInstallState(_defaultJsonPath); + } }, rollback: () => { diff --git a/src/Tests/SDDLTests/Program.cs b/src/Tests/SDDLTests/Program.cs index eed29c834100..bbe034bd3863 100644 --- a/src/Tests/SDDLTests/Program.cs +++ b/src/Tests/SDDLTests/Program.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Diagnostics; +using System.Net.NetworkInformation; using System.Reflection; using System.Runtime.Versioning; using System.Security.AccessControl; @@ -22,6 +23,21 @@ public class SDDLTests /// private static readonly string s_programData = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData); + /// + /// Directory under ProgramData to store the install state file. + /// + private static readonly string s_installStateDirectory = Path.Combine(s_programData, "SDDLTest", "workloads", "8.0.100", "InstallState"); + + /// + /// The filename and extension of the install state file. + /// + private static readonly string s_installStateFile = "default.json"; + + /// + /// The full path of the install state file. + /// + private static readonly string s_installStateFileAssetPath = Path.Combine(s_installStateDirectory, s_installStateFile); + /// /// Directory under the user's %temp% directory where the test asset will be created. /// @@ -230,6 +246,25 @@ private static void VerifyDescriptors() VerifyFileSecurityDescriptor(s_cachedTestAssetPath, "BA", "BA", 4, "A;ID;0x1200a9;;;WD", "A;ID;FA;;;SY", "A;ID;FA;;;BA", "A;ID;0x1200a9;;;BU"); } + private static void CreateInstallStateAsset() + { + MsiPackageCache.CreateSecureDirectory(s_installStateDirectory); + File.WriteAllLines(s_installStateFileAssetPath, new[] { "line1", "line2" }); + MsiPackageCache.SecureFile(s_installStateFileAssetPath); + } + + private static void VerifyInstallStateDescriptors() + { + // Dump the descriptor of ProgramData since it's useful for analyzing. + DirectorySecurity ds = new DirectorySecurity(s_programData, s_accessControlSections); + string descriptor = ds.GetSecurityDescriptorSddlForm(s_accessControlSections); + Console.WriteLine($" Directory: {s_programData}"); + Console.WriteLine($"Descriptor: {descriptor}"); + + VerifyDirectorySecurityDescriptor(s_installStateDirectory, "BA", "BA", 4, "A;OICIID;0x1200a9;;;WD", "A;OICIID;FA;;;SY", "A;OICIID;FA;;;BA", "A;OICIID;0x1200a9;;;BU"); + VerifyFileSecurityDescriptor(s_installStateFileAssetPath, "BA", "BA", 4, "A;ID;0x1200a9;;;WD", "A;ID;FA;;;SY", "A;ID;FA;;;BA", "A;ID;0x1200a9;;;BU"); + } + static void Main(string[] args) { if (!OperatingSystem.IsWindows()) @@ -251,6 +286,8 @@ static void Main(string[] args) try { RelocateAndSecureAsset(); + + CreateInstallStateAsset(); } catch { @@ -268,6 +305,9 @@ static void Main(string[] args) CreateTestAsset(); RelocateAndSecureAsset(); VerifyDescriptors(); + + CreateInstallStateAsset(); + VerifyInstallStateDescriptors(); } catch (Exception e) { @@ -317,6 +357,7 @@ static void Main(string[] args) } VerifyDescriptors(); + VerifyInstallStateDescriptors(); } else { diff --git a/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs b/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs index f5863d1e98dd..ef6f71a4ba69 100644 --- a/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs +++ b/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs @@ -156,6 +156,20 @@ public void ReplaceWorkloadResolver(IWorkloadResolver workloadResolver) { WorkloadResolver = workloadResolver; } + + public void DeleteInstallState(string path) + { + if (File.Exists(path)) + { + File.Delete(path); + } + } + + public void WriteInstallState(string path, IEnumerable jsonLines) + { + Directory.CreateDirectory(Path.GetDirectoryName(path)); + File.WriteAllLines(path, jsonLines); + } } internal class MockInstallationRecordRepository : IWorkloadInstallationRecordRepository From 76d4937130c37b94e22591a1f1875e5170074960 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Tue, 7 Nov 2023 09:36:25 -0800 Subject: [PATCH 230/550] PR feedback --- .../Installer/Windows/MsiPackageCache.cs | 130 +---------------- .../dotnet/Installer/Windows/SecurityUtils.cs | 138 ++++++++++++++++++ .../commands/InstallingWorkloadCommand.cs | 2 +- .../install/MsiInstallerBase.cs | 4 +- .../install/WorkloadInstallCommand.cs | 2 +- .../update/WorkloadUpdateCommand.cs | 2 +- src/Tests/SDDLTests/Program.cs | 8 +- 7 files changed, 150 insertions(+), 136 deletions(-) create mode 100644 src/Cli/dotnet/Installer/Windows/SecurityUtils.cs diff --git a/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs b/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs index d857e93b89e3..413fd6237347 100644 --- a/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs +++ b/src/Cli/dotnet/Installer/Windows/MsiPackageCache.cs @@ -1,13 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.IO.Pipes; using System.Runtime.Versioning; using System.Security; -using System.Security.AccessControl; using System.Security.Cryptography.X509Certificates; -using System.Security.Principal; -using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Installer.Windows.Security; using Microsoft.Win32.Msi; using Newtonsoft.Json; @@ -20,55 +16,6 @@ namespace Microsoft.DotNet.Installer.Windows [SupportedOSPlatform("windows")] internal class MsiPackageCache : InstallerBase { - /// - /// Default inheritance to apply to directory ACLs. - /// - private static readonly InheritanceFlags s_DefaultInheritance = InheritanceFlags.ContainerInherit | InheritanceFlags.ObjectInherit; - - /// - /// SID that matches built-in administrators. - /// - private static readonly SecurityIdentifier s_AdministratorsSid = new SecurityIdentifier(WellKnownSidType.BuiltinAdministratorsSid, null); - - /// - /// SID that matches everyone. - /// - private static readonly SecurityIdentifier s_EveryoneSid = new SecurityIdentifier(WellKnownSidType.WorldSid, null); - - /// - /// Local SYSTEM SID. - /// - private static readonly SecurityIdentifier s_LocalSystemSid = new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null); - - /// - /// SID matching built-in user accounts. - /// - private static readonly SecurityIdentifier s_UsersSid = new SecurityIdentifier(WellKnownSidType.BuiltinUsersSid, null); - - /// - /// ACL rule associated with the Administrators SID. - /// - private static readonly FileSystemAccessRule s_AdministratorRule = new FileSystemAccessRule(s_AdministratorsSid, FileSystemRights.FullControl, - s_DefaultInheritance, PropagationFlags.None, AccessControlType.Allow); - - /// - /// ACL rule associated with the Everyone SID. - /// - private static readonly FileSystemAccessRule s_EveryoneRule = new FileSystemAccessRule(s_EveryoneSid, FileSystemRights.ReadAndExecute, - s_DefaultInheritance, PropagationFlags.None, AccessControlType.Allow); - - /// - /// ACL rule associated with the Local SYSTEM SID. - /// - private static readonly FileSystemAccessRule s_LocalSystemRule = new FileSystemAccessRule(s_LocalSystemSid, FileSystemRights.FullControl, - s_DefaultInheritance, PropagationFlags.None, AccessControlType.Allow); - - /// - /// ACL rule associated with the built-in users SID. - /// - private static readonly FileSystemAccessRule s_UsersRule = new FileSystemAccessRule(s_UsersSid, FileSystemRights.ReadAndExecute, - s_DefaultInheritance, PropagationFlags.None, AccessControlType.Allow); - /// /// The root directory of the package cache where MSI workload packs are stored. /// @@ -82,21 +29,6 @@ public MsiPackageCache(InstallElevationContextBase elevationContext, ISetupLogge : packageCacheRoot; } - /// - /// Creates the specified directory and secures it by configuring access rules (ACLs) that allow sub-directories - /// and files to inherit access control entries. - /// - /// The path of the directory to create. - public static void CreateSecureDirectory(string path) - { - if (!Directory.Exists(path)) - { - DirectorySecurity ds = new(); - SetDirectoryAccessRules(ds); - ds.CreateDirectory(path); - } - } - /// /// Moves the MSI payload described by the manifest file to the cache. /// @@ -123,7 +55,7 @@ public void CachePayload(string packageId, string packageVersion, string manifes Directory.Delete(packageDirectory, recursive: true); } - CreateSecureDirectory(packageDirectory); + SecurityUtils.CreateSecureDirectory(packageDirectory); // We cannot assume that the MSI adjacent to the manifest is the one to cache. We'll trust // the manifest to provide the MSI filename. @@ -134,8 +66,8 @@ public void CachePayload(string packageId, string packageVersion, string manifes string cachedMsiPath = Path.Combine(packageDirectory, Path.GetFileName(msiPath)); string cachedManifestPath = Path.Combine(packageDirectory, Path.GetFileName(manifestPath)); - MoveAndSecureFile(manifestPath, cachedManifestPath, Log); - MoveAndSecureFile(msiPath, cachedMsiPath, Log); + SecurityUtils.MoveAndSecureFile(manifestPath, cachedManifestPath, Log); + SecurityUtils.MoveAndSecureFile(msiPath, cachedMsiPath, Log); } else if (IsClient) { @@ -154,46 +86,6 @@ public string GetPackageDirectory(string packageId, string packageVersion) return Path.Combine(PackageCacheRoot, packageId, packageVersion); } - /// - /// Moves a file from one location to another if the destination file does not already exist and - /// configure its permissions. - /// - /// The source file to move. - /// The destination where the source file will be moved. - /// The underlying setup log to use. - public static void MoveAndSecureFile(string sourceFile, string destinationFile, ISetupLogger log = null) - { - if (!File.Exists(destinationFile)) - { - FileAccessRetrier.RetryOnMoveAccessFailure(() => - { - // Moving the file preserves the owner SID and fails to inherit the WD ACE. - File.Copy(sourceFile, destinationFile, overwrite: true); - File.Delete(sourceFile); - }); - log?.LogMessage($"Moved '{sourceFile}' to '{destinationFile}'"); - - SecureFile(destinationFile); - } - } - - /// - /// Secures a file by setting the owner and group to built-in administrators (BA). All other ACE values are inherited from - /// the parent directory. - /// - /// The path of the file to secure. - public static void SecureFile(string path) - { - FileInfo fi = new(path); - FileSecurity fs = new(); - - // See https://github.com/dotnet/sdk/issues/28450. If the directory's descriptor - // is correctly configured, we should end up with an inherited ACE for Everyone: (A;ID;0x1200a9;;;WD) - fs.SetOwner(s_AdministratorsSid); - fs.SetGroup(s_AdministratorsSid); - fi.SetAccessControl(fs); - } - /// /// Determines if the workload pack MSI is cached and tries to retrieve its payload from the cache. /// @@ -246,22 +138,6 @@ public bool TryGetMsiPathFromPackageData(string packageDataPath, out string msiP return true; } - /// - /// Apply a standard set of access rules to the directory security descriptor. The owner and group will - /// be set to built-in Administrators. Full access is granted to built-in administators and SYSTEM with - /// read, execute, synchronize permssions for built-in users and Everyone. - /// - /// The security descriptor to update. - private static void SetDirectoryAccessRules(DirectorySecurity ds) - { - ds.SetOwner(s_AdministratorsSid); - ds.SetGroup(s_AdministratorsSid); - ds.SetAccessRule(s_AdministratorRule); - ds.SetAccessRule(s_LocalSystemRule); - ds.SetAccessRule(s_UsersRule); - ds.SetAccessRule(s_EveryoneRule); - } - /// /// Verifies the AuthentiCode signature of an MSI package if the executing command itself is running /// from a signed module. diff --git a/src/Cli/dotnet/Installer/Windows/SecurityUtils.cs b/src/Cli/dotnet/Installer/Windows/SecurityUtils.cs new file mode 100644 index 000000000000..38ca0e78499d --- /dev/null +++ b/src/Cli/dotnet/Installer/Windows/SecurityUtils.cs @@ -0,0 +1,138 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.IO.Pipes; +using System.Runtime.Versioning; +using System.Security.AccessControl; +using System.Security.Principal; +using Microsoft.DotNet.Cli.Utils; + +namespace Microsoft.DotNet.Installer.Windows +{ + /// + /// Defines some generic security related helper methods. + /// + [SupportedOSPlatform("windows")] + internal static class SecurityUtils + { + /// + /// Default inheritance to apply to directory ACLs. + /// + private static readonly InheritanceFlags s_DefaultInheritance = InheritanceFlags.ContainerInherit | InheritanceFlags.ObjectInherit; + + /// + /// SID that matches built-in administrators. + /// + private static readonly SecurityIdentifier s_AdministratorsSid = new SecurityIdentifier(WellKnownSidType.BuiltinAdministratorsSid, null); + + /// + /// SID that matches everyone. + /// + private static readonly SecurityIdentifier s_EveryoneSid = new SecurityIdentifier(WellKnownSidType.WorldSid, null); + + /// + /// Local SYSTEM SID. + /// + private static readonly SecurityIdentifier s_LocalSystemSid = new SecurityIdentifier(WellKnownSidType.LocalSystemSid, null); + + /// + /// SID matching built-in user accounts. + /// + private static readonly SecurityIdentifier s_UsersSid = new SecurityIdentifier(WellKnownSidType.BuiltinUsersSid, null); + + /// + /// ACL rule associated with the Administrators SID. + /// + private static readonly FileSystemAccessRule s_AdministratorRule = new FileSystemAccessRule(s_AdministratorsSid, FileSystemRights.FullControl, + s_DefaultInheritance, PropagationFlags.None, AccessControlType.Allow); + + /// + /// ACL rule associated with the Everyone SID. + /// + private static readonly FileSystemAccessRule s_EveryoneRule = new FileSystemAccessRule(s_EveryoneSid, FileSystemRights.ReadAndExecute, + s_DefaultInheritance, PropagationFlags.None, AccessControlType.Allow); + + /// + /// ACL rule associated with the Local SYSTEM SID. + /// + private static readonly FileSystemAccessRule s_LocalSystemRule = new FileSystemAccessRule(s_LocalSystemSid, FileSystemRights.FullControl, + s_DefaultInheritance, PropagationFlags.None, AccessControlType.Allow); + + /// + /// ACL rule associated with the built-in users SID. + /// + private static readonly FileSystemAccessRule s_UsersRule = new FileSystemAccessRule(s_UsersSid, FileSystemRights.ReadAndExecute, + s_DefaultInheritance, PropagationFlags.None, AccessControlType.Allow); + + /// + /// Creates the specified directory and secures it by configuring access rules (ACLs) that allow sub-directories + /// and files to inherit access control entries. + /// + /// The path of the directory to create. + public static void CreateSecureDirectory(string path) + { + if (!Directory.Exists(path)) + { + DirectorySecurity ds = new(); + SecurityUtils.SetDirectoryAccessRules(ds); + ds.CreateDirectory(path); + } + } + + /// + /// Moves a file from one location to another if the destination file does not already exist and + /// configure its permissions. + /// + /// The source file to move. + /// The destination where the source file will be moved. + /// The underlying setup log to use. + public static void MoveAndSecureFile(string sourceFile, string destinationFile, ISetupLogger log = null) + { + if (!File.Exists(destinationFile)) + { + FileAccessRetrier.RetryOnMoveAccessFailure(() => + { + // Moving the file preserves the owner SID and fails to inherit the WD ACE. + File.Copy(sourceFile, destinationFile, overwrite: true); + File.Delete(sourceFile); + }); + log?.LogMessage($"Moved '{sourceFile}' to '{destinationFile}'"); + + SecureFile(destinationFile); + } + } + + /// + /// Secures a file by setting the owner and group to built-in administrators (BA). All other ACE values are inherited from + /// the parent directory. + /// + /// The path of the file to secure. + public static void SecureFile(string path) + { + FileInfo fi = new(path); + FileSecurity fs = new(); + + // See https://github.com/dotnet/sdk/issues/28450. If the directory's descriptor + // is correctly configured, we should end up with an inherited ACE for Everyone: (A;ID;0x1200a9;;;WD) + fs.SetOwner(s_AdministratorsSid); + fs.SetGroup(s_AdministratorsSid); + fi.SetAccessControl(fs); + } + + /// + /// Apply a standard set of access rules to the directory security descriptor. The owner and group will + /// be set to built-in Administrators. Full access is granted to built-in administators and SYSTEM with + /// read, execute, synchronize permssions for built-in users and Everyone. + /// + /// The security descriptor to update. + private static void SetDirectoryAccessRules(DirectorySecurity ds) + { + ds.SetOwner(s_AdministratorsSid); + ds.SetGroup(s_AdministratorsSid); + ds.SetAccessRule(s_AdministratorRule); + ds.SetAccessRule(s_LocalSystemRule); + ds.SetAccessRule(s_UsersRule); + ds.SetAccessRule(s_EveryoneRule); + } + } +} diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs index db349324e473..af3346a0b652 100644 --- a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs +++ b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs @@ -95,7 +95,7 @@ public InstallingWorkloadCommand( _defaultJsonPath = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetPath), "default.json"); } - protected IEnumerable GetInstallState(IEnumerable manifestVersionUpdates) => + protected IEnumerable GetInstallStateContents(IEnumerable manifestVersionUpdates) => ToJsonEnumerable(WorkloadSet.FromManifests( manifestVersionUpdates.Select(update => new WorkloadManifestInfo(update.ManifestId.ToString(), update.NewVersion.ToString(), /* We don't actually use the directory here */ string.Empty, update.NewFeatureBand)) ).ToDictionaryForJson()); diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs index 9174bb283718..0d6d54fca9ec 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs @@ -550,11 +550,11 @@ protected void WriteInstallStateFile(string path, IEnumerable jsonLines) if (IsElevated) { // Create the parent folder for the state file and set up all required ACLs - MsiPackageCache.CreateSecureDirectory(Path.GetDirectoryName(path)); + SecurityUtils.CreateSecureDirectory(Path.GetDirectoryName(path)); File.WriteAllLines(path, jsonLines); - MsiPackageCache.SecureFile(path); + SecurityUtils.SecureFile(path); } else if (IsClient) { diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index 954807e4125f..3914c576e37f 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -229,7 +229,7 @@ private void InstallWorkloadsWithInstallRecord( if (usingRollback) { - installer.WriteInstallState(_defaultJsonPath, GetInstallState(manifestsToUpdate)); + installer.WriteInstallState(_defaultJsonPath, GetInstallStateContents(manifestsToUpdate)); } }, rollback: () => diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index ecb29930c62e..278d7b95aa7a 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -158,7 +158,7 @@ private void UpdateWorkloadsWithInstallRecord( if (useRollback) { - _workloadInstaller.WriteInstallState(_defaultJsonPath, GetInstallState(manifestsToUpdate)); + _workloadInstaller.WriteInstallState(_defaultJsonPath, GetInstallStateContents(manifestsToUpdate)); } else { diff --git a/src/Tests/SDDLTests/Program.cs b/src/Tests/SDDLTests/Program.cs index bbe034bd3863..f6290d24535d 100644 --- a/src/Tests/SDDLTests/Program.cs +++ b/src/Tests/SDDLTests/Program.cs @@ -167,8 +167,8 @@ private static string CreateTestAsset() /// private static void RelocateAndSecureAsset() { - MsiPackageCache.CreateSecureDirectory(s_workloadPackCacheDirectory); - MsiPackageCache.MoveAndSecureFile(s_userTestAssetPath, s_cachedTestAssetPath); + SecurityUtils.CreateSecureDirectory(s_workloadPackCacheDirectory); + SecurityUtils.MoveAndSecureFile(s_userTestAssetPath, s_cachedTestAssetPath); } /// @@ -248,9 +248,9 @@ private static void VerifyDescriptors() private static void CreateInstallStateAsset() { - MsiPackageCache.CreateSecureDirectory(s_installStateDirectory); + SecurityUtils.CreateSecureDirectory(s_installStateDirectory); File.WriteAllLines(s_installStateFileAssetPath, new[] { "line1", "line2" }); - MsiPackageCache.SecureFile(s_installStateFileAssetPath); + SecurityUtils.SecureFile(s_installStateFileAssetPath); } private static void VerifyInstallStateDescriptors() From f0edb159c02d3603b725bf20c51375346233953a Mon Sep 17 00:00:00 2001 From: Mark Li Date: Thu, 9 Nov 2023 03:09:11 -0800 Subject: [PATCH 231/550] fix verbosity default option --- src/Cli/dotnet/CommonOptions.cs | 4 ++-- .../install/ToolInstallGlobalOrToolPathCommand.cs | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs index 3547fd59ed1c..420de1bd4886 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -281,10 +281,10 @@ internal static CliArgument AddCompletions(this CliArgument argument, F public enum VerbosityOptions { - quiet, - q, minimal, m, + quiet, + q, normal, n, detailed, diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs index d94519d9e53c..911e7aa34483 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs @@ -169,15 +169,16 @@ public override int Execute() { _environmentPathInstruction.PrintAddPathInstructionIfPathDoesNotExist(); } - if (!_verbosity.IsQuiet()) + if (_verbosity.IsQuiet()) { - _reporter.WriteLine( - string.Format( - LocalizableStrings.InstallationSucceeded, - string.Join(", ", package.Commands.Select(c => c.Name)), - package.Id, - package.Version.ToNormalizedString()).Green()); + return 0; } + _reporter.WriteLine( + string.Format( + LocalizableStrings.InstallationSucceeded, + string.Join(", ", package.Commands.Select(c => c.Name)), + package.Id, + package.Version.ToNormalizedString()).Green()); return 0; } From acd23397b5560cb138b03802425c341e702ba9fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Nov 2023 13:38:55 +0000 Subject: [PATCH 232/550] Update dependencies from https://github.com/dotnet/fsharp build 20231108.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23556.4 -> To Version 8.0.200-beta.23558.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ced0af8c50e6..451c2c8c52b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 5d1509792899a9ac25f59b8b0034dd98989a30b1 - + https://github.com/dotnet/fsharp - 18a78f9bc0dff4d0dc4966b7a53b701f02dc81bd + 03a99078ca7bd716ae088fa6d32d34dd63cd8cdf - + https://github.com/dotnet/fsharp - 18a78f9bc0dff4d0dc4966b7a53b701f02dc81bd + 03a99078ca7bd716ae088fa6d32d34dd63cd8cdf diff --git a/eng/Versions.props b/eng/Versions.props index 9889800c2173..caab910e59a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23556.4 + 12.8.0-beta.23558.2 From 7b2c5bac3c0902f34ace168097f916c4f87f2587 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Nov 2023 13:39:06 +0000 Subject: [PATCH 233/550] Update dependencies from https://github.com/dotnet/roslyn build 20231109.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23558.2 -> To Version 4.9.0-2.23559.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ced0af8c50e6..11ab8922bfae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d + 33f7330e15bbab0d4acbc408fedc69a6a8e5548e - + https://github.com/dotnet/roslyn - 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d + 33f7330e15bbab0d4acbc408fedc69a6a8e5548e - + https://github.com/dotnet/roslyn - 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d + 33f7330e15bbab0d4acbc408fedc69a6a8e5548e - + https://github.com/dotnet/roslyn - 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d + 33f7330e15bbab0d4acbc408fedc69a6a8e5548e - + https://github.com/dotnet/roslyn - 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d + 33f7330e15bbab0d4acbc408fedc69a6a8e5548e - + https://github.com/dotnet/roslyn - 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d + 33f7330e15bbab0d4acbc408fedc69a6a8e5548e - + https://github.com/dotnet/roslyn - 2b5e8d5ac8d5c2e1ecfcc387349ea8b4e3a8512d + 33f7330e15bbab0d4acbc408fedc69a6a8e5548e https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9889800c2173..0b4b06d30ddf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23558.2 - 4.9.0-2.23558.2 - 4.9.0-2.23558.2 - 4.9.0-2.23558.2 - 4.9.0-2.23558.2 - 4.9.0-2.23558.2 - 4.9.0-2.23558.2 + 4.9.0-2.23559.1 + 4.9.0-2.23559.1 + 4.9.0-2.23559.1 + 4.9.0-2.23559.1 + 4.9.0-2.23559.1 + 4.9.0-2.23559.1 + 4.9.0-2.23559.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 19c61c9443f3695a8d5f371cd3ce7da6b71d19da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Nov 2023 13:39:30 +0000 Subject: [PATCH 234/550] Update dependencies from https://github.com/dotnet/templating build 20231108.10 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.200-preview.23553.2 -> To Version 8.0.200-preview.23558.10 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ced0af8c50e6..e9c1381fe0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 96f08361269468012a98b7faf1af60ac9606c238 + 607e9150f07080438e4cc19e451b8dea7e821613 - + https://github.com/dotnet/templating - 96f08361269468012a98b7faf1af60ac9606c238 + 607e9150f07080438e4cc19e451b8dea7e821613 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9889800c2173..0d8b0191ac63 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.200-preview.23553.2 + 8.0.200-preview.23558.10 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.200-preview.23553.2 + 8.0.200-preview.23558.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From dc13f655756bed711eb4d7b1391523b31717e7f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Nov 2023 13:39:40 +0000 Subject: [PATCH 235/550] Update dependencies from https://github.com/dotnet/razor build 20231108.8 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23557.4 -> To Version 7.0.0-preview.23558.8 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ced0af8c50e6..e58f0579e49c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - a3c3d1768ddb716e3186df4c6c87a9958ace1ede + 2488f90ace12275cb2293db928ff3809ca75d5ce - + https://github.com/dotnet/razor - a3c3d1768ddb716e3186df4c6c87a9958ace1ede + 2488f90ace12275cb2293db928ff3809ca75d5ce - + https://github.com/dotnet/razor - a3c3d1768ddb716e3186df4c6c87a9958ace1ede + 2488f90ace12275cb2293db928ff3809ca75d5ce https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9889800c2173..2e98930a23d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23557.4 - 7.0.0-preview.23557.4 - 7.0.0-preview.23557.4 + 7.0.0-preview.23558.8 + 7.0.0-preview.23558.8 + 7.0.0-preview.23558.8 From 2b13aa7bd587ee716296bd09ebb94691e1396c42 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Thu, 9 Nov 2023 13:03:15 -0800 Subject: [PATCH 236/550] Add custom props imports around DB.props import --- src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props index 404a3d71f4d2..06756f0f4172 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props @@ -51,8 +51,12 @@ Copyright (c) .NET Foundation. All rights reserved. $([System.IO.Path]::Combine('$(_DirectoryBuildPropsBasePath)', '$(_DirectoryBuildPropsFile)')) + + + + false From 6fe4349dfdcc865836d8b077f110497e1c11855a Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Thu, 9 Nov 2023 14:32:44 -0800 Subject: [PATCH 237/550] PR feedback --- .../Windows/InstallMessageDispatcher.cs | 12 +++--- .../Windows/InstallRequestMessage.cs | 9 ----- .../Installer/Windows/LocalizableStrings.resx | 3 -- .../Windows/xlf/LocalizableStrings.cs.xlf | 5 --- .../Windows/xlf/LocalizableStrings.de.xlf | 5 --- .../Windows/xlf/LocalizableStrings.es.xlf | 5 --- .../Windows/xlf/LocalizableStrings.fr.xlf | 5 --- .../Windows/xlf/LocalizableStrings.it.xlf | 5 --- .../Windows/xlf/LocalizableStrings.ja.xlf | 5 --- .../Windows/xlf/LocalizableStrings.ko.xlf | 5 --- .../Windows/xlf/LocalizableStrings.pl.xlf | 5 --- .../Windows/xlf/LocalizableStrings.pt-BR.xlf | 5 --- .../Windows/xlf/LocalizableStrings.ru.xlf | 5 --- .../Windows/xlf/LocalizableStrings.tr.xlf | 5 --- .../xlf/LocalizableStrings.zh-Hans.xlf | 5 --- .../xlf/LocalizableStrings.zh-Hant.xlf | 5 --- .../commands/InstallingWorkloadCommand.cs | 7 ---- .../install/FileBasedInstaller.cs | 7 +++- .../dotnet-workload/install/IInstaller.cs | 8 ++-- .../install/MsiInstallerBase.cs | 37 +++++-------------- .../install/NetSdkMsiInstallerClient.cs | 8 ++-- .../install/NetSdkMsiInstallerServer.cs | 8 ++-- .../install/WorkloadInstallCommand.cs | 8 ++-- .../update/WorkloadUpdateCommand.cs | 4 +- .../GivenDotnetWorkloadInstall.cs | 8 ++-- .../GivenWorkloadManifestUpdater.cs | 20 +++++----- .../MockPackWorkloadInstaller.cs | 10 +++-- .../GivenDotnetWorkloadUpdate.cs | 8 ++-- 28 files changed, 64 insertions(+), 158 deletions(-) diff --git a/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs b/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs index 930983942ade..0d1270daeac8 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs @@ -150,29 +150,29 @@ public InstallResponseMessage SendWorkloadRecordRequest(InstallRequestType reque /// /// Send an to delete the install state file. /// - /// The path of the install state file to delete. + /// The SDK feature band of the install state file to delete. /// - public InstallResponseMessage SendRemoveInstallStateFileRequest(string path) + public InstallResponseMessage SendRemoveInstallStateFileRequest(SdkFeatureBand sdkFeatureBand) { return Send(new InstallRequestMessage { RequestType = InstallRequestType.RemoveInstallStateFile, - InstallStateFile = path + SdkFeatureBand = sdkFeatureBand.ToString(), }); } /// /// Sends an to write the install state file. /// - /// the path of the install state file to write. + /// The SDK feature band of the install state file to write /// A multi-line string containing the formatted JSON data to write. /// - public InstallResponseMessage SendWriteInstallStateFileRequest(string path, IEnumerable jsonLines) + public InstallResponseMessage SendWriteInstallStateFileRequest(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) { return Send(new InstallRequestMessage { RequestType = InstallRequestType.WriteInstallStateFile, - InstallStateFile = path, + SdkFeatureBand = sdkFeatureBand.ToString(), InstallStateContents = jsonLines.ToArray() }); } diff --git a/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs b/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs index 97b844d43fed..002f7e22ae1f 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs @@ -39,15 +39,6 @@ public string[] InstallStateContents set; } - /// - /// The path of the install state file. - /// - public string InstallStateFile - { - get; - set; - } - /// /// The path of the MSI log file to generate when installing, uninstalling or repairing a specific MSI. /// diff --git a/src/Cli/dotnet/Installer/Windows/LocalizableStrings.resx b/src/Cli/dotnet/Installer/Windows/LocalizableStrings.resx index c7e0c81cd4d0..da4ab122f64b 100644 --- a/src/Cli/dotnet/Installer/Windows/LocalizableStrings.resx +++ b/src/Cli/dotnet/Installer/Windows/LocalizableStrings.resx @@ -120,7 +120,4 @@ AuthentiCode signature for {0} does not belong to a trusted organization. - - Invalid install state file: {0} - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf index d3adde1d63d0..100b70e341ea 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf @@ -7,11 +7,6 @@ Podpis AuthentiCode pro {0} nepatří důvěryhodné organizaci. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf index 962275885a37..a358d63a5369 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf @@ -7,11 +7,6 @@ Die AuthentiCode-Signatur für {0} gehört nicht zu einer vertrauenswürdigen Organisation. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf index c757563ea95f..49c6a6af789f 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf @@ -7,11 +7,6 @@ La firma AuthentiCode para {0} no pertenece a una organización de confianza. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf index f028ac77e575..52c9042f7e63 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf @@ -7,11 +7,6 @@ La signature AuthentiCode pour {0} n’appartient pas à une organisation approuvée. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf index 97b5625d6f02..6caedf570426 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf @@ -7,11 +7,6 @@ La firma AuthentiCode per {0} non appartiene a un'organizzazione attendibile. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf index bcddd9568aa6..3d2140ab9b43 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf @@ -7,11 +7,6 @@ {0} の AuthentiCode 署名は、信頼されている組織に属していません。 - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf index 96ef4ebef436..5504670c80dc 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf @@ -7,11 +7,6 @@ {0}에 대한 AuthentiCode 서명이 신뢰할 수 있는 조직에 속해 있지 않습니다. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf index 818e21fe65a0..a89b7b61b7f9 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf @@ -7,11 +7,6 @@ Podpis AuthentiCode dla {0} nie należy do zaufanej organizacji. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf index 101ce4c94bcd..b9c9f365b741 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf @@ -7,11 +7,6 @@ A assinatura AuthentiCode para {0} não pertence a uma organização confiável. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf index e4cba58629d1..4e7c7f1c3591 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf @@ -7,11 +7,6 @@ Подпись AuthentiCode для {0} не принадлежит доверенной организации. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf index 35194ef8c72c..e61cd713ac68 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf @@ -7,11 +7,6 @@ {0} için AuthentiCode imzası güvenilir bir kuruluşa ait değil. - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf index 84291d5b47bf..ba5dcba91dd5 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf @@ -7,11 +7,6 @@ {0} 的 AuthentiCode 签名不属于受信任的组织。 - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf index 6e850ef371a9..e5793719fa5d 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf @@ -7,11 +7,6 @@ {0} 的 AuthentiCode 簽章不屬於信任的組織。 - - Invalid install state file: {0} - Invalid install state file: {0} - - \ No newline at end of file diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs index af3346a0b652..3bcf9061e005 100644 --- a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs +++ b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs @@ -39,11 +39,6 @@ internal abstract class InstallingWorkloadCommand : WorkloadCommandBase protected IInstaller _workloadInstaller; protected IWorkloadManifestUpdater _workloadManifestUpdater; - /// - /// The path of the default.json file tracking the install state for the current SDK. - /// - protected readonly string _defaultJsonPath; - public InstallingWorkloadCommand( ParseResult parseResult, IReporter reporter, @@ -91,8 +86,6 @@ public InstallingWorkloadCommand( _workloadInstallerFromConstructor = workloadInstaller; _workloadManifestUpdaterFromConstructor = workloadManifestUpdater; - - _defaultJsonPath = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetPath), "default.json"); } protected IEnumerable GetInstallStateContents(IEnumerable manifestVersionUpdates) => diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs index 90f0b38cbe9e..c72572e6eec5 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs @@ -452,16 +452,19 @@ public void GarbageCollect(Func getResolverForWorkloa } - public void DeleteInstallState(string path) + public void DeleteInstallState(SdkFeatureBand sdkFeatureBand) { + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetDir), "default.json"); + if (File.Exists(path)) { File.Delete(path); } } - public void WriteInstallState(string path, IEnumerable jsonLines) + public void WriteInstallState(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) { + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetDir), "default.json"); Directory.CreateDirectory(Path.GetDirectoryName(path)); File.WriteAllLines(path, jsonLines); } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs index 1f0cb0d784d1..6a75c395f2e3 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs @@ -37,15 +37,15 @@ internal interface IInstaller : IWorkloadManifestInstaller /// /// Delete the install state file at the specified path. /// - /// The full path of the default.json install state file. - void DeleteInstallState(string path); + /// The SDK feature band of the install state file. + void DeleteInstallState(SdkFeatureBand sdkFeatureBand); /// /// Writes the specified JSON contents to the install state file. /// - /// The full path of the default.json install state file. + /// The SDK feature band of the install state file. /// The JSON contents describing the install state. - void WriteInstallState(string path, IEnumerable jsonLines); + void WriteInstallState(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines); } // Interface to pass to workload manifest updater diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs index 0d6d54fca9ec..50ad621afc1e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs @@ -494,12 +494,13 @@ protected void UpdateDependent(InstallRequestType requestType, string providerKe } /// - /// Deletes the specified install state file. + /// Deletes install state file for the specified feature band. /// - /// The path of the install state file to delete. - protected void RemoveInstallStateFile(string path) + /// The feature band of the install state file. + protected void RemoveInstallStateFile(SdkFeatureBand sdkFeatureBand) { - VerifyInstallStateFile(path); + string path = WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, null); + if (File.Exists(path)) { Log?.LogMessage($"Install state file does not exist: {path}"); @@ -514,37 +515,19 @@ protected void RemoveInstallStateFile(string path) } else if (IsClient) { - InstallResponseMessage response = Dispatcher.SendRemoveInstallStateFileRequest(path); + InstallResponseMessage response = Dispatcher.SendRemoveInstallStateFileRequest(sdkFeatureBand); ExitOnFailure(response, $"Failed to remove install state file: {path}"); } } - /// - /// Verify that the specified path points to an install state file. - /// - /// - /// - /// This method is intended to avoid arbitrary file creation and delete operation when executing install state - /// file related operations. - /// - private void VerifyInstallStateFile(string path) - { - if (string.IsNullOrWhiteSpace(path) || - (!path.StartsWith(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData)) && - !path.EndsWith("default.json"))) - { - throw new ArgumentException(string.Format(LocalizableStrings.InvalidInstallStateFile, path)); - } - } - /// /// Writes the contents of the install state JSON file. /// - /// The path of the isntall state file to write. + /// The path of the isntall state file to write. /// The contents of the JSON file, formatted as a single line. - protected void WriteInstallStateFile(string path, IEnumerable jsonLines) + protected void WriteInstallStateFile(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) { - VerifyInstallStateFile(path); + string path = WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, null); Elevate(); if (IsElevated) @@ -558,7 +541,7 @@ protected void WriteInstallStateFile(string path, IEnumerable jsonLines) } else if (IsClient) { - InstallResponseMessage respone = Dispatcher.SendWriteInstallStateFileRequest(path, jsonLines); + InstallResponseMessage respone = Dispatcher.SendWriteInstallStateFileRequest(sdkFeatureBand, jsonLines); ExitOnFailure(respone, $"Failed to write install state file: {path}"); } } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs index 6dea375eceab..0fb003ec1af9 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs @@ -182,11 +182,11 @@ public void GarbageCollect(Func getResolverForWorkloa } } - public void DeleteInstallState(string path) => - RemoveInstallStateFile(path); + public void DeleteInstallState(SdkFeatureBand sdkFeatureBand) => + RemoveInstallStateFile(sdkFeatureBand); - public void WriteInstallState(string path, IEnumerable jsonLines) => - WriteInstallStateFile(path, jsonLines); + public void WriteInstallState(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) => + WriteInstallStateFile(sdkFeatureBand, jsonLines); /// /// Find all the dependents that look like they belong to SDKs. We only care diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs index 30184d9e9c4e..543266aa9c2c 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs @@ -94,13 +94,13 @@ public void Run() break; case InstallRequestType.WriteInstallStateFile: - WriteInstallStateFile(request.InstallStateFile, request.InstallStateContents); - Dispatcher.ReplySuccess($"Created install state file: {request.InstallStateFile}"); + WriteInstallStateFile(new SdkFeatureBand(request.SdkFeatureBand), request.InstallStateContents); + Dispatcher.ReplySuccess($"Created install state file for {request.SdkFeatureBand}."); break; case InstallRequestType.RemoveInstallStateFile: - RemoveInstallStateFile(request.InstallStateFile); - Dispatcher.ReplySuccess($"Deleted install state file: {request.InstallStateFile}"); + RemoveInstallStateFile(new SdkFeatureBand(request.SdkFeatureBand)); + Dispatcher.ReplySuccess($"Deleted install state file for {request.SdkFeatureBand}."); break; default: diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index 3914c576e37f..f85f57981ab3 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -99,7 +99,7 @@ public override int Execute() } else if (_skipManifestUpdate && usedRollback) { - throw new GracefulException(string.Format(LocalizableStrings.CannotCombineSkipManifestAndRollback, + throw new GracefulException(string.Format(LocalizableStrings.CannotCombineSkipManifestAndRollback, WorkloadInstallCommandParser.SkipManifestUpdateOption.Name, InstallingWorkloadCommandParser.FromRollbackFileOption.Name, WorkloadInstallCommandParser.SkipManifestUpdateOption.Name, InstallingWorkloadCommandParser.FromRollbackFileOption.Name), isUserError: true); } @@ -128,7 +128,7 @@ public void InstallWorkloads(IEnumerable workloadIds, bool skipManif { Reporter.WriteLine(); - var manifestsToUpdate = Enumerable.Empty (); + var manifestsToUpdate = Enumerable.Empty(); var useRollback = false; if (!skipManifestUpdate) @@ -229,7 +229,7 @@ private void InstallWorkloadsWithInstallRecord( if (usingRollback) { - installer.WriteInstallState(_defaultJsonPath, GetInstallStateContents(manifestsToUpdate)); + installer.WriteInstallState(sdkFeatureBand, GetInstallStateContents(manifestsToUpdate)); } }, rollback: () => @@ -249,7 +249,7 @@ private void InstallWorkloadsWithInstallRecord( private async Task> GetPackageDownloadUrlsAsync(IEnumerable workloadIds, bool skipManifestUpdate, bool includePreview) { var downloads = await GetDownloads(workloadIds, skipManifestUpdate, includePreview); - + var urls = new List(); foreach (var download in downloads) { diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index 278d7b95aa7a..17d98ea380de 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -158,11 +158,11 @@ private void UpdateWorkloadsWithInstallRecord( if (useRollback) { - _workloadInstaller.WriteInstallState(_defaultJsonPath, GetInstallStateContents(manifestsToUpdate)); + _workloadInstaller.WriteInstallState(sdkFeatureBand, GetInstallStateContents(manifestsToUpdate)); } else { - _workloadInstaller.DeleteInstallState(_defaultJsonPath); + _workloadInstaller.DeleteInstallState(sdkFeatureBand); } }, rollback: () => diff --git a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs index 45eb8d7ef262..476a5f49894c 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenDotnetWorkloadInstall.cs @@ -104,7 +104,7 @@ public void GivenWorkloadInstallOnFailingRollbackItDisplaysTopLevelError() var mockWorkloadIds = new WorkloadId[] { new WorkloadId("xamarin-android"), new WorkloadId("xamarin-android-build") }; var testDirectory = _testAssetsManager.CreateTestDirectory().Path; var dotnetRoot = Path.Combine(testDirectory, "dotnet"); - var installer = new MockPackWorkloadInstaller(failingWorkload: "xamarin-android-build", failingRollback: true); + var installer = new MockPackWorkloadInstaller(dotnetRoot, failingWorkload: "xamarin-android-build", failingRollback: true); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(new[] { _manifestPath }), dotnetRoot); var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android", "xamarin-android-build", "--skip-manifest-update" }); var workloadResolverFactory = new MockWorkloadResolverFactory(dotnetRoot, "6.0.100", workloadResolver); @@ -140,7 +140,7 @@ public void GivenWorkloadInstallItWarnsOnGarbageCollectionFailure() var mockWorkloadIds = new WorkloadId[] { new WorkloadId("xamarin-android"), new WorkloadId("xamarin-android-build") }; var testDirectory = _testAssetsManager.CreateTestDirectory().Path; var dotnetRoot = Path.Combine(testDirectory, "dotnet"); - var installer = new MockPackWorkloadInstaller(failingGarbageCollection: true); + var installer = new MockPackWorkloadInstaller(dotnetRoot, failingGarbageCollection: true); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(new[] { _manifestPath }), dotnetRoot); var parseResult = Parser.Instance.Parse(new string[] { "dotnet", "workload", "install", "xamarin-android", "xamarin-android-build", "--skip-manifest-update" }); var workloadResolverFactory = new MockWorkloadResolverFactory(dotnetRoot, "6.0.100", workloadResolver); @@ -319,7 +319,7 @@ public void GivenWorkloadInstallItErrorsOnUnsupportedPlatform() var manifestPath = Path.Combine(_testAssetsManager.GetAndValidateTestProjectDirectory("SampleManifest"), "UnsupportedPlatform.json"); var testDirectory = _testAssetsManager.CreateTestDirectory().Path; var dotnetRoot = Path.Combine(testDirectory, "dotnet"); - var installer = new MockPackWorkloadInstaller(); + var installer = new MockPackWorkloadInstaller(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(new[] { manifestPath }), dotnetRoot); var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var manifestUpdater = new MockWorkloadManifestUpdater(); @@ -461,7 +461,7 @@ static void CreateFile(string path) var dotnetRoot = Path.Combine(testDirectory, "dotnet"); var userProfileDir = Path.Combine(testDirectory, "user-profile"); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(new[] { _manifestPath }), dotnetRoot); - var installer = new MockPackWorkloadInstaller(failingWorkload) + var installer = new MockPackWorkloadInstaller(dotnetRoot, failingWorkload) { WorkloadResolver = workloadResolver }; diff --git a/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs b/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs index 0715c0e70a55..029d28fd9ee6 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenWorkloadManifestUpdater.cs @@ -124,7 +124,7 @@ public void GivenWorkloadManifestUpdateItCanCalculateUpdates() var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, userProfileDir: Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, userProfileDir: Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller(dotnetRoot)); var manifestUpdates = manifestUpdater.CalculateManifestUpdates().Select(m => m.ManifestUpdate); manifestUpdates.Should().BeEquivalentTo(expectedManifestUpdates); @@ -191,7 +191,7 @@ public void GivenAdvertisedManifestsItCalculatesCorrectUpdates() var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, userProfileDir: Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, userProfileDir: Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller(dotnetRoot)); var manifestUpdates = manifestUpdater.CalculateManifestUpdates().Select(m => m.ManifestUpdate); manifestUpdates.Should().BeEquivalentTo(expectedManifestUpdates); @@ -233,7 +233,7 @@ public void ItCanFallbackAndAdvertiseCorrectUpdate(bool useOfflineCache) var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); nugetDownloader.PackageIdsToNotFind.Add($"{testManifestName}.Manifest-6.0.300"); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller(dotnetRoot)); var offlineCacheDir = ""; if (useOfflineCache) @@ -310,7 +310,7 @@ public void ItCanFallbackWithNoUpdates(bool useOfflineCache) var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller(dotnetRoot)); var offlineCacheDir = ""; if (useOfflineCache) @@ -377,7 +377,7 @@ public void GivenNoUpdatesAreAvailableAndNoRollbackItGivesAppropriateMessage(boo var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, Path.Combine(testDir, ".dotnet"), installationRepo, new MockPackWorkloadInstaller(dotnetRoot)); var offlineCacheDir = ""; if (useOfflineCache) @@ -440,7 +440,7 @@ public void GivenWorkloadManifestRollbackItCanCalculateUpdates() var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller(dotnetRoot)); var manifestUpdates = manifestUpdater.CalculateManifestRollbacks(rollbackDefPath); manifestUpdates.Should().BeEquivalentTo(expectedManifestUpdates); @@ -483,7 +483,7 @@ public void GivenFromRollbackDefinitionItErrorsOnInstalledExtraneousManifestId() var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(Array.Empty()), dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller(dotnetRoot)); manifestUpdater.CalculateManifestRollbacks(rollbackDefPath); string.Join(" ", _reporter.Lines).Should().Contain(rollbackDefPath); @@ -525,7 +525,7 @@ public void GivenFromRollbackDefinitionItErrorsOnExtraneousManifestIdInRollbackD var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(new MockManifestProvider(Array.Empty()), dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller()); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller(dotnetRoot)); manifestUpdater.CalculateManifestRollbacks(rollbackDefPath); string.Join(" ", _reporter.Lines).Should().Contain(rollbackDefPath); @@ -556,7 +556,7 @@ public void GivenWorkloadManifestUpdateItChoosesHighestManifestVersionInCache() var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var installer = new MockPackWorkloadInstaller(); + var installer = new MockPackWorkloadInstaller(dotnetRoot); var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, installer); manifestUpdater.UpdateAdvertisingManifestsAsync(false, new DirectoryPath(offlineCache)).Wait(); @@ -709,7 +709,7 @@ public void TestSideBySideUpdateChecks() var workloadResolver = WorkloadResolver.CreateForTests(workloadManifestProvider, dotnetRoot); var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot); var installationRepo = new MockInstallationRecordRepository(); - var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller(), getEnvironmentVariable: getEnvironmentVariable); + var manifestUpdater = new WorkloadManifestUpdater(_reporter, workloadResolver, nugetDownloader, testDir, installationRepo, new MockPackWorkloadInstaller(dotnetRoot), getEnvironmentVariable: getEnvironmentVariable); var sentinelPath = Path.Combine(testDir, _manifestSentinelFileName + featureBand); return (manifestUpdater, nugetDownloader, sentinelPath); diff --git a/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs b/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs index ef6f71a4ba69..5b8cff4f21e7 100644 --- a/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs +++ b/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs @@ -22,12 +22,13 @@ internal class MockPackWorkloadInstaller : IInstaller public bool FailingRollback; public bool FailingGarbageCollection; private readonly string FailingPack; + private readonly string _dotnetDir; public IWorkloadResolver WorkloadResolver { get; set; } public int ExitCode => 0; - public MockPackWorkloadInstaller(string failingWorkload = null, string failingPack = null, bool failingRollback = false, IList installedWorkloads = null, + public MockPackWorkloadInstaller(string dotnetDir, string failingWorkload = null, string failingPack = null, bool failingRollback = false, IList installedWorkloads = null, IList installedPacks = null, bool failingGarbageCollection = false) { InstallationRecordRepository = new MockInstallationRecordRepository(failingWorkload, installedWorkloads); @@ -35,6 +36,7 @@ public MockPackWorkloadInstaller(string failingWorkload = null, string failingPa InstalledPacks = installedPacks ?? new List(); FailingPack = failingPack; FailingGarbageCollection = failingGarbageCollection; + _dotnetDir = dotnetDir; } IEnumerable GetPacksForWorkloads(IEnumerable workloadIds) @@ -157,16 +159,18 @@ public void ReplaceWorkloadResolver(IWorkloadResolver workloadResolver) WorkloadResolver = workloadResolver; } - public void DeleteInstallState(string path) + public void DeleteInstallState(SdkFeatureBand sdkFeatureBand) { + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json"); if (File.Exists(path)) { File.Delete(path); } } - public void WriteInstallState(string path, IEnumerable jsonLines) + public void WriteInstallState(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) { + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json"); Directory.CreateDirectory(Path.GetDirectoryName(path)); File.WriteAllLines(path, jsonLines); } diff --git a/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs b/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs index 6cbd58fb52cd..896569702333 100644 --- a/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs +++ b/src/Tests/dotnet-workload-update.Tests/GivenDotnetWorkloadUpdate.cs @@ -341,7 +341,7 @@ public void ApplyRollbackAcrossFeatureBand(string existingSdkFeatureBand, string packInstaller.InstalledManifests[0].manifestUpdate.ExistingFeatureBand.Should().Be(manifestsToUpdate[0].ManifestUpdate.ExistingFeatureBand); packInstaller.InstalledManifests[0].offlineCache.Should().Be(null); - var defaultJsonPath = Path.Combine(dotnetPath, "dotnet", "metadata", "workloads", "6.0.300", "InstallState", "default.json"); + var defaultJsonPath = Path.Combine(dotnetPath, "metadata", "workloads", "6.0.300", "InstallState", "default.json"); File.Exists(defaultJsonPath).Should().BeTrue(); var json = JsonDocument.Parse(new FileStream(defaultJsonPath, FileMode.Open, FileAccess.Read), new JsonDocumentOptions() { AllowTrailingCommas = true, CommentHandling = JsonCommentHandling.Skip }); json.RootElement.Should().NotBeNull(); @@ -425,8 +425,8 @@ public void GivenInvalidVersionInRollbackFileItErrors() CreatePackInfo("Xamarin.Android.Framework", "8.2.0", WorkloadPackKind.Framework, Path.Combine(dotnetRoot, "packs", "Xamarin.Android.Framework", "8.2.0"), "Xamarin.Android.Framework") }; var installer = includeInstalledPacks ? - new MockPackWorkloadInstaller(failingWorkload, failingPack, installedWorkloads: installedWorkloads, installedPacks: installedPacks) : - new MockPackWorkloadInstaller(failingWorkload, failingPack, installedWorkloads: installedWorkloads); + new MockPackWorkloadInstaller(dotnetRoot, failingWorkload, failingPack, installedWorkloads: installedWorkloads, installedPacks: installedPacks) : + new MockPackWorkloadInstaller(dotnetRoot, failingWorkload, failingPack, installedWorkloads: installedWorkloads); var copiedManifestFolder = Path.Combine(dotnetRoot, "sdk-manifests", new SdkFeatureBand(sdkVersion).ToString(), "SampleManifest"); Directory.CreateDirectory(copiedManifestFolder); @@ -448,7 +448,7 @@ public void GivenInvalidVersionInRollbackFileItErrors() nugetPackageDownloader: nugetDownloader, workloadManifestUpdater: manifestUpdater); - return (testDirectory, installManager, installer, workloadResolver, manifestUpdater, nugetDownloader); + return (dotnetRoot, installManager, installer, workloadResolver, manifestUpdater, nugetDownloader); } } } From 872a4ac2428bb1481105affca95af311fc1371bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Nov 2023 13:36:58 +0000 Subject: [PATCH 238/550] Update dependencies from https://github.com/dotnet/roslyn build 20231109.5 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23559.1 -> To Version 4.9.0-2.23559.5 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd50a9e9e4da..7ccefe7382f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - 33f7330e15bbab0d4acbc408fedc69a6a8e5548e + 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 - + https://github.com/dotnet/roslyn - 33f7330e15bbab0d4acbc408fedc69a6a8e5548e + 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 - + https://github.com/dotnet/roslyn - 33f7330e15bbab0d4acbc408fedc69a6a8e5548e + 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 - + https://github.com/dotnet/roslyn - 33f7330e15bbab0d4acbc408fedc69a6a8e5548e + 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 - + https://github.com/dotnet/roslyn - 33f7330e15bbab0d4acbc408fedc69a6a8e5548e + 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 - + https://github.com/dotnet/roslyn - 33f7330e15bbab0d4acbc408fedc69a6a8e5548e + 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 - + https://github.com/dotnet/roslyn - 33f7330e15bbab0d4acbc408fedc69a6a8e5548e + 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a84f0be8897c..16ea161230bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23559.1 - 4.9.0-2.23559.1 - 4.9.0-2.23559.1 - 4.9.0-2.23559.1 - 4.9.0-2.23559.1 - 4.9.0-2.23559.1 - 4.9.0-2.23559.1 + 4.9.0-2.23559.5 + 4.9.0-2.23559.5 + 4.9.0-2.23559.5 + 4.9.0-2.23559.5 + 4.9.0-2.23559.5 + 4.9.0-2.23559.5 + 4.9.0-2.23559.5 $(MicrosoftNetCompilersToolsetPackageVersion) From 2f3f2da108d32cdf1436a7cbe4e7b6476e12bd6f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Nov 2023 13:37:30 +0000 Subject: [PATCH 239/550] Update dependencies from https://github.com/dotnet/razor build 20231109.4 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23558.8 -> To Version 7.0.0-preview.23559.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd50a9e9e4da..b6ee6445e326 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 2488f90ace12275cb2293db928ff3809ca75d5ce + 56198594a74acbacd0c036d15462c7c4fc99f028 - + https://github.com/dotnet/razor - 2488f90ace12275cb2293db928ff3809ca75d5ce + 56198594a74acbacd0c036d15462c7c4fc99f028 - + https://github.com/dotnet/razor - 2488f90ace12275cb2293db928ff3809ca75d5ce + 56198594a74acbacd0c036d15462c7c4fc99f028 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a84f0be8897c..e1b07ae738f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23558.8 - 7.0.0-preview.23558.8 - 7.0.0-preview.23558.8 + 7.0.0-preview.23559.4 + 7.0.0-preview.23559.4 + 7.0.0-preview.23559.4 From f78127ff700dad8aadca55622a9edf3977cef81e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Nov 2023 17:30:23 +0000 Subject: [PATCH 240/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#36794) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd50a9e9e4da..0628b0a3f142 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 5d1509792899a9ac25f59b8b0034dd98989a30b1 - + https://github.com/dotnet/fsharp - 03a99078ca7bd716ae088fa6d32d34dd63cd8cdf + 9b11cb315b613eeab49632bb32b207a182685eea - + https://github.com/dotnet/fsharp - 03a99078ca7bd716ae088fa6d32d34dd63cd8cdf + 9b11cb315b613eeab49632bb32b207a182685eea diff --git a/eng/Versions.props b/eng/Versions.props index a84f0be8897c..82a4918adbcb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23558.2 + 12.8.0-beta.23559.1 From 04fab39ea3f4e3d37062ddb0b73484db9755d31d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 10 Nov 2023 17:30:56 +0000 Subject: [PATCH 241/550] [release/8.0.2xx] Update dependencies from microsoft/vstest (#36797) [release/8.0.2xx] Update dependencies from microsoft/vstest --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0628b0a3f142..549869affae2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client b10ba996eeb40da639273848408d2628e01076f4 - + https://github.com/microsoft/vstest - 9dce952ad80d9ff2e9979cd3924b58306c3d91ae + d9e9233bd304925f56fda44e65fc86bb1d4a25fc - + https://github.com/microsoft/vstest - 9dce952ad80d9ff2e9979cd3924b58306c3d91ae + d9e9233bd304925f56fda44e65fc86bb1d4a25fc - + https://github.com/microsoft/vstest - 9dce952ad80d9ff2e9979cd3924b58306c3d91ae + d9e9233bd304925f56fda44e65fc86bb1d4a25fc https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 82a4918adbcb..7e915acb9230 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23557-03 - 17.9.0-preview-23557-03 - 17.9.0-preview-23557-03 + 17.9.0-preview-23558-02 + 17.9.0-preview-23558-02 + 17.9.0-preview-23558-02 From e445d7b0f8d66b41d9afb5ea716e8f54620f72e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Nov 2023 13:36:23 +0000 Subject: [PATCH 242/550] Update dependencies from https://github.com/dotnet/roslyn build 20231110.7 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23559.5 -> To Version 4.9.0-2.23560.7 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 572921370285..1cea19bac76f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 + b8d51a54559b3e97ee8880acf33b8425ea5f1058 - + https://github.com/dotnet/roslyn - 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 + b8d51a54559b3e97ee8880acf33b8425ea5f1058 - + https://github.com/dotnet/roslyn - 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 + b8d51a54559b3e97ee8880acf33b8425ea5f1058 - + https://github.com/dotnet/roslyn - 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 + b8d51a54559b3e97ee8880acf33b8425ea5f1058 - + https://github.com/dotnet/roslyn - 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 + b8d51a54559b3e97ee8880acf33b8425ea5f1058 - + https://github.com/dotnet/roslyn - 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 + b8d51a54559b3e97ee8880acf33b8425ea5f1058 - + https://github.com/dotnet/roslyn - 65fc4bd08b4bc15f6f00b529f47ffaeead03e434 + b8d51a54559b3e97ee8880acf33b8425ea5f1058 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0fb5fd4439f9..de237220c7f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23559.5 - 4.9.0-2.23559.5 - 4.9.0-2.23559.5 - 4.9.0-2.23559.5 - 4.9.0-2.23559.5 - 4.9.0-2.23559.5 - 4.9.0-2.23559.5 + 4.9.0-2.23560.7 + 4.9.0-2.23560.7 + 4.9.0-2.23560.7 + 4.9.0-2.23560.7 + 4.9.0-2.23560.7 + 4.9.0-2.23560.7 + 4.9.0-2.23560.7 $(MicrosoftNetCompilersToolsetPackageVersion) From eea73fc10c01dc7fd9ae0f4c14dcc456333f4852 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Nov 2023 13:36:52 +0000 Subject: [PATCH 243/550] Update dependencies from https://github.com/dotnet/razor build 20231110.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23558.8 -> To Version 7.0.0-preview.23560.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6ee6445e326..e24e2f71fb32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 56198594a74acbacd0c036d15462c7c4fc99f028 + 1dbc1bd5b27e83306490f34da40ecb5fa903018f - + https://github.com/dotnet/razor - 56198594a74acbacd0c036d15462c7c4fc99f028 + 1dbc1bd5b27e83306490f34da40ecb5fa903018f - + https://github.com/dotnet/razor - 56198594a74acbacd0c036d15462c7c4fc99f028 + 1dbc1bd5b27e83306490f34da40ecb5fa903018f https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e1b07ae738f6..d18728679959 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23559.4 - 7.0.0-preview.23559.4 - 7.0.0-preview.23559.4 + 7.0.0-preview.23560.1 + 7.0.0-preview.23560.1 + 7.0.0-preview.23560.1 From 574d983befa70be9b2e261da7d8c1b7b5d53512a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 Nov 2023 13:30:29 +0000 Subject: [PATCH 244/550] Update dependencies from https://github.com/dotnet/roslyn build 20231111.2 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23559.5 -> To Version 4.9.0-2.23561.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cea19bac76f..e1bd3f937f7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - b8d51a54559b3e97ee8880acf33b8425ea5f1058 + eeb8518b88962796c8e2e7315c21cd770d7d0e09 - + https://github.com/dotnet/roslyn - b8d51a54559b3e97ee8880acf33b8425ea5f1058 + eeb8518b88962796c8e2e7315c21cd770d7d0e09 - + https://github.com/dotnet/roslyn - b8d51a54559b3e97ee8880acf33b8425ea5f1058 + eeb8518b88962796c8e2e7315c21cd770d7d0e09 - + https://github.com/dotnet/roslyn - b8d51a54559b3e97ee8880acf33b8425ea5f1058 + eeb8518b88962796c8e2e7315c21cd770d7d0e09 - + https://github.com/dotnet/roslyn - b8d51a54559b3e97ee8880acf33b8425ea5f1058 + eeb8518b88962796c8e2e7315c21cd770d7d0e09 - + https://github.com/dotnet/roslyn - b8d51a54559b3e97ee8880acf33b8425ea5f1058 + eeb8518b88962796c8e2e7315c21cd770d7d0e09 - + https://github.com/dotnet/roslyn - b8d51a54559b3e97ee8880acf33b8425ea5f1058 + eeb8518b88962796c8e2e7315c21cd770d7d0e09 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index de237220c7f6..a4e6afcdf6c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23560.7 - 4.9.0-2.23560.7 - 4.9.0-2.23560.7 - 4.9.0-2.23560.7 - 4.9.0-2.23560.7 - 4.9.0-2.23560.7 - 4.9.0-2.23560.7 + 4.9.0-2.23561.2 + 4.9.0-2.23561.2 + 4.9.0-2.23561.2 + 4.9.0-2.23561.2 + 4.9.0-2.23561.2 + 4.9.0-2.23561.2 + 4.9.0-2.23561.2 $(MicrosoftNetCompilersToolsetPackageVersion) From b0cfb2373f2fa55833d904e6d51d4e7432e24752 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 Nov 2023 13:30:59 +0000 Subject: [PATCH 245/550] Update dependencies from https://github.com/dotnet/razor build 20231111.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23558.8 -> To Version 7.0.0-preview.23561.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e24e2f71fb32..84c11d5c3c3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 1dbc1bd5b27e83306490f34da40ecb5fa903018f + 742a502a4aadd31d4dd939dd057cd59c17fc89e0 - + https://github.com/dotnet/razor - 1dbc1bd5b27e83306490f34da40ecb5fa903018f + 742a502a4aadd31d4dd939dd057cd59c17fc89e0 - + https://github.com/dotnet/razor - 1dbc1bd5b27e83306490f34da40ecb5fa903018f + 742a502a4aadd31d4dd939dd057cd59c17fc89e0 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d18728679959..c866bc95f38d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23560.1 - 7.0.0-preview.23560.1 - 7.0.0-preview.23560.1 + 7.0.0-preview.23561.3 + 7.0.0-preview.23561.3 + 7.0.0-preview.23561.3 From 5f27a4bc9917f782ddda8cb52bd1e39a5cbf88fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Nov 2023 13:28:35 +0000 Subject: [PATCH 246/550] Update dependencies from https://github.com/dotnet/fsharp build 20231112.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23559.1 -> To Version 8.0.200-beta.23562.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96f1a82387d5..2ef0dbda998b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 5d1509792899a9ac25f59b8b0034dd98989a30b1 - + https://github.com/dotnet/fsharp - 9b11cb315b613eeab49632bb32b207a182685eea + 2050ecfd933393d8644070f3e91bd90dc72c1f58 - + https://github.com/dotnet/fsharp - 9b11cb315b613eeab49632bb32b207a182685eea + 2050ecfd933393d8644070f3e91bd90dc72c1f58 diff --git a/eng/Versions.props b/eng/Versions.props index 081ae11eda15..17d22aa6602c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23559.1 + 12.8.0-beta.23562.1 From d6bce65f32c3151377e9f7c848f651c6159df67f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Nov 2023 13:28:46 +0000 Subject: [PATCH 247/550] Update dependencies from https://github.com/dotnet/roslyn build 20231112.2 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-2.23561.2 -> To Version 4.9.0-2.23562.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96f1a82387d5..6115e158eb3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 798570652705e18c9b92f7724c55c3289faa9074 - + https://github.com/dotnet/roslyn - eeb8518b88962796c8e2e7315c21cd770d7d0e09 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/roslyn - eeb8518b88962796c8e2e7315c21cd770d7d0e09 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/roslyn - eeb8518b88962796c8e2e7315c21cd770d7d0e09 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/roslyn - eeb8518b88962796c8e2e7315c21cd770d7d0e09 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/roslyn - eeb8518b88962796c8e2e7315c21cd770d7d0e09 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/roslyn - eeb8518b88962796c8e2e7315c21cd770d7d0e09 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/roslyn - eeb8518b88962796c8e2e7315c21cd770d7d0e09 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 081ae11eda15..ea9aa3447def 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.9.0-2.23561.2 - 4.9.0-2.23561.2 - 4.9.0-2.23561.2 - 4.9.0-2.23561.2 - 4.9.0-2.23561.2 - 4.9.0-2.23561.2 - 4.9.0-2.23561.2 + 4.9.0-2.23562.2 + 4.9.0-2.23562.2 + 4.9.0-2.23562.2 + 4.9.0-2.23562.2 + 4.9.0-2.23562.2 + 4.9.0-2.23562.2 + 4.9.0-2.23562.2 $(MicrosoftNetCompilersToolsetPackageVersion) From 322bdba9ada267b2531d07ab4f91fb1ba7057372 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Mon, 13 Nov 2023 17:34:23 -0800 Subject: [PATCH 248/550] Create dummy AfterSdkPublish target --- src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props index 404a3d71f4d2..1de58cacac8d 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props @@ -11,6 +11,13 @@ Copyright (c) .NET Foundation. All rights reserved. --> + + <_AfterSdkPublishDependsOn Condition="'$(_IsAspNetCoreProject)' == 'true'">AfterPublish + <_AfterSdkPublishDependsOn Condition="'$(_IsAspNetCoreProject)' != 'true'">Publish + + + + - 17.9.0-preview-23557-02 + 17.9.0-preview-23564-04 $(MicrosoftBuildPackageVersion) - 7.0.0-preview.23561.3 - 7.0.0-preview.23561.3 - 7.0.0-preview.23561.3 + 7.0.0-preview.23563.4 + 7.0.0-preview.23563.4 + 7.0.0-preview.23563.4 From 257a74a911878df4d56a03bed69cb3a0af8e5635 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 18:51:59 +0000 Subject: [PATCH 251/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#36860) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28702c7a801b..781a2c9eada9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 5d1509792899a9ac25f59b8b0034dd98989a30b1 - + https://github.com/dotnet/fsharp - 2050ecfd933393d8644070f3e91bd90dc72c1f58 + 341b2fb045d92d26d0d240c201947ded6af46125 - + https://github.com/dotnet/fsharp - 2050ecfd933393d8644070f3e91bd90dc72c1f58 + 341b2fb045d92d26d0d240c201947ded6af46125 diff --git a/eng/Versions.props b/eng/Versions.props index f4facbf4c224..dcc98930d756 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23562.1 + 12.8.0-beta.23563.3 From c469baef6986c2e871cbd619f2b711b5e44d041d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Nov 2023 16:31:56 +0000 Subject: [PATCH 252/550] Update dependencies from https://github.com/dotnet/arcade build 20231114.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23556.5 -> To Version 8.0.0-beta.23564.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f17a1223f985..53c8b4e31986 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -411,22 +411,22 @@ - + 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 diff --git a/eng/Versions.props b/eng/Versions.props index 1ab4f595f67b..59d3cb23cb4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.23556.5 + 8.0.0-beta.23564.4 7.0.0-preview.22423.2 8.0.0-rtm.23520.16 4.3.0 @@ -192,7 +192,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.23556.5 + 8.0.0-beta.23564.4 4.18.4 1.3.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index 061310eee146..de02323e748e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rtm.23506.1", + "dotnet": "8.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5", - "Microsoft.DotNet.Helix.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" } } From f493fc0ca88745813ff46fdd7475aad4db7e081c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:04:45 +0000 Subject: [PATCH 253/550] [release/8.0.2xx] Update dependencies from nuget/nuget.client (#36910) [release/8.0.2xx] Update dependencies from nuget/nuget.client --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f17a1223f985..69ed8c5e2653 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/nuget/nuget.client - b10ba996eeb40da639273848408d2628e01076f4 + 19d1a116a44313910dc9c9a9d1e274727ad82830 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 1ab4f595f67b..80d2e68fa66e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.23 - 6.9.0-preview.1.23 + 6.9.0-preview.1.33 + 6.9.0-preview.1.33 6.0.0-rc.278 - 6.9.0-preview.1.23 - 6.9.0-preview.1.23 - 6.9.0-preview.1.23 - 6.9.0-preview.1.23 - 6.9.0-preview.1.23 - 6.9.0-preview.1.23 - 6.9.0-preview.1.23 - 6.9.0-preview.1.23 - 6.9.0-preview.1.23 + 6.9.0-preview.1.33 + 6.9.0-preview.1.33 + 6.9.0-preview.1.33 + 6.9.0-preview.1.33 + 6.9.0-preview.1.33 + 6.9.0-preview.1.33 + 6.9.0-preview.1.33 + 6.9.0-preview.1.33 + 6.9.0-preview.1.33 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From a8b2f5bf7d29a812bd7812b1a7234e0bc61e0e05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:04:56 +0000 Subject: [PATCH 254/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#36911) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 69ed8c5e2653..5c3992e01899 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - bfd01e3e289e0b0819e850b213487ce387281786 + 85d842283030ac4f55511fe614fa5429f406c9d9 - + https://github.com/dotnet/msbuild - bfd01e3e289e0b0819e850b213487ce387281786 + 85d842283030ac4f55511fe614fa5429f406c9d9 - + https://github.com/dotnet/msbuild - bfd01e3e289e0b0819e850b213487ce387281786 + 85d842283030ac4f55511fe614fa5429f406c9d9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 80d2e68fa66e..f47b9906c6c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23564-04 + 17.9.0-preview-23565-02 $(MicrosoftBuildPackageVersion) - 17.9.0-preview-23558-02 - 17.9.0-preview-23558-02 - 17.9.0-preview-23558-02 + 17.9.0-preview-23564-03 + 17.9.0-preview-23564-03 + 17.9.0-preview-23564-03 From dd26676ffc667627c93a2db91babc0cff37cc81b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:05:54 +0000 Subject: [PATCH 256/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#36914) [release/8.0.2xx] Update dependencies from dotnet/razor --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2426d04ae3b..583579f80580 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 63184cdcae7f2af7cf823741c9068ef9b32cd95e + d5b9cca27eaea1a60fafc4b8e7ddf9a285e8837d - + https://github.com/dotnet/razor - 63184cdcae7f2af7cf823741c9068ef9b32cd95e + d5b9cca27eaea1a60fafc4b8e7ddf9a285e8837d - + https://github.com/dotnet/razor - 63184cdcae7f2af7cf823741c9068ef9b32cd95e + d5b9cca27eaea1a60fafc4b8e7ddf9a285e8837d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index aa25df4ea672..4dd27bd7a219 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23563.4 - 7.0.0-preview.23563.4 - 7.0.0-preview.23563.4 + 7.0.0-preview.23564.1 + 7.0.0-preview.23564.1 + 7.0.0-preview.23564.1 From b6f0344e45474bc2c15a95c5705f2011c6acfd76 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 15 Nov 2023 19:26:42 +0100 Subject: [PATCH 257/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2316496 --- .../xlf/LocalizableStrings.cs.xlf | 10 +++++----- .../xlf/LocalizableStrings.de.xlf | 10 +++++----- .../xlf/LocalizableStrings.es.xlf | 10 +++++----- .../xlf/LocalizableStrings.fr.xlf | 10 +++++----- .../xlf/LocalizableStrings.it.xlf | 10 +++++----- .../xlf/LocalizableStrings.ja.xlf | 10 +++++----- .../xlf/LocalizableStrings.ko.xlf | 10 +++++----- .../xlf/LocalizableStrings.pl.xlf | 10 +++++----- .../xlf/LocalizableStrings.pt-BR.xlf | 10 +++++----- .../xlf/LocalizableStrings.ru.xlf | 10 +++++----- .../xlf/LocalizableStrings.tr.xlf | 10 +++++----- .../xlf/LocalizableStrings.zh-Hans.xlf | 10 +++++----- .../xlf/LocalizableStrings.zh-Hant.xlf | 10 +++++----- 13 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf index 2e8af2b8ad5e..6668ef85e22e 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.cs.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + Verze {0} balíčku {1} Version {0} of package {1} - Version {0} of package {1} + Verze {0} balíčku {1} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + Verze mezi {0} a {1} balíčku {2} A version higher than {0} of package {1} - A version higher than {0} of package {1} + Verze vyšší než {0} balíčku {1} A version less than {0} of package {1} - A version less than {0} of package {1} + Verze menší než {0} balíčku {1} diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf index cb86d557645f..5dadf0d934f3 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.de.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + Eine Version von "{0}" des Pakets "{1}" Version {0} of package {1} - Version {0} of package {1} + Version "{0}" des Pakets "{1}" A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + Eine Version zwischen "{0}" und "{1}" des Pakets "{2}" A version higher than {0} of package {1} - A version higher than {0} of package {1} + Eine Version, die höher als "{0}" des Pakets "{1}" ist. A version less than {0} of package {1} - A version less than {0} of package {1} + Eine Version, die niedriger als "{0}" des Pakets "{1}" ist. diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf index 988c0c10df1d..cca9fc12e15c 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.es.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + Versión de {0} del paquete {1} Version {0} of package {1} - Version {0} of package {1} + Versión {0} del paquete {1} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + Una versión entre {0} y {1} del paquete {2} A version higher than {0} of package {1} - A version higher than {0} of package {1} + Una versión superior a {0} del paquete {1} A version less than {0} of package {1} - A version less than {0} of package {1} + Versión anterior a la {0} del paquete {1} diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf index 3b01bf4ea241..2486bfba02c4 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.fr.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + Une version de {0} du package {1} Version {0} of package {1} - Version {0} of package {1} + Une version {0} du package {1} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + Une version comprise entre {0} et {1} du package {2} A version higher than {0} of package {1} - A version higher than {0} of package {1} + Une version supérieure à {0} du package {1} A version less than {0} of package {1} - A version less than {0} of package {1} + Une version inférieure à {0} du package {1} diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf index bd72fe8fe667..f8cb87b2bd63 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.it.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + Versione di {0} del pacchetto {1} Version {0} of package {1} - Version {0} of package {1} + Versione {0} del pacchetto {1} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + Versione compresa tra {0} e {1} del pacchetto {2} A version higher than {0} of package {1} - A version higher than {0} of package {1} + Versione superiore a {0} del pacchetto {1} A version less than {0} of package {1} - A version less than {0} of package {1} + Versione inferiore a {0} del pacchetto {1} diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf index 941d9b1a38dd..9c05afb0a3b4 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ja.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + パッケージ {1} の {0} のバージョン Version {0} of package {1} - Version {0} of package {1} + パッケージ {1} のバージョン {0} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + パッケージ {2} の {0} と {1} の間のバージョン A version higher than {0} of package {1} - A version higher than {0} of package {1} + パッケージ {1} の {0} より上位のバージョン A version less than {0} of package {1} - A version less than {0} of package {1} + パッケージ {1} の {0} 未満のバージョン diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf index 53cc7fcedd3b..4001ca7986f8 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ko.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + {0}의 버전의 패키지 {1} Version {0} of package {1} - Version {0} of package {1} + 버전 {0}의 패키지 {1} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + {0} 및 {1} 사이의 버전의 패키지 {2} A version higher than {0} of package {1} - A version higher than {0} of package {1} + {0}보다 높은 버전의 패키지 {1} A version less than {0} of package {1} - A version less than {0} of package {1} + {0}보다 낮은 버전의 패키지 {1} diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf index 265594ace17a..c37e1a4a00e0 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pl.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + Wersja {0} pakietu {1} Version {0} of package {1} - Version {0} of package {1} + Wersja {0} pakietu {1} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + Wersja między {0} i {1} pakietu {2} A version higher than {0} of package {1} - A version higher than {0} of package {1} + Wersja nowsza niż {0} pakietu {1} A version less than {0} of package {1} - A version less than {0} of package {1} + Wersja mniejsza niż {0} pakietu {1} diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf index bdf52cff6539..1e7289a6ecb5 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.pt-BR.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + Uma versão do {0} do pacote {1} Version {0} of package {1} - Version {0} of package {1} + Versão {0} do pacote {1} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + Uma versão entre {0} e {1} do pacote {2} A version higher than {0} of package {1} - A version higher than {0} of package {1} + Uma versão superior a {0} do pacote {1} A version less than {0} of package {1} - A version less than {0} of package {1} + Uma versão anterior a {0} do pacote {1} diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ru.xlf index e98cc0dea007..b94dffd62b7a 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.ru.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + Версия {0} пакета {1} Version {0} of package {1} - Version {0} of package {1} + Версия {0} пакета {1} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + Версия от {0} до {1} пакета {2} A version higher than {0} of package {1} - A version higher than {0} of package {1} + Версия пакета {1} выше {0} A version less than {0} of package {1} - A version less than {0} of package {1} + Версия пакета {1} ниже {0} diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.tr.xlf index 3457d635381d..fd6d4ff5e9a4 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.tr.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + {1} paketinin bir {0} sürümü Version {0} of package {1} - Version {0} of package {1} + {1} paketinin {0} sürümü A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + {2} paketinin {0} ve {1} arasındaki bir sürümü A version higher than {0} of package {1} - A version higher than {0} of package {1} + {1} paketinin {0} sürümünden yüksek bir sürümü A version less than {0} of package {1} - A version less than {0} of package {1} + {1} paketinin {0} sürümünden düşük bir sürümü diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hans.xlf index 0311c2b4a5b2..2df9a0fe0842 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hans.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + 包 {1} 的版本 {0} Version {0} of package {1} - Version {0} of package {1} + 包 {1} 的版本 {0} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + 包 {2} 的 {0} 和 {1} 之间的版本 A version higher than {0} of package {1} - A version higher than {0} of package {1} + 包 {1} 的高于 {0} 的版本 A version less than {0} of package {1} - A version less than {0} of package {1} + 包 {1} 的低于 {0} 的版本 diff --git a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hant.xlf index f2ff0d69ff8c..ff999afa8383 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/NugetPackageDownloader/xlf/LocalizableStrings.zh-Hant.xlf @@ -44,27 +44,27 @@ A version of {0} of package {1} - A version of {0} of package {1} + 封裝 {1} 的版本 {0} Version {0} of package {1} - Version {0} of package {1} + 封裝 {1} 的版本 {0} A version between {0} and {1} of package {2} - A version between {0} and {1} of package {2} + 封裝 {2} 的 {0} 與 {1} 之間的版本 A version higher than {0} of package {1} - A version higher than {0} of package {1} + 封裝 {1} 高於 {0} 的版本 A version less than {0} of package {1} - A version less than {0} of package {1} + 封裝 {1} 小於 {0} 的版本 From 92a5dfae3921e9f1f4b5c36b65cda32e25e71969 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 15 Nov 2023 19:27:49 +0100 Subject: [PATCH 258/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2316496 --- .../xlf/LocalizableStrings.cs.xlf | 9 ++++----- .../xlf/LocalizableStrings.de.xlf | 11 +++++------ .../xlf/LocalizableStrings.es.xlf | 11 +++++------ .../xlf/LocalizableStrings.fr.xlf | 9 ++++----- .../xlf/LocalizableStrings.it.xlf | 9 ++++----- .../xlf/LocalizableStrings.ja.xlf | 11 +++++------ .../xlf/LocalizableStrings.ko.xlf | 11 +++++------ .../xlf/LocalizableStrings.pl.xlf | 11 +++++------ 8 files changed, 37 insertions(+), 45 deletions(-) diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf index d9ca65112185..059c3cc90ea8 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + Nebylo možné provést, protože zadaný příkaz nebo soubor nebyl nalezen. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Spuštění nebylo úspěšné, protože zadaný příkaz nebo soubor se nenašly. -Mezi možné příčiny patří toto: - * V integrovaném příkazu dotnet je překlep. + Možné důvody: + * Chybně jste napsali integrovaný příkaz dotnet. * Chtěli jste spustit program .NET, ale {0} neexistuje. - * Chtěli jste spustit globální nástroj, ale v proměnné PATH se nepovedlo najít spustitelný soubor s předponou dotnet s tímto názvem. + * Chtěli jste spustit nástroj global, ale v cestě PATH nebyl nalezen spustitelný soubor s předponou dotnet s tímto názvem. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf index 1bf008ed744b..b65426871939 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + Die Ausführung war nicht möglich, da der angegebene Befehl oder die angegebene Datei nicht gefunden wurde. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Die Ausführung war nicht möglich, weil der angegebene Befehl oder die Datei nicht gefunden wurde. -Mögliche Ursachen: - * Sie haben sich bei einem integrierten dotnet-Befehl verschrieben. - * Sie wollten ein .NET-Programm ausführen, aber "{0}" ist nicht vorhanden. - * Sie wollten ein globales Tool ausführen, aber in PATH wurde keine ausführbare Datei dieses Namens mit dotnet-Präfix gefunden. + Mögliche Gründe hierfür sind: + * Sie haben einen integrierten dotnet-Befehl falsch geschrieben. + * Sie wollten ein .NET-Programm ausführen, aber {0} ist nicht vorhanden. + * Sie wollten ein globales Tool ausführen, aber eine ausführbare Datei mit dotnet-Präfix und diesem Namen wurde in PATH nicht gefunden. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf index 369bc324ceda..ab310ba0919e 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + No se pudo ejecutar porque no se encontró el comando o archivo especificado. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - No se pudo ejecutar porque no se encontró el comando o el archivo especificado. -Algunas de las posibles causas son : - * Escribió mal un comando dotnet integrado. - * Pretendía ejecutar un programa .NET, pero {0} no existe. - * Pretendía ejecutar una herramienta global, pero no se encontró ningún ejecutable con prefijo dotnet con este nombre en PATH. + Entre las posibles razones para esto se incluyen: + * Escribió de manera incorrecta un comando dotnet integrado. + * Tenía previsto ejecutar un programa .NET, pero {0} no existe. + * Tuvo la intención de ejecutar una herramienta global, pero no se encontró un ejecutable con el prefijo dotnet con este nombre en la ruta. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf index 80214be6bf6a..83aafec69438 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + Exécution impossible, car la commande ou le fichier spécifié est introuvable. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Impossible d'effectuer l'exécution, car la commande ou le fichier spécifié est introuvable. -Raisons possibles : + Les raisons possibles sont les suivantes : * Vous avez mal orthographié une commande dotnet intégrée. - * Vous avez voulu exécuter un programme .NET, mais {0} n'existe pas. - * Vous avez voulu exécuter un outil global, mais l'exécutable de ce nom avec le préfixe dotnet est introuvable dans le CHEMIN. + * Vous avez l’intention d’exécuter un programme .NET, mais {0} n’existe pas. + * Vous avez l’intention d’exécuter un outil global, mais un exécutable avec un préfixe dotnet portant ce nom est introuvable sur le chemin d’accès. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf index 3d384cdff98e..d14e1840c5e8 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + Non è stato possibile eseguire perché il comando o il file specificato non è stato trovato. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Non è stato possibile completare l'esecuzione perché il comando o il file specificato non è stato trovato. -Motivi possibili: - * Il nome di un comando dotnet predefinito non è stato digitato correttamente. + I possibili motivi includono: + * È stato digitato in modo errato un comando dotnet predefinito. * Si intendeva eseguire un programma .NET, ma {0} non esiste. - * Si intendeva eseguire uno strumento globale, ma in PATH non è stato trovato alcun eseguibile con questo nome e prefisso dotnet. + * Si intendeva eseguire uno strumento globale, ma non è stato possibile trovare un eseguibile con prefisso dotnet con questo nome in PATH. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf index a0b722dd3fa9..ac1e63ccf812 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + 指定されたコマンドまたはファイルが見つからなかったため、実行できませんでした。 @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - 指定されたコマンドまたはファイルが見つからなかったため、実行できませんでした。 -次のような原因が考えられます。 - * 組み込みの dotnet コマンドのスペルが間違っている。 - * .NET プログラムを実行しようとしたが、{0} が存在しない。 - * グローバル ツールを実行しようとしたが、プレフィックスとして dotnet が付いたこの名前の実行可能なものが PATH に見つからなかった。 + これには、次のような理由が考えられます: + * 組み込みの dotnet コマンドのスペルが間違っています。 + * .NET プログラムを実行しようとしましたが、{0} が存在しません。 + * グローバル ツールを実行しようとしましたが、この名前の dotnet プレフィックス付き実行可能ファイルが PATH に見つかりませんでした。 diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf index 156f4131d1fb..4f2d0561d088 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + 지정한 명령 또는 파일을 찾을 수 없어 실행하지 못했습니다. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - 지정된 명령 또는 파일을 찾을 수 없으므로 실행할 수 없습니다. -가능한 원인은 다음과 같습니다. - * 기본 제공 dotnet 명령 철자가 잘못 입력되었습니다. - * .NET 프로그램을 실행하려고 했지만, {0}이(가) 없습니다. - * 전역 도구를 실행하려고 했지만, 이 이름의 dotnet 접두사가 있는 실행 파일을 PATH에서 찾을 수 없습니다. + 이에 대한 예상 원인은 다음과 같습니다. + * 기본 제공 dotnet 명령의 철자가 잘못되었습니다. + * .NET 프로그램을 실행하려고 했지만 {0}이(가) 없습니다. + * 전역 도구를 실행하려고 했지만 PATH에서 이 이름의 dotnet 접두사 실행 파일을 찾지 못했습니다. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf index 9673490d2048..f6b356e4a6eb 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + Nie można wykonać, ponieważ nie znaleziono określonego polecenia lub pliku. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Nie można wykonać, ponieważ nie odnaleziono określonego polecenia lub pliku. -Możliwe przyczyny: - * Błąd pisowni wbudowanego polecenia dotnet . - * Planowano wykonanie programu platformy .NET, ale element {0} nie istnieje. - * Planowano uruchomienie narzędzia globalnego, ale nie można odnaleźć pliku wykonywalnego z prefiksem dotnet o tej nazwie w zmiennej PATH. + Możliwe przyczyny tego są następujące: + * Błędnie napisano wbudowane polecenie dotnet. + * Zamierzano wykonać program .NET, ale {0} nie istnieje. + * Zamierzano uruchomić narzędzie globalne, ale nie można odnaleźć pliku wykonywalnego z prefiksem dotnet o tej nazwie w ścieżce PATH. From 8d8262a30aea52d84fa660398ea9e6c28ecc6f4f Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 15 Nov 2023 19:28:56 +0100 Subject: [PATCH 259/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2316496 --- .../xlf/LocalizableStrings.pt-BR.xlf | 9 ++++----- .../xlf/LocalizableStrings.ru.xlf | 11 +++++------ .../xlf/LocalizableStrings.tr.xlf | 9 ++++----- .../xlf/LocalizableStrings.zh-Hans.xlf | 11 +++++------ .../xlf/LocalizableStrings.zh-Hant.xlf | 11 +++++------ 5 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf index b1c76c52af00..b29d04bbe723 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + Não foi possível executar porque o comando ou arquivo especificado não foi encontrado. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Não foi possível executar porque o comando ou o arquivo especificado não foi encontrado. -Possíveis motivos para isso incluem: - * Você digitou incorretamente um comando de dotnet interno. + Os possíveis motivos para isso incluem: + * Você digitou incorretamente um comando dotnet interno. * Você pretendia executar um programa .NET, mas {0} não existe. - * Você pretendia executar uma ferramenta global, mas não foi possível encontrar um executável com prefixo de dotnet com esse nome no CAMINHO. + * Você pretendia executar uma ferramenta global, mas não foi possível encontrar um executável com prefixo dotnet com esse nome no PATH. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf index b019e780066b..0de8ace38958 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + Не удалось выполнить, поскольку указанная команда или файл не найдены. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Не удалось выполнить, так как не найдены указанная команда или указанный файл. -Возможные причины: - * вы неправильно набрали встроенную команду dotnet; - * вы планировали выполнить программу .NET, однако {0} не существует; - * вы хотели запустить глобальное средство, но по указанному в PATH пути не удалось найти исполняемый файл с префиксом dotnet, имеющий такое имя. + Возможные причины этого включают: + * Вы допустили ошибку во встроенной команде dotnet. + * Вы собирались выполнить программу .NET, но {0} не существует. + * Вы собирались запустить глобальное средство, но в PATH не удалось найти исполняемый файл с префиксом dotnet и таким именем. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf index 0417d4fc04b9..effa36b8a0ee 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + Belirtilen komut veya dosya bulunamadığından yürütülemedi. @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - Belirtilen komut veya dosya bulunamadığından yürütülemedi. -Bunun nedeni şunlardan biri olabilir: + Bunun olası nedenleri şunlar olabilir: * Yerleşik bir dotnet komutunu yanlış yazdınız. - * Bir .NET programını yürütmeyi amaçladınız, ancak {0} yok. - * Genel bir aracı çalıştırmayı amaçladınız, ancak bu ada sahip dotnet ön ekli yürütülebilir dosya PATH üzerinde bulunamadı. + * Bir .NET programını yürütmeyi amaçladınız ancak {0} mevcut değil. + * Bir genel aracı çalıştırmayı amaçladınız ancak YOL dizininde bu ada sahip dotnet ön eki olan bir yürütülebilir dosya bulunamadı. diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf index 6a12f7ac81b8..92d85374f55b 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + 无法执行,因为找不到指定的命令或文件。 @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - 无法执行,因为找不到指定的命令或文件。 -可能的原因包括: - *内置的 dotnet 命令拼写错误。 - *你打算执行 .NET 程序,但 {0} 不存在。 - *你打算运行全局工具,但在路径上找不到具有此名称且前缀为 dotnet 的可执行文件。 + 可能造成此问题的原因包括: + *内置 dotnet 命令拼写错误。 + *你打算执行 .NET 程序,但 {0} 不存在。 + *你打算运行全局工具,但在 PATH 上找不到具有此名称且带有 dotnet 前缀的可执行文件。 diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf index f8dbdf0147ee..2a19383fc1ce 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf @@ -14,7 +14,7 @@ Could not execute because the specified command or file was not found. - Could not execute because the specified command or file was not found. + 無法執行,因為找不到指定的命令或檔案。 @@ -37,11 +37,10 @@ * You misspelled a built-in dotnet command. * You intended to execute a .NET program, but {0} does not exist. * You intended to run a global tool, but a dotnet-prefixed executable with this name could not be found on the PATH. - 因為找不到指定的命令或檔案,所以無法執行。 -可能的原因包括: - * 內建 dotnet 命令拼寫錯誤。 - * 您預計要執行 .NET 程式,但不存在 {0}。 - * 您預計要執行全域工具,但在 PATH 上找不到此名稱且開頭為 dotnet 的可執行檔。 + 可能的原因包括: + * 您拼錯了內建 dotnet 命令。 + * 您打算執行 .NET 程式,但 {0} 不存在。 + * 您打算執行全域工具,但在 PATH 上找不到具有此名稱的以 dotnet 為首碼的可執行檔。 From 0e69383f17f4430988496b7472feaf9e9c7a3a2d Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 15 Nov 2023 19:30:52 +0100 Subject: [PATCH 260/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2316496 --- src/Tasks/Common/Resources/xlf/Strings.cs.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.es.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.it.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.ja.xlf | 4 ++-- src/Tasks/Common/Resources/xlf/Strings.pl.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf | 12 ++++++------ src/Tasks/Common/Resources/xlf/Strings.ru.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.tr.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf | 6 +++--- src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf | 6 +++--- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf index b881ae6ebecf..b2b7abf5bc73 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.cs.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.cs.xlf @@ -572,14 +572,14 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: + NETSDK1210: IsAotCompatible a EnableAotAnalyzer nejsou pro cílovou architekturu podporovány. Zvažte vícenásobné cílení na podporovanou architekturu, abyste umožnili analýzu kompilace předem, a nastavte IsAotCompatible pouze pro podporované architektury. Například: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: + NETSDK1212: IsTrimmable a EnableTrimAnalyzer nejsou pro cílovou architekturu podporovány. Zvažte vícenásobné cílení na podporovanou architekturu, která umožňuje oříznutí, a nastavte IsTrimmable pouze pro podporované architektury. Například: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> {StrBegin="NETSDK1212: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.es.xlf b/src/Tasks/Common/Resources/xlf/Strings.es.xlf index abb936f7669b..bfeab68a8dda 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.es.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.es.xlf @@ -402,7 +402,7 @@ NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> - NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: + NETSDK1211: EnableSingleFileAnalyzer no se admite para la plataforma de destino. Considere la posibilidad de usar varios destinos en un marco compatible para habilitar el análisis de archivos únicos y establezca EnableSingleFileAnalyzer solo para los marcos admitidos. Por ejemplo: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> {StrBegin="NETSDK1211: "} @@ -572,14 +572,14 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: + NETSDK1210: IsAotCompatible y EnableAotAnalyzer no se admite para la plataforma de destino. Considere la posibilidad de usar varios destinos en un marco compatible para habilitar el análisis de compilación con antelación y establezca IsAotCompatible solo para los marcos admitidos. Por ejemplo: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: + NETSDK1212: IsTrimmable y EnableTrimAnalyzer no se admite para la plataforma de destino. Considere la posibilidad de usar varios destinos en un marco compatible para habilitar el recorte y establezca IsTrimmable solo para los marcos admitidos. Por ejemplo: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> {StrBegin="NETSDK1212: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.it.xlf b/src/Tasks/Common/Resources/xlf/Strings.it.xlf index 37c8148e6367..86e1d2d8342f 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.it.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.it.xlf @@ -402,7 +402,7 @@ NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> - NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: + NETSDK1211: EnableSingleFileAnalyzer non è supportato per il framework di destinazione. Prendere in considerazione la multitargeting per un framework supportato per abilitare l'analisi a file singolo e impostare EnableSingleFileAnalyzer solo per i framework supportati. Ad esempio: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> {StrBegin="NETSDK1211: "} @@ -572,14 +572,14 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: + NETSDK1210: IsAotCompatible e EnableAotAnalyzer non sono supportati per il framework di destinazione. Prendere in considerazione la multitargeting per un framework supportato per abilitare l'analisi della compilazione in anticipo e impostare IsAotCompatible solo per i framework supportati. Ad esempio: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: + NETSDK1212: IsTrimmable e EnableTrimAnalyzer non sono supportati per il framework di destinazione. Prendere in considerazione la multitargeting per un framework supportato per abilitare il taglio e impostare IsTrimmable solo per i framework supportati. Ad esempio: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> {StrBegin="NETSDK1212: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf index a8155edaf937..58d017d5ca72 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ja.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ja.xlf @@ -572,14 +572,14 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: + NETSDK1210: IsAotCompatible と EnableAotAnalyzer はターゲット フレームワークではサポートされていません。Ahead of Time コンパイル分析を有効にするには、サポートされているフレームワークに対するマルチターゲットを検討し、サポートされているフレームワークに限り IsAotCompatible を設定してください。例: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: + NETSDK1212: IsTrimmable と EnableTrimAnalyzer はターゲット フレームワークではサポートされていません。トリミングを有効にするには、サポートされているフレームワークに対するマルチターゲットを検討し、サポートされているフレームワークに限り IsTrimmable を設定してください。例: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> {StrBegin="NETSDK1212: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf index f14df578d581..d24efca06c11 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pl.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pl.xlf @@ -402,8 +402,8 @@ NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> - NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: -<EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> + NETSDK1211: EnableSingleFileAnalyzer nie jest obsługiwany dla struktury docelowej. Rozważ zastosowanie wielu elementów docelowych do obsługiwanej struktury, aby umożliwić analizę pojedynczych plików, i ustaw parametr EnableSingleFileAnalyzer tylko dla obsługiwanych struktur. Na przykład: +<EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', „{0}”))">wartość prawda</EnableSingleFileAnalyzer> {StrBegin="NETSDK1211: "} @@ -572,15 +572,15 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: -<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> + NETSDK1210: Elementy IsAotCompatible i EnableAotAnalyzer nie są obsługiwane dla struktury docelowej. Rozważ zastosowanie wielu elementów docelowych do obsługiwanej struktury, aby umożliwić analizę kompilacji z wyprzedzeniem, i ustaw wartość IsAotCompatible tylko dla obsługiwanych struktur. Na przykład: +<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)„, ”{0}'))">wartość prawda</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: -<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> + NETSDK1212: Elementy IsTrimmable i EnableTrimAnalyzer nie są obsługiwane dla struktury docelowej. Rozważ zastosowanie wielu elementów docelowych do obsługiwanej struktury, aby włączyć przycinanie, i ustaw właściwość IsTrimmable tylko dla obsługiwanych struktur. Na przykład: +<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', „{0}”))">wartość prawda</IsTrimmable> {StrBegin="NETSDK1212: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf index 39eb2af70807..9f0cd6842b73 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.pt-BR.xlf @@ -402,8 +402,8 @@ NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> - NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: -<EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> + NETSDK1211: EnableSingleFileAnalyzer não é compatível com a estrutura de destino. Considere o direcionamento múltiplo para uma estrutura com suporte para habilitar a análise de arquivo único e defina EnableSingleFileAnalyzer somente para as estruturas com suporte. Por exemplo: +<EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">verdadeiro</EnableSingleFileAnalyzer> {StrBegin="NETSDK1211: "} @@ -572,15 +572,15 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: -<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> + NETSDK1210: IsAotCompatible e EnableAotAnalyzer não são compatíveis com a estrutura de destino. Considere o direcionamento múltiplo para uma estrutura com suporte para permitir a análise de compilação antecipada e defina IsAotCompatible apenas para as estruturas com suporte. Por exemplo: +<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">verdadeiro</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: -<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> + NETSDK1212: IsTrimmable e EnableTrimAnalyzer não são compatíveis com a estrutura de destino. Considere o direcionamento múltiplo para uma estrutura com suporte para habilitar o corte e defina IsTrimmable somente para as estruturas com suporte. Por exemplo: +<IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">verdadeiro</IsTrimmable> {StrBegin="NETSDK1212: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf index eb934bfde849..561e733e1634 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.ru.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.ru.xlf @@ -402,7 +402,7 @@ NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> - NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: + NETSDK1211: EnableSingleFileAnalyzer не поддерживается целевой платформой. Рассмотрите возможность использовать несколько целевых версий для поддерживаемой платформы, чтобы включить анализ одного файла, и настройте EnableSingleFileAnalyzer только для поддерживаемых платформ. Например: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> {StrBegin="NETSDK1211: "} @@ -572,14 +572,14 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: + NETSDK1210: IsAotCompatible и EnableAotAnalyzer не поддерживаются для целевой платформы. Рассмотрите возможность использовать несколько целевых версий для поддерживаемой платформы, чтобы включить анализ компиляции AOT, и задайте параметр IsAotCompatible только для поддерживаемых платформ. Пример: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: + NETSDK1212: IsTrimmable и EnableTrimAnalyzer не поддерживаются для целевой платформы. Рассмотрите возможность использовать несколько целевых версий для поддерживаемой платформы, чтобы включить обрезку, и задайте параметр IsTrimmable только для поддерживаемых платформ. Пример: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> {StrBegin="NETSDK1212: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf index dd845ad008bf..08d35b0d704b 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.tr.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.tr.xlf @@ -402,7 +402,7 @@ NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> - NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: + NETSDK1211: EnableSingleFileAnalyzer hedef altyapı için desteklenmiyor. Tek dosya analizini etkinleştirmek için desteklenen bir altyapıya çoklu hedeflemeyi kullanabilir ve EnableSingleFileAnalyzer ayarını yalnızca desteklenen altyapılar için yapabilirsiniz. Örneğin: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> {StrBegin="NETSDK1211: "} @@ -572,14 +572,14 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: + NETSDK1210: IsAotCompatible ve EnableAotAnalyzer hedef altyapı için desteklenmiyor. Önceden derleme analizini etkinleştirmek için desteklenen bir altyapıya çoklu hedefleme uygulayabilir ve IsAotCompatible ayarını yalnızca desteklenen altyapılar için yapabilirsiniz. Örneğin: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: + NETSDK1212: IsTrimmable ve EnableTrimAnalyzer hedef altyapı için desteklenmiyor. Kırpmayı etkinleştirmek için desteklenen bir altyapıya çoklu hedefleme uygulayabilir ve IsTrimmable ayarını yalnızca desteklenen altyapılar için yapabilirsiniz. Örneğin: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> {StrBegin="NETSDK1212: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf index 1abcb43d4d43..5dd16b79df86 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hans.xlf @@ -402,7 +402,7 @@ NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> - NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: + NETSDK1211: 目标框架不支持 EnableSingleFileAnalyzer。请考虑对受支持的框架进行多目标设定来启用单文件分析,并且仅为受支持的框架设置 EnableSingleFileAnalyzer。例如: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> {StrBegin="NETSDK1211: "} @@ -572,14 +572,14 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: + NETSDK1210: 目标框架不支持 IsAotCompatible 和 EnableAotAnalyzer。请考虑对受支持的框架进行多目标设定来启用提前编译分析,并且仅为受支持的框架设置 IsAotCompatible。例如: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: + NETSDK1212: 目标框架不支持 IsTrimmable 和 EnableTrimAnalyzer。请考虑对受支持的框架进行多目标设定以启用剪裁,并且仅为受支持的框架设置 IsTrimmable。例如: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> {StrBegin="NETSDK1212: "} diff --git a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf index 697f7689090e..72dfb5bfac80 100644 --- a/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf +++ b/src/Tasks/Common/Resources/xlf/Strings.zh-Hant.xlf @@ -402,7 +402,7 @@ NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> - NETSDK1211: EnableSingleFileAnalyzer is not supported for the target framework. Consider multi-targeting to a supported framework to enable single-file analysis, and set EnableSingleFileAnalyzer only for the supported frameworks. For example: + NETSDK1211: 目標架構不支援 EnableSingleFileAnalyzer。考慮對支援的架構設定多重目標,以啟用單一檔案分析,並僅針對支援的架構設定 EnableSingleFileAnalyzer。例如: <EnableSingleFileAnalyzer Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</EnableSingleFileAnalyzer> {StrBegin="NETSDK1211: "} @@ -572,14 +572,14 @@ The following are names of parameters or literal values and should not be transl NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> - NETSDK1210: IsAotCompatible and EnableAotAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable ahead-of-time compilation analysis, and set IsAotCompatible only for the supported frameworks. For example: + NETSDK1210: 目標架構不支援 IsAotCompatible 和 EnableAotAnalyzer。考慮對支援的架構設定多重目標,以啟用提前編譯分析,並僅針對支援的架構設定 IsAotCompatible。例如: <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsAotCompatible> {StrBegin="NETSDK1210: "} NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> - NETSDK1212: IsTrimmable and EnableTrimAnalyzer are not supported for the target framework. Consider multi-targeting to a supported framework to enable trimming, and set IsTrimmable only for the supported frameworks. For example: + NETSDK1212: 目標架構不支援 IsTrimmable 和 EnableTrimAnalyzer。考慮對支援的架構設定多重目標,以啟用修剪,並僅針對支援的架構設定 IsTrimmable。例如: <IsTrimmable Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '{0}'))">true</IsTrimmable> {StrBegin="NETSDK1212: "} From 193201233af67f104da48bc36cbaf992cc7bbac9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Nov 2023 13:40:10 +0000 Subject: [PATCH 261/550] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231115.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23556.3 -> To Version 8.0.0-alpha.1.23565.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 583579f80580..1f3164413b60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,9 +338,9 @@ 3dc05150cf234f76f6936dcb2853d31a0da1f60e - + https://github.com/dotnet/source-build-reference-packages - fa4c0e8f53ef2541a23e519af4dfb86cb88e1bae + 95f83e27806330fec09edd96e06bba3acabe3f35 From 1de3bba795b618b6de863cec4c427e95d2c91c3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Nov 2023 13:41:04 +0000 Subject: [PATCH 262/550] Update dependencies from https://github.com/dotnet/templating build 20231115.3 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.200-preview.23558.10 -> To Version 8.0.200-preview.23565.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 583579f80580..f0a29ed6a2ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - 607e9150f07080438e4cc19e451b8dea7e821613 + cb7b1558321784e4f2d9ca815836e7dc1b4c240c - + https://github.com/dotnet/templating - 607e9150f07080438e4cc19e451b8dea7e821613 + cb7b1558321784e4f2d9ca815836e7dc1b4c240c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4dd27bd7a219..0bf1f3fc6c9f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,13 +120,13 @@ - 8.0.200-preview.23558.10 + 8.0.200-preview.23565.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.200-preview.23558.10 + 8.0.200-preview.23565.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 2004f642b850195d6d3c9ec4fb5d7f00ec04b71b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Nov 2023 13:41:16 +0000 Subject: [PATCH 263/550] Update dependencies from https://github.com/microsoft/vstest build 20231115.1 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23564-03 -> To Version 17.9.0-preview-23565-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 583579f80580..d184c2c15275 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client 19d1a116a44313910dc9c9a9d1e274727ad82830 - + https://github.com/microsoft/vstest - b397a1f1393aa9b4ec55ee2f7073d7d1992bdfc7 + a561f75d35235af57987c06742f6de34e13a5635 - + https://github.com/microsoft/vstest - b397a1f1393aa9b4ec55ee2f7073d7d1992bdfc7 + a561f75d35235af57987c06742f6de34e13a5635 - + https://github.com/microsoft/vstest - b397a1f1393aa9b4ec55ee2f7073d7d1992bdfc7 + a561f75d35235af57987c06742f6de34e13a5635 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4dd27bd7a219..d91b56894519 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23564-03 - 17.9.0-preview-23564-03 - 17.9.0-preview-23564-03 + 17.9.0-preview-23565-01 + 17.9.0-preview-23565-01 + 17.9.0-preview-23565-01 From e07040a0e524e26cf69fc955735dae5ce548a5ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Nov 2023 13:41:27 +0000 Subject: [PATCH 264/550] Update dependencies from https://github.com/dotnet/razor build 20231115.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23564.1 -> To Version 7.0.0-preview.23565.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 583579f80580..711b3f4f2d90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - d5b9cca27eaea1a60fafc4b8e7ddf9a285e8837d + 1d591bec5300b4f362e33b1a5a296d20ae4290c0 - + https://github.com/dotnet/razor - d5b9cca27eaea1a60fafc4b8e7ddf9a285e8837d + 1d591bec5300b4f362e33b1a5a296d20ae4290c0 - + https://github.com/dotnet/razor - d5b9cca27eaea1a60fafc4b8e7ddf9a285e8837d + 1d591bec5300b4f362e33b1a5a296d20ae4290c0 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4dd27bd7a219..d9ba38045070 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23564.1 - 7.0.0-preview.23564.1 - 7.0.0-preview.23564.1 + 7.0.0-preview.23565.3 + 7.0.0-preview.23565.3 + 7.0.0-preview.23565.3 From 26b56ab2d1b5792d9ac03682cfd028fd3c8313c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Nov 2023 13:31:06 +0000 Subject: [PATCH 265/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.34 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.33 -> To Version 6.9.0-preview.1.34 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dfd8748ccb7..78b1ef784f0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d - + https://github.com/nuget/nuget.client - 19d1a116a44313910dc9c9a9d1e274727ad82830 + 39ea8e8081541fb1eb4702a5546e12f81fcad34d https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 3da2320467bf..5324ced393e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.33 - 6.9.0-preview.1.33 + 6.9.0-preview.1.34 + 6.9.0-preview.1.34 6.0.0-rc.278 - 6.9.0-preview.1.33 - 6.9.0-preview.1.33 - 6.9.0-preview.1.33 - 6.9.0-preview.1.33 - 6.9.0-preview.1.33 - 6.9.0-preview.1.33 - 6.9.0-preview.1.33 - 6.9.0-preview.1.33 - 6.9.0-preview.1.33 + 6.9.0-preview.1.34 + 6.9.0-preview.1.34 + 6.9.0-preview.1.34 + 6.9.0-preview.1.34 + 6.9.0-preview.1.34 + 6.9.0-preview.1.34 + 6.9.0-preview.1.34 + 6.9.0-preview.1.34 + 6.9.0-preview.1.34 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 930c9a9d937655612c77780873fc12dc9121880c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Nov 2023 13:31:16 +0000 Subject: [PATCH 266/550] Update dependencies from https://github.com/dotnet/source-build-externals build 20231116.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23566.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dfd8748ccb7..007f6533083c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -333,9 +333,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 3dc05150cf234f76f6936dcb2853d31a0da1f60e + 776b128c95ef681d125adc3eb69f12d480418bb5 From cb13e5af6064d2b4d5d20c467f67f6bc9c14b578 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Nov 2023 13:31:28 +0000 Subject: [PATCH 267/550] Update dependencies from https://github.com/dotnet/msbuild build 20231116.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23565-02 -> To Version 17.9.0-preview-23566-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dfd8748ccb7..c34e487c657b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 85d842283030ac4f55511fe614fa5429f406c9d9 + 0a0959f86064b7922731df2978b051a744e75072 - + https://github.com/dotnet/msbuild - 85d842283030ac4f55511fe614fa5429f406c9d9 + 0a0959f86064b7922731df2978b051a744e75072 - + https://github.com/dotnet/msbuild - 85d842283030ac4f55511fe614fa5429f406c9d9 + 0a0959f86064b7922731df2978b051a744e75072 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 3da2320467bf..af95a1831ecc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23565-02 + 17.9.0-preview-23566-03 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dfd8748ccb7..1734a3911289 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,9 +73,9 @@ 341b2fb045d92d26d0d240c201947ded6af46125 - + https://github.com/dotnet/format - 798570652705e18c9b92f7724c55c3289faa9074 + 28925c0e519d66c80328aacf973b74e40bb1d5bd diff --git a/eng/Versions.props b/eng/Versions.props index 3da2320467bf..79b8c4e0e28c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -95,7 +95,7 @@ - 8.0.453102 + 8.0.456602 From e4d1335a426ce3268c541d1abb28f99714602233 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Nov 2023 13:32:39 +0000 Subject: [PATCH 269/550] Update dependencies from https://github.com/dotnet/templating build 20231115.3 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.200-preview.23558.10 -> To Version 8.0.200-preview.23565.3 From 031a533579f21582eb31aa0b37be17c5635bbb31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Nov 2023 13:33:01 +0000 Subject: [PATCH 270/550] Update dependencies from https://github.com/dotnet/razor build 20231116.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23565.3 -> To Version 7.0.0-preview.23566.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dfd8748ccb7..8fbc95c521a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 1d591bec5300b4f362e33b1a5a296d20ae4290c0 + fe8b64bfeee9937585d1fe414ae40d38162b5f06 - + https://github.com/dotnet/razor - 1d591bec5300b4f362e33b1a5a296d20ae4290c0 + fe8b64bfeee9937585d1fe414ae40d38162b5f06 - + https://github.com/dotnet/razor - 1d591bec5300b4f362e33b1a5a296d20ae4290c0 + fe8b64bfeee9937585d1fe414ae40d38162b5f06 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3da2320467bf..d720f04a7ad5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23565.3 - 7.0.0-preview.23565.3 - 7.0.0-preview.23565.3 + 7.0.0-preview.23566.2 + 7.0.0-preview.23566.2 + 7.0.0-preview.23566.2 From 5ef67062285d00e526eaf04396d9d4910e769035 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 17 Nov 2023 11:25:33 -0600 Subject: [PATCH 271/550] Add exclusion for DockerCredsProvider --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 123bd07493ff..3dcc5ba862f5 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -32,5 +32,9 @@ + + + From a7ca2581d279b39ec75118e85bbb1dd4473e1c8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Nov 2023 13:36:44 +0000 Subject: [PATCH 272/550] Update dependencies from https://github.com/dotnet/sourcelink build 20231117.1 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23510.2 -> To Version 8.0.0-beta.23567.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dfd8748ccb7..2b14e9e99c6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -347,30 +347,30 @@ https://github.com/dotnet/deployment-tools 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/sourcelink - e2f4720f9e7411122675568b984606c405b3bb53 + 9241f4814d9996d7468d5c60fdf1eb0779049434 - + https://github.com/dotnet/sourcelink - e2f4720f9e7411122675568b984606c405b3bb53 + 9241f4814d9996d7468d5c60fdf1eb0779049434 - + https://github.com/dotnet/sourcelink - e2f4720f9e7411122675568b984606c405b3bb53 + 9241f4814d9996d7468d5c60fdf1eb0779049434 - + https://github.com/dotnet/sourcelink - e2f4720f9e7411122675568b984606c405b3bb53 + 9241f4814d9996d7468d5c60fdf1eb0779049434 - + https://github.com/dotnet/sourcelink - e2f4720f9e7411122675568b984606c405b3bb53 + 9241f4814d9996d7468d5c60fdf1eb0779049434 - + https://github.com/dotnet/sourcelink - e2f4720f9e7411122675568b984606c405b3bb53 + 9241f4814d9996d7468d5c60fdf1eb0779049434 diff --git a/eng/Versions.props b/eng/Versions.props index 3da2320467bf..c8378ab6a9f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,12 +177,12 @@ - 8.0.0-beta.23510.2 - 8.0.0-beta.23510.2 - 8.0.0-beta.23510.2 - 8.0.0-beta.23510.2 - 8.0.0-beta.23510.2 - 8.0.0-beta.23510.2 + 8.0.0-beta.23567.1 + 8.0.0-beta.23567.1 + 8.0.0-beta.23567.1 + 8.0.0-beta.23567.1 + 8.0.0-beta.23567.1 + 8.0.0-beta.23567.1 From 794e7c5bfd001da47431020d50aabc726b87ab10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Nov 2023 13:36:59 +0000 Subject: [PATCH 273/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.34 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.33 -> To Version 6.9.0-preview.1.34 From 73e20eafe8dfd65b79070b03545bd2bfcd14c3ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Nov 2023 13:37:17 +0000 Subject: [PATCH 274/550] Update dependencies from https://github.com/dotnet/source-build-externals build 20231116.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23566.2 From abe0480fc421c85437a6fa55a93e254077594df8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Nov 2023 13:37:33 +0000 Subject: [PATCH 275/550] Update dependencies from https://github.com/dotnet/msbuild build 20231116.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23565-02 -> To Version 17.9.0-preview-23566-03 From 3bc50827d1f42351551f4f839990c4d310cd2451 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Nov 2023 13:38:30 +0000 Subject: [PATCH 276/550] Update dependencies from https://github.com/dotnet/format build 20231116.2 dotnet-format From Version 8.0.453102 -> To Version 8.0.456602 From 9afce7c320790704f64addb7cf88ddde0174051c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Nov 2023 13:38:45 +0000 Subject: [PATCH 277/550] Update dependencies from https://github.com/dotnet/templating build 20231115.3 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.200-preview.23558.10 -> To Version 8.0.200-preview.23565.3 From 9aff9c29d8b82bcc5b94fe5f2777e1c6f9b57ca0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 18 Nov 2023 13:39:13 +0000 Subject: [PATCH 278/550] Update dependencies from https://github.com/dotnet/razor build 20231117.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23565.3 -> To Version 7.0.0-preview.23567.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fbc95c521a1..fc629db9baf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - fe8b64bfeee9937585d1fe414ae40d38162b5f06 + cb399332d4e38175db0cae38561d919f2add800b - + https://github.com/dotnet/razor - fe8b64bfeee9937585d1fe414ae40d38162b5f06 + cb399332d4e38175db0cae38561d919f2add800b - + https://github.com/dotnet/razor - fe8b64bfeee9937585d1fe414ae40d38162b5f06 + cb399332d4e38175db0cae38561d919f2add800b https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d720f04a7ad5..2ddd04883517 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23566.2 - 7.0.0-preview.23566.2 - 7.0.0-preview.23566.2 + 7.0.0-preview.23567.3 + 7.0.0-preview.23567.3 + 7.0.0-preview.23567.3 From 556f6780693f39d28dda3f36acad41eb0781cfe0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 Nov 2023 13:28:13 +0000 Subject: [PATCH 279/550] Update dependencies from https://github.com/dotnet/sourcelink build 20231117.1 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23510.2 -> To Version 8.0.0-beta.23567.1 --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 855c40e47ca2..66febf907085 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,6 @@ - From 92928dcb4dedbfd2a065654f937ea78568fdee7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 Nov 2023 13:28:30 +0000 Subject: [PATCH 280/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.36 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.33 -> To Version 6.9.0-preview.1.36 --- NuGet.config | 1 - eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 3 files changed, 43 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 855c40e47ca2..66febf907085 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78b1ef784f0b..7a0538804c39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 - + https://github.com/nuget/nuget.client - 39ea8e8081541fb1eb4702a5546e12f81fcad34d + d52a50a2a48a49a4faabc7160b4d805db4eb0961 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 5324ced393e6..137592d1ac21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.34 - 6.9.0-preview.1.34 + 6.9.0-preview.1.36 + 6.9.0-preview.1.36 6.0.0-rc.278 - 6.9.0-preview.1.34 - 6.9.0-preview.1.34 - 6.9.0-preview.1.34 - 6.9.0-preview.1.34 - 6.9.0-preview.1.34 - 6.9.0-preview.1.34 - 6.9.0-preview.1.34 - 6.9.0-preview.1.34 - 6.9.0-preview.1.34 + 6.9.0-preview.1.36 + 6.9.0-preview.1.36 + 6.9.0-preview.1.36 + 6.9.0-preview.1.36 + 6.9.0-preview.1.36 + 6.9.0-preview.1.36 + 6.9.0-preview.1.36 + 6.9.0-preview.1.36 + 6.9.0-preview.1.36 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 1cb1ed534cd7102840a70826ca8b4ae5680e6acc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 Nov 2023 13:28:45 +0000 Subject: [PATCH 281/550] Update dependencies from https://github.com/dotnet/source-build-externals build 20231116.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23566.2 --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 855c40e47ca2..66febf907085 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,6 @@ - From 68a0088504e71fdf441c2af2fb7460be4660bdb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 Nov 2023 13:29:01 +0000 Subject: [PATCH 282/550] Update dependencies from https://github.com/dotnet/msbuild build 20231118.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23565-02 -> To Version 17.9.0-preview-23568-01 --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 855c40e47ca2..66febf907085 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c34e487c657b..371c3eaa400b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 0a0959f86064b7922731df2978b051a744e75072 + 7595b3aaab7f7861ec371ef7b779bd15150ff78b - + https://github.com/dotnet/msbuild - 0a0959f86064b7922731df2978b051a744e75072 + 7595b3aaab7f7861ec371ef7b779bd15150ff78b - + https://github.com/dotnet/msbuild - 0a0959f86064b7922731df2978b051a744e75072 + 7595b3aaab7f7861ec371ef7b779bd15150ff78b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index af95a1831ecc..cb55ec07ecb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23566-03 + 17.9.0-preview-23568-01 $(MicrosoftBuildPackageVersion) - From ab08adc63810fa856cc8d15417162e953b56168b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 Nov 2023 13:30:16 +0000 Subject: [PATCH 284/550] Update dependencies from https://github.com/dotnet/templating build 20231115.3 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.200-preview.23558.10 -> To Version 8.0.200-preview.23565.3 --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 855c40e47ca2..66febf907085 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,6 @@ - From 5fd481520d6216093e703e0df4df32fa8337e26e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 19 Nov 2023 13:30:45 +0000 Subject: [PATCH 285/550] Update dependencies from https://github.com/dotnet/razor build 20231118.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23565.3 -> To Version 7.0.0-preview.23568.1 --- NuGet.config | 1 - eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 855c40e47ca2..66febf907085 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc629db9baf7..ab6b6b5a4c40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - cb399332d4e38175db0cae38561d919f2add800b + 51dd7111135d404026e10c78d5a8296fcb81a8f3 - + https://github.com/dotnet/razor - cb399332d4e38175db0cae38561d919f2add800b + 51dd7111135d404026e10c78d5a8296fcb81a8f3 - + https://github.com/dotnet/razor - cb399332d4e38175db0cae38561d919f2add800b + 51dd7111135d404026e10c78d5a8296fcb81a8f3 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2ddd04883517..8f72d7d27c53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23567.3 - 7.0.0-preview.23567.3 - 7.0.0-preview.23567.3 + 7.0.0-preview.23568.1 + 7.0.0-preview.23568.1 + 7.0.0-preview.23568.1 From 749f1ca73d90e50f8e7766f64dbf4394b7d4f6f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 00:04:14 +0000 Subject: [PATCH 286/550] Update dependencies from https://github.com/dotnet/sourcelink build 20231117.1 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23510.2 -> To Version 8.0.0-beta.23567.1 From 62bcfb120f3460858ebe918f3de3025f4c4323ef Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Wed, 8 Nov 2023 13:59:42 +0100 Subject: [PATCH 287/550] Freeze Microsoft.DotNet.MSBuildSdkResolver assembly version --- .../Microsoft.DotNet.MSBuildSdkResolver.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj index 3a4e5841b010..77a9cf79660b 100644 --- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj +++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj @@ -1,6 +1,8 @@  + + 8.0.100.0 $(ResolverTargetFramework);net472 $(ResolverTargetFramework) AnyCPU From 1e540950a18ea5223f581cc5751be950b3e55db9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 13:26:43 +0000 Subject: [PATCH 288/550] Update dependencies from https://github.com/dotnet/msbuild build 20231120.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23568-01 -> To Version 17.9.0-preview-23570-02 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c6de9eb7a6b..1ca12a957bf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 7595b3aaab7f7861ec371ef7b779bd15150ff78b + bf9d6d46d08587b1172288fce5c10237ea5ef1dc - + https://github.com/dotnet/msbuild - 7595b3aaab7f7861ec371ef7b779bd15150ff78b + bf9d6d46d08587b1172288fce5c10237ea5ef1dc - + https://github.com/dotnet/msbuild - 7595b3aaab7f7861ec371ef7b779bd15150ff78b + bf9d6d46d08587b1172288fce5c10237ea5ef1dc https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0d53e41a9e72..ec74da52ff2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23568-01 + 17.9.0-preview-23570-02 $(MicrosoftBuildPackageVersion) - + diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets index e0dc4c70ac02..23690d3a65a7 100644 --- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets +++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets @@ -13,6 +13,7 @@ )">true <_ContainerIsTargetingNet8TFM>false <_ContainerIsTargetingNet8TFM Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' And $([MSBuild]::VersionGreaterThanOrEquals($(_TargetFrameworkVersionWithoutV), '8.0'))">true + <_ContainerIsSelfContained>false <_ContainerIsSelfContained Condition="'$(SelfContained)' == 'true' or '$(PublishSelfContained)' == 'true'">true @@ -30,33 +31,29 @@ - - - - - - + Returns="$(ContainerBaseImage)"> - <_IsAspNet Condition="@(FrameworkReference->Count()) > 0 and @(FrameworkReference->AnyHaveMetadataValue('Identity', 'Microsoft.AspnetCore.App'))">true - - - <_ContainerBaseRegistry>mcr.microsoft.com - <_ContainerBaseImageName Condition="'$(_ContainerIsSelfContained)' == 'true'">dotnet/runtime-deps - <_ContainerBaseImageName Condition="'$(_ContainerBaseImageName)' == '' and '$(_IsAspNet)' == 'true'">dotnet/aspnet - <_ContainerBaseImageName Condition="'$(_ContainerBaseImageName)' == ''">dotnet/runtime - - - <_ContainerIsUsingMicrosoftDefaultImages Condition="'$(ContainerBaseImage)' != ''">false + + $(RuntimeIdentifier) + linux-$(NETCoreSdkPortableRuntimeIdentifier.Split('-')[1]) <_ContainerIsUsingMicrosoftDefaultImages Condition="'$(ContainerBaseImage)' == ''">true - - $(_ContainerBaseRegistry)/$(_ContainerBaseImageName):$(_ContainerBaseImageTag) + <_ContainerIsUsingMicrosoftDefaultImages Condition="'$(ContainerBaseImage)' != ''">false + + + + @@ -91,8 +88,6 @@ - $(RuntimeIdentifier) - linux-$(NETCoreSdkPortableRuntimeIdentifier.Split('-')[1]) <_ContainerIsTargetingWindows>false <_ContainerIsTargetingWindows Condition="$(ContainerRuntimeIdentifier.StartsWith('win'))">true diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs index 41bd32f8129a..3d4443f6919e 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs @@ -180,9 +180,9 @@ public void CanComputeTagsForSupportedSDKVersions(string sdkVersion, string tfm, }, projectName: $"{nameof(CanComputeTagsForSupportedSDKVersions)}_{sdkVersion}_{tfm}_{expectedTag}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{"_ComputeContainerBaseImageTag"}, new [] { logger }, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); - var computedTag = instance.GetProperty("_ContainerBaseImageTag").EvaluatedValue; - computedTag.Should().Be(expectedTag); + instance.Build(new[]{ComputeContainerBaseImage}, new [] { logger }, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedTag = instance.GetProperty(ContainerBaseImage).EvaluatedValue; + computedTag.Should().EndWith(expectedTag); } [InlineData("v8.0", "linux-x64", null)] @@ -244,8 +244,8 @@ public void CanTakeContainerBaseFamilyIntoAccount(string sdkVersion, string tfmM }, projectName: $"{nameof(CanTakeContainerBaseFamilyIntoAccount)}_{sdkVersion}_{tfmMajMin}_{containerFamily}_{expectedTag}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{ _ComputeContainerBaseImageTag }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); - var computedBaseImageTag = instance.GetProperty(KnownStrings.Properties._ContainerBaseImageTag)?.EvaluatedValue; - computedBaseImageTag.Should().Be(expectedTag); + instance.Build(new[]{ ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().EndWith(expectedTag); } } From bb283a5c65373a042016997e29d10c25a8819a82 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 20 Nov 2023 10:29:42 -0600 Subject: [PATCH 293/550] add tests for new alpine, aot, and extras inferences --- .../KnownStrings.cs | 4 ++ .../TargetsTests.cs | 61 +++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs b/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs index ee06acfa825c..eca93e561240 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs @@ -34,6 +34,10 @@ public static class Properties public static readonly string ContainerGenerateLabels = nameof(ContainerGenerateLabels); public static readonly string ContainerRuntimeIdentifier = nameof(ContainerRuntimeIdentifier); + public static readonly string RuntimeIdentifier = nameof(RuntimeIdentifier); + public static readonly string PublishAot = nameof(PublishAot); + public static readonly string PublishSelfContained = nameof(PublishSelfContained); + public static readonly string InvariantGlobalization = nameof(InvariantGlobalization); } public static class ErrorCodes diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs index 3d4443f6919e..434d4f1eca34 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs @@ -186,6 +186,7 @@ public void CanComputeTagsForSupportedSDKVersions(string sdkVersion, string tfm, } [InlineData("v8.0", "linux-x64", null)] + [InlineData("v8.0", "linux-musl-x64", null)] [InlineData("v8.0", "win-x64", "ContainerUser")] [InlineData("v7.0", "linux-x64", null)] [InlineData("v7.0", "win-x64", null)] @@ -248,4 +249,64 @@ public void CanTakeContainerBaseFamilyIntoAccount(string sdkVersion, string tfmM var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; computedBaseImageTag.Should().EndWith(expectedTag); } + + [InlineData("linux-musl-x64", "mcr.microsoft.com/dotnet/runtime:8.0-alpine")] + [InlineData("linux-x64", "mcr.microsoft.com/dotnet/runtime:8.0")] + [Theory] + public void MuslRidsGetAlpineContainers(string rid, string expectedImage) + { + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = "8.0.100", + ["TargetFrameworkVersion"] = "v8.0", + [KnownStrings.Properties.ContainerRuntimeIdentifier] = rid, + }, projectName: $"{nameof(MuslRidsGetAlpineContainers)}_{rid}_{expectedImage}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[]{ ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } + + [InlineData("linux-musl-x64", "mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-alpine-aot")] + [InlineData("linux-x64", "mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-jammy-chiseled-aot")] + [Theory] + public void AOTAppsGetAOTImages(string rid, string expectedImage) + { + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = "8.0.100", + ["TargetFrameworkVersion"] = "v8.0", + [KnownStrings.Properties.ContainerRuntimeIdentifier] = rid, + [KnownStrings.Properties.PublishSelfContained] = true.ToString(), + [KnownStrings.Properties.PublishAot] = true.ToString(), + [KnownStrings.Properties.InvariantGlobalization] = true.ToString(), + }, projectName: $"{nameof(AOTAppsGetAOTImages)}_{rid}_{expectedImage}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[]{ ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } + + [InlineData("linux-musl-x64", "mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-alpine-extra")] + [InlineData("linux-x64", "mcr.microsoft.com/dotnet/nightly/runtime-deps:8.0-jammy-chiseled-extra")] + [Theory] + public void AOTAppsWithCulturesGetExtraImages(string rid, string expectedImage) + { + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = "8.0.100", + ["TargetFrameworkVersion"] = "v8.0", + [KnownStrings.Properties.ContainerRuntimeIdentifier] = rid, + [KnownStrings.Properties.PublishSelfContained] = true.ToString(), + [KnownStrings.Properties.PublishAot] = true.ToString(), + [KnownStrings.Properties.InvariantGlobalization] = false.ToString() + }, projectName: $"{nameof(AOTAppsWithCulturesGetExtraImages)}_{rid}_{expectedImage}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[]{ ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } } From 0619af03142a1787fe735ed9af7c1a38c68f545f Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 20 Nov 2023 15:08:55 -0600 Subject: [PATCH 294/550] wrap and handle cancellation exceptions in .NET Task --- .../Tasks/CreateNewImage.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs index 669edba9590e..17895027d215 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs @@ -31,7 +31,19 @@ public sealed partial class CreateNewImage : Microsoft.Build.Utilities.Task, ICa public override bool Execute() { - return Task.Run(() => ExecuteAsync(_cancellationTokenSource.Token)).GetAwaiter().GetResult(); + try + { + Task.Run(() => ExecuteAsync(_cancellationTokenSource.Token)).ContinueWith(t => t).GetAwaiter().GetResult(); + } + catch (TaskCanceledException ex) + { + Log.LogWarningFromException(ex); + } + catch (OperationCanceledException ex) + { + Log.LogWarningFromException(ex); + } + return !Log.HasLoggedErrors; } internal async Task ExecuteAsync(CancellationToken cancellationToken) From 64faf0257a554f66341a2f36cded49fa16e195ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Nov 2023 13:37:16 +0000 Subject: [PATCH 295/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.39 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.36 -> To Version 6.9.0-preview.1.39 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ca12a957bf7..3f8a4e45ad18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 - + https://github.com/nuget/nuget.client - d52a50a2a48a49a4faabc7160b4d805db4eb0961 + d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index ec74da52ff2b..cafd63042db2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.36 - 6.9.0-preview.1.36 + 6.9.0-preview.1.39 + 6.9.0-preview.1.39 6.0.0-rc.278 - 6.9.0-preview.1.36 - 6.9.0-preview.1.36 - 6.9.0-preview.1.36 - 6.9.0-preview.1.36 - 6.9.0-preview.1.36 - 6.9.0-preview.1.36 - 6.9.0-preview.1.36 - 6.9.0-preview.1.36 - 6.9.0-preview.1.36 + 6.9.0-preview.1.39 + 6.9.0-preview.1.39 + 6.9.0-preview.1.39 + 6.9.0-preview.1.39 + 6.9.0-preview.1.39 + 6.9.0-preview.1.39 + 6.9.0-preview.1.39 + 6.9.0-preview.1.39 + 6.9.0-preview.1.39 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 45cf1e5fb2a9ad3e6e9716e77d96b3480837e102 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Nov 2023 13:37:26 +0000 Subject: [PATCH 296/550] Update dependencies from https://github.com/dotnet/source-build-externals build 20231120.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23566.2 -> To Version 8.0.0-alpha.1.23570.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ca12a957bf7..b59ecadb9c00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -333,9 +333,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 776b128c95ef681d125adc3eb69f12d480418bb5 + e844aa02a05b90d8cbe499676ec6ee0f19ec4980 From f06e662005b467a3ccd6e6df095dc55f86754dea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Nov 2023 13:37:38 +0000 Subject: [PATCH 297/550] Update dependencies from https://github.com/dotnet/msbuild build 20231121.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23570-02 -> To Version 17.9.0-preview-23571-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ca12a957bf7..370d2a87f257 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - bf9d6d46d08587b1172288fce5c10237ea5ef1dc + 38bd5f4b15da70fce0491881c3f0818833f36261 - + https://github.com/dotnet/msbuild - bf9d6d46d08587b1172288fce5c10237ea5ef1dc + 38bd5f4b15da70fce0491881c3f0818833f36261 - + https://github.com/dotnet/msbuild - bf9d6d46d08587b1172288fce5c10237ea5ef1dc + 38bd5f4b15da70fce0491881c3f0818833f36261 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ec74da52ff2b..cece0936595b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23570-02 + 17.9.0-preview-23571-01 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23563.3 + 12.8.0-beta.23570.1 From 5ee601ca2fbc6a97e4320e1d3f6c63a9c562a44e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Nov 2023 13:38:53 +0000 Subject: [PATCH 299/550] Update dependencies from https://github.com/dotnet/templating build 20231115.3 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.200-preview.23558.10 -> To Version 8.0.200-preview.23565.3 From e7482740ad24ae71d5bb0545c03974cc97ebeb54 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 Nov 2023 13:39:19 +0000 Subject: [PATCH 300/550] Update dependencies from https://github.com/dotnet/razor build 20231121.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23568.1 -> To Version 7.0.0-preview.23571.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ca12a957bf7..09b0590b0762 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://github.com/dotnet/aspnetcore 9e7a25f270182a1b4413583086166ab0abfbbf19 - + https://github.com/dotnet/razor - 51dd7111135d404026e10c78d5a8296fcb81a8f3 + 630d8260fc1c00341a89c8e794fb47ceeb86c148 - + https://github.com/dotnet/razor - 51dd7111135d404026e10c78d5a8296fcb81a8f3 + 630d8260fc1c00341a89c8e794fb47ceeb86c148 - + https://github.com/dotnet/razor - 51dd7111135d404026e10c78d5a8296fcb81a8f3 + 630d8260fc1c00341a89c8e794fb47ceeb86c148 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ec74da52ff2b..1eb103fef095 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23568.1 - 7.0.0-preview.23568.1 - 7.0.0-preview.23568.1 + 7.0.0-preview.23571.2 + 7.0.0-preview.23571.2 + 7.0.0-preview.23571.2 From 8781ca4f8b834c5550e6966ad949854986de9a1c Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 21 Nov 2023 12:29:51 -0800 Subject: [PATCH 301/550] Re-implement -d parsing change --- src/Cli/dotnet/ParseResultExtensions.cs | 36 +++++++++++++++---- src/Cli/dotnet/Program.cs | 11 ++++-- .../ParserTests/ParseResultExtensionsTests.cs | 2 +- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/Cli/dotnet/ParseResultExtensions.cs b/src/Cli/dotnet/ParseResultExtensions.cs index d7f48e207cf6..ff49d8d2bdff 100644 --- a/src/Cli/dotnet/ParseResultExtensions.cs +++ b/src/Cli/dotnet/ParseResultExtensions.cs @@ -122,16 +122,38 @@ public static string[] GetSubArguments(this string[] args) var subargs = args.ToList(); // Don't remove any arguments that are being passed to the app in dotnet run - var runArgs = subargs.Contains("--") ? subargs.GetRange(subargs.IndexOf("--"), subargs.Count() - subargs.IndexOf("--")) : new List(); - subargs = subargs.Contains("--") ? subargs.GetRange(0, subargs.IndexOf("--")) : subargs; + var dashDashIndex = subargs.IndexOf("--"); - subargs.RemoveAll(arg => DiagOption.Name.Equals(arg) || DiagOption.Aliases.Contains(arg)); - if (subargs[0].Equals("dotnet")) + var runArgs = dashDashIndex > -1 ? subargs.GetRange(dashDashIndex, subargs.Count() - dashDashIndex) : new List(0); + subargs = dashDashIndex > -1 ? subargs.GetRange(0, dashDashIndex) : subargs; + + return subargs + .SkipWhile(arg => DiagOption.Name.Equals(arg) || DiagOption.Aliases.Contains(arg) || arg.Equals("dotnet")) + .Skip(1) // remove top level command (ex build or publish) + .Concat(runArgs) + .ToArray(); + } + + public static bool DiagOptionPrecedesSubcommand(this string[] args, string subCommand) + { + if (string.IsNullOrEmpty(subCommand)) { - subargs.RemoveAt(0); + return true; } - subargs.RemoveAt(0); // remove top level command (ex build or publish) - return subargs.Concat(runArgs).ToArray(); + + for (var i = 0; i < args.Length; i++) + { + if (args[i].Equals(subCommand)) + { + return false; + } + else if (DiagOption.Name.Equals(args) || DiagOption.Aliases.Contains(args[i])) + { + return true; + } + } + + return false; } private static string GetSymbolResultValue(ParseResult parseResult, SymbolResult symbolResult) diff --git a/src/Cli/dotnet/Program.cs b/src/Cli/dotnet/Program.cs index 9857dc0996ae..3f178fda6490 100644 --- a/src/Cli/dotnet/Program.cs +++ b/src/Cli/dotnet/Program.cs @@ -142,9 +142,14 @@ internal static int ProcessArgs(string[] args, TimeSpan startupTime, ITelemetry ToolPathSentinelFileName))); if (parseResult.GetValue(Parser.DiagOption) && parseResult.IsDotnetBuiltInCommand()) { - Environment.SetEnvironmentVariable(CommandLoggingContext.Variables.Verbose, bool.TrueString); - CommandLoggingContext.SetVerbose(true); - Reporter.Reset(); + // We found --diagnostic or -d, but we still need to determine whether the option should + // be attached to the dotnet command or the subcommand. + if (args.DiagOptionPrecedesSubcommand(parseResult.RootSubCommandResult())) + { + Environment.SetEnvironmentVariable(CommandLoggingContext.Variables.Verbose, bool.TrueString); + CommandLoggingContext.SetVerbose(true); + Reporter.Reset(); + } } if (parseResult.HasOption(Parser.VersionOption) && parseResult.IsTopLevelDotnetCommand()) { diff --git a/src/Tests/dotnet.Tests/ParserTests/ParseResultExtensionsTests.cs b/src/Tests/dotnet.Tests/ParserTests/ParseResultExtensionsTests.cs index d768e5a31d62..be639fd0b2a6 100644 --- a/src/Tests/dotnet.Tests/ParserTests/ParseResultExtensionsTests.cs +++ b/src/Tests/dotnet.Tests/ParserTests/ParseResultExtensionsTests.cs @@ -33,7 +33,7 @@ public void RootSubCommandResultReturnsCorrectSubCommand(string input, string ex [Theory] [InlineData(new string[] { "dotnet", "build" }, new string[] { })] [InlineData(new string[] { "build" }, new string[] { })] - [InlineData(new string[] { "dotnet", "test", "-d" }, new string[] { })] + [InlineData(new string[] { "dotnet", "test", "-d" }, new string[] { "-d" })] [InlineData(new string[] { "dotnet", "publish", "-o", "foo" }, new string[] { "-o", "foo" })] [InlineData(new string[] { "publish", "-o", "foo" }, new string[] { "-o", "foo" })] [InlineData(new string[] { "dotnet", "add", "package", "-h" }, new string[] { "package", "-h" })] From 8d66a0bff46d8972b9d74b4faf9bb6865d0156c1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 21 Nov 2023 19:32:43 -0800 Subject: [PATCH 302/550] Update to the RTM release build (#36870) Co-authored-by: Jason Zhai --- NuGet.config | 20 +++++++ eng/Version.Details.xml | 128 ++++++++++++++++++++-------------------- eng/Versions.props | 16 ++--- 3 files changed, 92 insertions(+), 72 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d1f515b54b9..9f174959e0d6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,9 +6,15 @@ + + + + + + @@ -19,6 +25,9 @@ + + + @@ -43,10 +52,21 @@ + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50f130fe2a2e..8d96f99033e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,13 +107,13 @@ https://github.com/dotnet/roslyn 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://github.com/nuget/nuget.client @@ -213,69 +213,69 @@ 11ad607efb2b31c5e1b906303fcd70341e9d5206 - https://github.com/dotnet/windowsdesktop - 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - https://github.com/dotnet/windowsdesktop - 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 4fa7338ac4da08dd24c06a0fb4217e6b68f261f9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/wpf - daef397783c969da29b77e4b4021d38faafbd575 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://github.com/dotnet/razor @@ -290,21 +290,21 @@ https://github.com/dotnet/razor 630d8260fc1c00341a89c8e794fb47ceeb86c148 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - 9e7a25f270182a1b4413583086166ab0abfbbf19 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 470c80e3493f..987b16c35963 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,13 +148,13 @@ - 8.0.0-rtm.23523.8 - 8.0.0-rtm.23523.8 - 8.0.0-rtm.23523.8 - 8.0.0-rtm.23523.8 - 8.0.0-rtm.23523.8 - 8.0.0-rtm.23523.8 - 8.0.0-rtm.23523.8 + 8.0.0 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0 @@ -164,7 +164,7 @@ - 8.0.0-rtm.23524.4 + 8.0.0-rtm.23531.4 From a826cece0af3f5b1cfd6acf08559761773b6acb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Nov 2023 13:22:04 +0000 Subject: [PATCH 303/550] Update dependencies from https://github.com/dotnet/templating build 20231115.3 Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.200-preview.23558.10 -> To Version 8.0.200-preview.23565.3 From 85a319c6e55ff7e70cd33365b0e842f01925796a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:11:54 +0000 Subject: [PATCH 304/550] [release/8.0.2xx] Update dependencies from nuget/nuget.client (#37103) [release/8.0.2xx] Update dependencies from nuget/nuget.client --- NuGet.config | 18 ------------ eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 3 files changed, 43 insertions(+), 61 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f174959e0d6..53cfaed682a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,15 +6,9 @@ - - - - - - @@ -25,9 +19,6 @@ - - - @@ -53,20 +44,11 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d96f99033e1..27c9f21c0a43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 - + https://github.com/nuget/nuget.client - d85c6ea4588c5b4f2b4a4d7bf8073837fb308f58 + c22b9f4af1a7371e1a6b4eb82d924d028171aee1 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 987b16c35963..fbc23b26a517 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.39 - 6.9.0-preview.1.39 + 6.9.0-preview.1.40 + 6.9.0-preview.1.40 6.0.0-rc.278 - 6.9.0-preview.1.39 - 6.9.0-preview.1.39 - 6.9.0-preview.1.39 - 6.9.0-preview.1.39 - 6.9.0-preview.1.39 - 6.9.0-preview.1.39 - 6.9.0-preview.1.39 - 6.9.0-preview.1.39 - 6.9.0-preview.1.39 + 6.9.0-preview.1.40 + 6.9.0-preview.1.40 + 6.9.0-preview.1.40 + 6.9.0-preview.1.40 + 6.9.0-preview.1.40 + 6.9.0-preview.1.40 + 6.9.0-preview.1.40 + 6.9.0-preview.1.40 + 6.9.0-preview.1.40 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 57767b3a0ccc542fe1dbbf876b2cd8ab2db6c730 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 22 Nov 2023 19:12:10 +0000 Subject: [PATCH 305/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#37104) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27c9f21c0a43..f50e3797503d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 38bd5f4b15da70fce0491881c3f0818833f36261 + f4b2350acc97e8e29e0d8498a082b9f91115f0b6 - + https://github.com/dotnet/msbuild - 38bd5f4b15da70fce0491881c3f0818833f36261 + f4b2350acc97e8e29e0d8498a082b9f91115f0b6 - + https://github.com/dotnet/msbuild - 38bd5f4b15da70fce0491881c3f0818833f36261 + f4b2350acc97e8e29e0d8498a082b9f91115f0b6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fbc23b26a517..6e092e10e674 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23571-01 + 17.9.0-preview-23572-01 $(MicrosoftBuildPackageVersion) - 7.0.0-preview.23571.2 - 7.0.0-preview.23571.2 - 7.0.0-preview.23571.2 + 7.0.0-preview.23571.4 + 7.0.0-preview.23571.4 + 7.0.0-preview.23571.4 From 90999676d7dc4c9f5bae00004afca07bdad8d855 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Wed, 22 Nov 2023 13:50:01 -0800 Subject: [PATCH 307/550] Use CustomAfterDBP --- .../Microsoft.NET.Build.Tasks/sdk/Sdk.props | 52 +------------------ .../sdk/UseArtifactsOutputPath.props | 35 +++++++++++++ 2 files changed, 36 insertions(+), 51 deletions(-) create mode 100644 src/Tasks/Microsoft.NET.Build.Tasks/sdk/UseArtifactsOutputPath.props diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props index 06756f0f4172..547b2c13aae5 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props @@ -30,58 +30,8 @@ Copyright (c) .NET Foundation. All rights reserved. Similar to the property above, it must be set here. --> true - - - - - - - true - - - <_DirectoryBuildPropsFile Condition="'$(_DirectoryBuildPropsFile)' == ''">Directory.Build.props - <_DirectoryBuildPropsBasePath Condition="'$(_DirectoryBuildPropsBasePath)' == ''">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), '$(_DirectoryBuildPropsFile)')) - $([System.IO.Path]::Combine('$(_DirectoryBuildPropsBasePath)', '$(_DirectoryBuildPropsFile)')) - - - - - - - - - - false - - - - - - - true - $(MSBuildProjectName) - - - - $(ArtifactsPath)\obj\$(ArtifactsProjectName)\ - $(ArtifactsPath)\obj\ - - - - <_ArtifactsPathSetEarly>true + $(MSBuildThisFileDirectory)UseArtifactsOutputPath.props diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/UseArtifactsOutputPath.props b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/UseArtifactsOutputPath.props new file mode 100644 index 000000000000..1dd11c8d49ad --- /dev/null +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/UseArtifactsOutputPath.props @@ -0,0 +1,35 @@ + + + + + + + true + $(MSBuildProjectName) + + + + $(ArtifactsPath)\obj\$(ArtifactsProjectName)\ + $(ArtifactsPath)\obj\ + + + + + <_ArtifactsPathSetEarly>true + + From a87bb639f71a3c7bd96865c932d7739ef2e7b2c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Nov 2023 13:28:12 +0000 Subject: [PATCH 308/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.43 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.40 -> To Version 6.9.0-preview.1.43 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17bcb234915d..37501aa99e5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 - + https://github.com/nuget/nuget.client - c22b9f4af1a7371e1a6b4eb82d924d028171aee1 + 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 4e079ac09095..e2062f62f520 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.40 - 6.9.0-preview.1.40 + 6.9.0-preview.1.43 + 6.9.0-preview.1.43 6.0.0-rc.278 - 6.9.0-preview.1.40 - 6.9.0-preview.1.40 - 6.9.0-preview.1.40 - 6.9.0-preview.1.40 - 6.9.0-preview.1.40 - 6.9.0-preview.1.40 - 6.9.0-preview.1.40 - 6.9.0-preview.1.40 - 6.9.0-preview.1.40 + 6.9.0-preview.1.43 + 6.9.0-preview.1.43 + 6.9.0-preview.1.43 + 6.9.0-preview.1.43 + 6.9.0-preview.1.43 + 6.9.0-preview.1.43 + 6.9.0-preview.1.43 + 6.9.0-preview.1.43 + 6.9.0-preview.1.43 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 206563edcb652787d5b232f94e0193cabf74c38a Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Thu, 23 Nov 2023 09:05:37 -0600 Subject: [PATCH 309/550] test new behaviors and scenarios --- .../Tasks/ComputeDotnetBaseImageAndTag.cs | 124 ++++++++++++------ .../TargetsTests.cs | 90 ++++++++++--- 2 files changed, 151 insertions(+), 63 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs index 0ecd1a801938..79f30b91e782 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs @@ -51,7 +51,7 @@ public sealed class ComputeDotnetBaseImageAndTag : Microsoft.Build.Utilities.Tas /// If a project is self-contained then it includes a runtime, and so the runtime-deps image should be used. /// public bool IsSelfContained { get; set; } - + /// /// If a project is AOT-published then not only is it self-contained, but it can also remove some other deps - we can use the dotnet/nightly/runtime-deps variant here aot /// @@ -60,7 +60,7 @@ public sealed class ComputeDotnetBaseImageAndTag : Microsoft.Build.Utilities.Tas /// /// If the project is AOT'd the aot image variant doesn't contain ICU and TZData, so we use this flag to see if we need to use the `-extra` variant that does contain those packages. /// - public bool UsesInvariantGlobalization { get; set;} + public bool UsesInvariantGlobalization { get; set; } /// /// If set, this expresses a preference for a variant of the container image that we infer for a project. @@ -101,56 +101,95 @@ public override bool Execute() private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository, [NotNullWhen(true)] out string? tag) { - var baseVersionPart = ComputeVersionPart(); - Log.LogMessage("Computed base version tag of {0} from TFM {1} and SDK {2}", baseVersionPart, TargetFrameworkVersion, SdkVersion); - if (baseVersionPart is null) { - repository = null; - tag = null; - return false; - } - - var detectedRepository = (NeedsNightlyImages, IsSelfContained, IsAspNetCoreProject) switch { - (true, true, _) when AllowsExperimentalTagInference => "dotnet/nightly/runtime-deps", - (_, true, _) => "dotnet/runtime-deps", - (_, _, true) => "dotnet/aspnet", - (_, _, false) => "dotnet/runtime" - }; - Log.LogMessage("Chose base image repository {0}", detectedRepository); - repository = detectedRepository; - tag = baseVersionPart; - - if (!string.IsNullOrWhiteSpace(ContainerFamily)) + if (ComputeVersionPart() is (string baseVersionPart, bool versionAllowsUsingAOTAndExtrasImages)) { - // for the inferred image tags, 'family' aka 'flavor' comes after the 'version' portion (including any preview/rc segments). - // so it's safe to just append here - tag += $"-{ContainerFamily}"; - return true; - } - else - { - tag += (IsAotPublished, UsesInvariantGlobalization, IsMuslRID) switch + Log.LogMessage("Computed base version tag of {0} from TFM {1} and SDK {2}", baseVersionPart, TargetFrameworkVersion, SdkVersion); + if (baseVersionPart is null) + { + repository = null; + tag = null; + return false; + } + + var detectedRepository = (NeedsNightlyImages, IsSelfContained, IsAspNetCoreProject) switch { - (true, false, false) => "-jammy-chiseled-extra", - (true, false, true) => "-alpine-extra", - (true, true, false) => "-jammy-chiseled-aot", - (true, true, true) => "-alpine-aot", - (false, false, true) => "-alpine", - _ => "" + (true, true, _) when AllowsExperimentalTagInference && versionAllowsUsingAOTAndExtrasImages => "dotnet/nightly/runtime-deps", + (_, true, _) => "dotnet/runtime-deps", + (_, _, true) => "dotnet/aspnet", + (_, _, false) => "dotnet/runtime" }; - Log.LogMessage("Selected base image tag {0}", tag); - return true; + Log.LogMessage("Chose base image repository {0}", detectedRepository); + repository = detectedRepository; + tag = baseVersionPart; + + if (!string.IsNullOrWhiteSpace(ContainerFamily)) + { + // for the inferred image tags, 'family' aka 'flavor' comes after the 'version' portion (including any preview/rc segments). + // so it's safe to just append here + tag += $"-{ContainerFamily}"; + return true; + } + else + { + if (!versionAllowsUsingAOTAndExtrasImages) + { + tag += IsMuslRID switch + { + true => "-alpine", + false => "" // TODO: should we default here to chiseled iamges for < 8 apps? + }; + Log.LogMessage("Selected base image tag {0}", tag); + return true; + } + else + { + // chose the base OS + tag += IsMuslRID switch + { + true => "-alpine", + // default to chiseled for AOT, non-musl Apps + false when IsAotPublished => "-jammy-chiseled", // TODO: should we default here to jammy-chiseled for non-musl RIDs? + // default to jammy for non-AOT, non-musl Apps + false => "" + }; + + // now choose the variant, if any - if globalization then -extra, else -aot + tag += (IsAotPublished, UsesInvariantGlobalization) switch + { + (true, false) => "-extra", + (true, true) => "-aot", + _ => "" + }; + Log.LogMessage("Selected base image tag {0}", tag); + return true; + } + } + } + else + { + repository = null; + tag = null; + return false; } } - private string? ComputeVersionPart() + private (string, bool)? ComputeVersionPart() { if (SemanticVersion.TryParse(TargetFrameworkVersion, out var tfm) && tfm.Major < FirstVersionWithNewTaggingScheme) { - return $"{tfm.Major}.{tfm.Minor}"; + // < 8 TFMs don't support the -aot and -extras images + return ($"{tfm.Major}.{tfm.Minor}", false); } else if (SemanticVersion.TryParse(SdkVersion, out var version)) { - return ComputeVersionInternal(version, tfm); + if (ComputeVersionInternal(version, tfm) is string majMinor) + { + return (majMinor, true); + } + else + { + return null; + } } else { @@ -180,7 +219,8 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository, return baseImageTag; } - private string? DetermineLabelBasedOnChannel(int major, int minor, string[] releaseLabels) { + private string? DetermineLabelBasedOnChannel(int major, int minor, string[] releaseLabels) + { var channel = releaseLabels.Length > 0 ? releaseLabels[0] : null; switch (channel) { @@ -201,5 +241,5 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository, Log.LogError(Resources.Strings.InvalidSdkPrereleaseVersion, channel); return null; }; - } + } } diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs index 434d4f1eca34..b4cd2201d253 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs @@ -30,7 +30,8 @@ public void CanDeferEntrypoint(string selfContainedPropertyName, bool selfContai } [Fact] - public void CanDeferToContainerImageNameWhenPresent() { + public void CanDeferToContainerImageNameWhenPresent() + { var customImageName = "my-container-app"; var (project, logger, d) = ProjectInitializer.InitProject(new() { @@ -38,7 +39,7 @@ public void CanDeferToContainerImageNameWhenPresent() { }); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { ComputeContainerConfig }, new []{ logger }); + instance.Build(new[] { ComputeContainerConfig }, new[] { logger }); logger.Warnings.Should().HaveCount(1, "a warning for the use of the old ContainerImageName property should have been created"); logger.Warnings[0].Code.Should().Be(KnownStrings.ErrorCodes.CONTAINER003); Assert.Equal(customImageName, instance.GetPropertyValue(ContainerRepository)); @@ -58,7 +59,7 @@ public void CanNormalizeInputContainerNames(string projectName, string expectedC }, projectName: $"{nameof(CanNormalizeInputContainerNames)}_{projectName}_{expectedContainerImageName}_{shouldPass}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { ComputeContainerConfig }, new[]{ logger }, null, out var outputs).Should().Be(shouldPass, String.Join(Environment.NewLine, logger.AllMessages)); + instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs).Should().Be(shouldPass, String.Join(Environment.NewLine, logger.AllMessages)); Assert.Equal(expectedContainerImageName, instance.GetPropertyValue(ContainerRepository)); } @@ -78,7 +79,7 @@ public void CanWarnOnInvalidSDKVersions(string sdkVersion, bool isAllowed) }, projectName: $"{nameof(CanWarnOnInvalidSDKVersions)}_{sdkVersion}_{isAllowed}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{"_ContainerVerifySDKVersion"}, new[] { logger }, null, out var outputs).Should().Be(isAllowed); + instance.Build(new[] { "_ContainerVerifySDKVersion" }, new[] { logger }, null, out var outputs).Should().Be(isAllowed); var derivedIsAllowed = Boolean.Parse(project.GetProperty("_IsSDKContainerAllowedVersion").EvaluatedValue); if (isAllowed) { @@ -103,7 +104,8 @@ public void GetsConventionalLabelsByDefault(bool shouldEvaluateLabels) }, projectName: $"{nameof(GetsConventionalLabelsByDefault)}_{shouldEvaluateLabels}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { ComputeContainerConfig }, new [] { logger }, null, out var outputs).Should().BeTrue("Build should have succeeded"); + var success = instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs); + success.Should().BeTrue("Build should have succeeded"); if (shouldEvaluateLabels) { instance.GetItems(ContainerLabel).Should().NotBeEmpty("Should have evaluated some labels by default"); @@ -132,7 +134,7 @@ public void ShouldNotIncludeSourceControlLabelsUnlessUserOptsIn(bool includeSour }, projectName: $"{nameof(ShouldNotIncludeSourceControlLabelsUnlessUserOptsIn)}_{includeSourceControl}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[] { ComputeContainerConfig }, new [] { logger }, null, out var outputs).Should().BeTrue("Build should have succeeded but failed due to {0}", String.Join("\n", logger.AllMessages)); + instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs).Should().BeTrue("Build should have succeeded but failed due to {0}", String.Join("\n", logger.AllMessages)); var labels = instance.GetItems(ContainerLabel); if (includeSourceControl) { @@ -180,7 +182,7 @@ public void CanComputeTagsForSupportedSDKVersions(string sdkVersion, string tfm, }, projectName: $"{nameof(CanComputeTagsForSupportedSDKVersions)}_{sdkVersion}_{tfm}_{expectedTag}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{ComputeContainerBaseImage}, new [] { logger }, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { ComputeContainerBaseImage }, new[] { logger }, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); var computedTag = instance.GetProperty(ContainerBaseImage).EvaluatedValue; computedTag.Should().EndWith(expectedTag); } @@ -204,7 +206,7 @@ public void CanComputeContainerUser(string tfm, string rid, string expectedUser) }, projectName: $"{nameof(CanComputeContainerUser)}_{tfm}_{rid}_{expectedUser}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{ComputeContainerConfig}, new [] { logger }, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { ComputeContainerConfig }, new[] { logger }, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); var computedTag = instance.GetProperty("ContainerUser")?.EvaluatedValue; computedTag.Should().Be(expectedUser); } @@ -223,7 +225,7 @@ public void WindowsUsersGetLinuxContainers(string sdkPortableRid, string expecte }, projectName: $"{nameof(WindowsUsersGetLinuxContainers)}_{sdkPortableRid}_{expectedRid}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{ComputeContainerConfig}, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { ComputeContainerConfig }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); var computedRid = instance.GetProperty(KnownStrings.Properties.ContainerRuntimeIdentifier)?.EvaluatedValue; computedRid.Should().Be(expectedRid); } @@ -245,25 +247,29 @@ public void CanTakeContainerBaseFamilyIntoAccount(string sdkVersion, string tfmM }, projectName: $"{nameof(CanTakeContainerBaseFamilyIntoAccount)}_{sdkVersion}_{tfmMajMin}_{containerFamily}_{expectedTag}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{ ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; computedBaseImageTag.Should().EndWith(expectedTag); } - [InlineData("linux-musl-x64", "mcr.microsoft.com/dotnet/runtime:8.0-alpine")] - [InlineData("linux-x64", "mcr.microsoft.com/dotnet/runtime:8.0")] + [InlineData("v6.0", "linux-musl-x64", "mcr.microsoft.com/dotnet/runtime:6.0-alpine")] + [InlineData("v6.0", "linux-x64", "mcr.microsoft.com/dotnet/runtime:6.0")] + [InlineData("v7.0", "linux-musl-x64", "mcr.microsoft.com/dotnet/runtime:7.0-alpine")] + [InlineData("v7.0", "linux-x64", "mcr.microsoft.com/dotnet/runtime:7.0")] + [InlineData("v8.0", "linux-musl-x64", "mcr.microsoft.com/dotnet/runtime:8.0-alpine")] + [InlineData("v8.0", "linux-x64", "mcr.microsoft.com/dotnet/runtime:8.0")] [Theory] - public void MuslRidsGetAlpineContainers(string rid, string expectedImage) + public void MuslRidsGetAlpineContainers(string tfm, string rid, string expectedImage) { - var (project, logger, d) = ProjectInitializer.InitProject(new() + var (project, logger, d) = ProjectInitializer.InitProject(new() { ["NetCoreSdkVersion"] = "8.0.100", - ["TargetFrameworkVersion"] = "v8.0", + ["TargetFrameworkVersion"] = tfm, [KnownStrings.Properties.ContainerRuntimeIdentifier] = rid, - }, projectName: $"{nameof(MuslRidsGetAlpineContainers)}_{rid}_{expectedImage}"); + }, projectName: $"{nameof(MuslRidsGetAlpineContainers)}_{tfm}_{rid}_{expectedImage}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{ ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; computedBaseImageTag.Should().BeEquivalentTo(expectedImage); } @@ -273,7 +279,7 @@ public void MuslRidsGetAlpineContainers(string rid, string expectedImage) [Theory] public void AOTAppsGetAOTImages(string rid, string expectedImage) { - var (project, logger, d) = ProjectInitializer.InitProject(new() + var (project, logger, d) = ProjectInitializer.InitProject(new() { ["NetCoreSdkVersion"] = "8.0.100", ["TargetFrameworkVersion"] = "v8.0", @@ -284,7 +290,7 @@ public void AOTAppsGetAOTImages(string rid, string expectedImage) }, projectName: $"{nameof(AOTAppsGetAOTImages)}_{rid}_{expectedImage}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{ ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; computedBaseImageTag.Should().BeEquivalentTo(expectedImage); } @@ -294,7 +300,7 @@ public void AOTAppsGetAOTImages(string rid, string expectedImage) [Theory] public void AOTAppsWithCulturesGetExtraImages(string rid, string expectedImage) { - var (project, logger, d) = ProjectInitializer.InitProject(new() + var (project, logger, d) = ProjectInitializer.InitProject(new() { ["NetCoreSdkVersion"] = "8.0.100", ["TargetFrameworkVersion"] = "v8.0", @@ -305,7 +311,49 @@ public void AOTAppsWithCulturesGetExtraImages(string rid, string expectedImage) }, projectName: $"{nameof(AOTAppsWithCulturesGetExtraImages)}_{rid}_{expectedImage}"); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - instance.Build(new[]{ ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } + + [InlineData("linux-musl-x64", "mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine")] + [InlineData("linux-x64", "mcr.microsoft.com/dotnet/runtime-deps:7.0")] + [Theory] + public void AOTAppsLessThan8DoNotGetAOTImages(string rid, string expectedImage) + { + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = "8.0.100", + ["TargetFrameworkVersion"] = "v7.0", + [KnownStrings.Properties.ContainerRuntimeIdentifier] = rid, + [KnownStrings.Properties.PublishSelfContained] = true.ToString(), + [KnownStrings.Properties.PublishAot] = true.ToString(), + [KnownStrings.Properties.InvariantGlobalization] = true.ToString(), + }, projectName: $"{nameof(AOTAppsLessThan8DoNotGetAOTImages)}_{rid}_{expectedImage}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } + + [InlineData("linux-musl-x64", "mcr.microsoft.com/dotnet/runtime-deps:7.0-alpine")] + [InlineData("linux-x64", "mcr.microsoft.com/dotnet/runtime-deps:7.0")] + [Theory] + public void AOTAppsLessThan8WithCulturesDoNotGetExtraImages(string rid, string expectedImage) + { + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = "8.0.100", + ["TargetFrameworkVersion"] = "v7.0", + [KnownStrings.Properties.ContainerRuntimeIdentifier] = rid, + [KnownStrings.Properties.PublishSelfContained] = true.ToString(), + [KnownStrings.Properties.PublishAot] = true.ToString(), + [KnownStrings.Properties.InvariantGlobalization] = false.ToString() + }, projectName: $"{nameof(AOTAppsWithCulturesGetExtraImages)}_{rid}_{expectedImage}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; computedBaseImageTag.Should().BeEquivalentTo(expectedImage); } From 9a1c3d29a89ade3c41b5f8ca401b6d06b273e008 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Nov 2023 13:22:33 +0000 Subject: [PATCH 310/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.45 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.43 -> To Version 6.9.0-preview.1.45 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37501aa99e5d..6cba44d3e10f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/nuget/nuget.client - 229ddddf43a8b4d9a4a796d6b36736f87b8f0e16 + 707c46e558b2b027d7ae942028c369e26545f10a https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index e2062f62f520..4ab14bb1b010 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.43 - 6.9.0-preview.1.43 + 6.9.0-preview.1.45 + 6.9.0-preview.1.45 6.0.0-rc.278 - 6.9.0-preview.1.43 - 6.9.0-preview.1.43 - 6.9.0-preview.1.43 - 6.9.0-preview.1.43 - 6.9.0-preview.1.43 - 6.9.0-preview.1.43 - 6.9.0-preview.1.43 - 6.9.0-preview.1.43 - 6.9.0-preview.1.43 + 6.9.0-preview.1.45 + 6.9.0-preview.1.45 + 6.9.0-preview.1.45 + 6.9.0-preview.1.45 + 6.9.0-preview.1.45 + 6.9.0-preview.1.45 + 6.9.0-preview.1.45 + 6.9.0-preview.1.45 + 6.9.0-preview.1.45 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From c3200e307222dbd88b8183151355928fc44bcfd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Nov 2023 13:22:44 +0000 Subject: [PATCH 311/550] Update dependencies from https://github.com/dotnet/msbuild build 20231124.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23572-01 -> To Version 17.9.0-preview-23574-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37501aa99e5d..32386bc5f3ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - f4b2350acc97e8e29e0d8498a082b9f91115f0b6 + 7b37a280a13c01bbaeeb39b9c018a5ac7a728898 - + https://github.com/dotnet/msbuild - f4b2350acc97e8e29e0d8498a082b9f91115f0b6 + 7b37a280a13c01bbaeeb39b9c018a5ac7a728898 - + https://github.com/dotnet/msbuild - f4b2350acc97e8e29e0d8498a082b9f91115f0b6 + 7b37a280a13c01bbaeeb39b9c018a5ac7a728898 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index e2062f62f520..dc21b04df8f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23572-01 + 17.9.0-preview-23574-01 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23570.1 + 12.8.0-beta.23574.3 From b392c37fc6e874e40bf4d3752f46d930fa70a837 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Nov 2023 13:20:50 +0000 Subject: [PATCH 313/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.45 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.43 -> To Version 6.9.0-preview.1.45 From 8c511f8db9a9a33ede21ff06683989e3fe7317b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Nov 2023 13:21:06 +0000 Subject: [PATCH 314/550] Update dependencies from https://github.com/dotnet/msbuild build 20231124.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23572-01 -> To Version 17.9.0-preview-23574-01 From 118bf00b351e85dc87e02f445253beed20bfb641 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Nov 2023 13:21:34 +0000 Subject: [PATCH 315/550] Update dependencies from https://github.com/dotnet/fsharp build 20231124.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23570.1 -> To Version 8.0.200-beta.23574.3 From ead54a3e428e3bb7bfa15f3c7e1df2dca0f14dbf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Nov 2023 13:19:18 +0000 Subject: [PATCH 316/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.45 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.43 -> To Version 6.9.0-preview.1.45 From 585f3895b6926d23f2deea89da84153fe74ee04a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Nov 2023 13:19:33 +0000 Subject: [PATCH 317/550] Update dependencies from https://github.com/dotnet/msbuild build 20231124.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23572-01 -> To Version 17.9.0-preview-23574-01 From 951e9630ceeab6231835711215ae3676ffbf10a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Nov 2023 13:20:02 +0000 Subject: [PATCH 318/550] Update dependencies from https://github.com/dotnet/fsharp build 20231124.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23570.1 -> To Version 8.0.200-beta.23574.3 From 2bf7d17a4fb46aeaed428c95744077acd07f259e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 18:32:10 +0000 Subject: [PATCH 319/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#37153) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d31da12197f8..d4e132e342fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 7b37a280a13c01bbaeeb39b9c018a5ac7a728898 + 31108edc1f9cafc0103ed467906a31ddd8f914fa - + https://github.com/dotnet/msbuild - 7b37a280a13c01bbaeeb39b9c018a5ac7a728898 + 31108edc1f9cafc0103ed467906a31ddd8f914fa - + https://github.com/dotnet/msbuild - 7b37a280a13c01bbaeeb39b9c018a5ac7a728898 + 31108edc1f9cafc0103ed467906a31ddd8f914fa https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f51fd3e55fef..7b2da5089ba0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23574-01 + 17.9.0-preview-23577-01 $(MicrosoftBuildPackageVersion) - 17.9.0-preview-23565-01 - 17.9.0-preview-23565-01 - 17.9.0-preview-23565-01 + 17.9.0-preview-23574-01 + 17.9.0-preview-23574-01 + 17.9.0-preview-23574-01 diff --git a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs index 33d8e9437480..03da9ca92fb6 100644 --- a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs @@ -142,7 +142,7 @@ private static CliOption CreateBlameHangDumpOption() public static readonly CliOption NoLogoOption = new ForwardedOption("--nologo") { Description = LocalizableStrings.CmdNoLogo - }.ForwardAs("-property:VSTestNoLogo=nologo"); + }.ForwardAs("-property:VSTestNoLogo=true"); public static readonly CliOption NoRestoreOption = CommonOptions.NoRestoreOption; From 32df09b43296f4ea292638f608694c09d56c245f Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 27 Nov 2023 15:16:06 -0600 Subject: [PATCH 321/550] parse auth scheme case-insensitively --- .../AuthHandshakeMessageHandler.cs | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs b/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs index 94488fa74339..e47b96713991 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs @@ -62,22 +62,33 @@ private static bool TryParseAuthenticationInfo(HttpResponseMessage msg, [NotNull } AuthenticationHeaderValue header = authenticateHeader.First(); - if (header is { Scheme: "Bearer" or "Basic", Parameter: string bearerArgs }) + + if (header.Scheme is not null) { scheme = header.Scheme; - var keyValues = ParseBearerArgs(bearerArgs); + var keyValues = ParseBearerArgs(header.Parameter); + if (keyValues is null) + { + return false; + } - var result = scheme switch + if (header.Scheme.Equals("Basic", StringComparison.OrdinalIgnoreCase)) + { + return TryParseBasicAuthInfo(keyValues, msg.RequestMessage!.RequestUri!, out bearerAuthInfo); + } + else if (header.Scheme.Equals("Bearer", StringComparison.OrdinalIgnoreCase)) + { + return TryParseBearerAuthInfo(keyValues, out bearerAuthInfo); + } + else { - "Bearer" => TryParseBearerAuthInfo(keyValues, out bearerAuthInfo), - "Basic" => TryParseBasicAuthInfo(keyValues, msg.RequestMessage!.RequestUri!, out bearerAuthInfo), - _ => false - }; - return result; + return false; + } } return false; - static bool TryParseBearerAuthInfo(Dictionary authValues, [NotNullWhen(true)] out AuthInfo? authInfo) { + static bool TryParseBearerAuthInfo(Dictionary authValues, [NotNullWhen(true)] out AuthInfo? authInfo) + { if (authValues.TryGetValue("realm", out string? realm)) { string? service = null; @@ -87,19 +98,25 @@ static bool TryParseBearerAuthInfo(Dictionary authValues, [NotNu authInfo = new AuthInfo(realm, service, scope); return true; } - else { + else + { authInfo = null; return false; } } - static bool TryParseBasicAuthInfo(Dictionary authValues, Uri requestUri, out AuthInfo? authInfo) { + static bool TryParseBasicAuthInfo(Dictionary authValues, Uri requestUri, out AuthInfo? authInfo) + { authInfo = null; return true; } - static Dictionary ParseBearerArgs(string bearerHeaderArgs) + static Dictionary? ParseBearerArgs(string? bearerHeaderArgs) { + if (bearerHeaderArgs is null) + { + return null; + } Dictionary keyValues = new(); foreach (Match match in BearerParameterSplitter().Matches(bearerHeaderArgs)) { From 80f9de562a725ad281ee1df406c5b8ca4fe9cc57 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Sat, 4 Nov 2023 19:32:39 +0100 Subject: [PATCH 322/550] use blazor template instead of Razor Pages template in dotnet new command --- .../Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs index e6661ed191dc..3c93b7a3837c 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs @@ -253,8 +253,7 @@ private async Task> GetCuratedListAsync(CancellationT "Microsoft.Common.Console", //console "Microsoft.Common.WPF", //wpf "Microsoft.Common.WinForms", //winforms - "Microsoft.Web.Blazor.Server", //blazorserver - "Microsoft.Web.RazorPages" //webapp + "Microsoft.Web.Blazor" //blazor }; IReadOnlyList templates = await _templatePackageManager.GetTemplatesAsync(cancellationToken).ConfigureAwait(false); From 451cb6c42b41b2ffddae1b330daf2acbdb3c8e72 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Sat, 4 Nov 2023 20:52:25 +0100 Subject: [PATCH 323/550] fix tests --- ...onsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt | 2 +- ...tionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt | 2 +- ...sTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt | 2 +- .../DotnetNewTests.CanShowBasicInfo.Linux.verified.txt | 2 +- .../Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt | 2 +- .../DotnetNewTests.CanShowBasicInfo.Windows.verified.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt index b90e928d0590..c676b946120e 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt @@ -16,7 +16,7 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: Template Name Short Name Language Tags %TABLE HEADER DELIMITER% -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library Console App console [C#],F#,VB Common/Console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt index b90e928d0590..c676b946120e 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt @@ -16,7 +16,7 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: Template Name Short Name Language Tags %TABLE HEADER DELIMITER% -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library Console App console [C#],F#,VB Common/Console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt index 87f2dd4c66b8..9b9380248dca 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt @@ -16,7 +16,7 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: Template Name Short Name Language Tags %TABLE HEADER DELIMITER% -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library Console App console [C#],F#,VB Common/Console Windows Forms App winforms [C#],VB Common/WinForms diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt index 4b6a6c94ff47..4ffe30e84f77 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt @@ -3,7 +3,7 @@ Common templates are: Template Name Short Name Language Tags -------------------- ------------ ---------- ------------------- -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library Console App console [C#],F#,VB Common/Console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt index 4b6a6c94ff47..4ffe30e84f77 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt @@ -3,7 +3,7 @@ Common templates are: Template Name Short Name Language Tags -------------------- ------------ ---------- ------------------- -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library Console App console [C#],F#,VB Common/Console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt index d04bbae178c0..5040f9a8df9d 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt @@ -3,7 +3,7 @@ Common templates are: Template Name Short Name Language Tags -------------------- ------------ ---------- ------------------- -ASP.NET Core Web App webapp,razor [C#] Web/MVC/Razor Pages +Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library Console App console [C#],F#,VB Common/Console Windows Forms App winforms [C#],VB Common/WinForms From c03b796a01fc65bce653555c27c80b018ab13a1a Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Sun, 5 Nov 2023 09:51:18 +0100 Subject: [PATCH 324/550] fix CanShowBasicInfo test --- .../DotnetNewTests.CanShowBasicInfo.Linux.verified.txt | 2 +- .../Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt | 2 +- .../DotnetNewTests.CanShowBasicInfo.Windows.verified.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt index 4ffe30e84f77..a162e54eaf92 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt @@ -2,7 +2,7 @@ Common templates are: Template Name Short Name Language Tags --------------------- ------------ ---------- ------------------- +-------------------- ------------ ---------- ---------------------- Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library Console App console [C#],F#,VB Common/Console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt index 4ffe30e84f77..a162e54eaf92 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt @@ -2,7 +2,7 @@ Common templates are: Template Name Short Name Language Tags --------------------- ------------ ---------- ------------------- +-------------------- ------------ ---------- ---------------------- Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library Console App console [C#],F#,VB Common/Console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt index 5040f9a8df9d..3fb16efb43e9 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt @@ -2,7 +2,7 @@ Common templates are: Template Name Short Name Language Tags --------------------- ------------ ---------- ------------------- +-------------------- ------------ ---------- ---------------------- Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library Console App console [C#],F#,VB Common/Console From 7a165dfddc204361e02c8601a139945b6f90790f Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Sun, 5 Nov 2023 10:24:00 +0100 Subject: [PATCH 325/550] fix CanShowBasicInfo test --- ...netNewTests.CanShowBasicInfo.Linux.verified.txt | 10 +++++----- ...otnetNewTests.CanShowBasicInfo.OSX.verified.txt | 10 +++++----- ...tNewTests.CanShowBasicInfo.Windows.verified.txt | 14 +++++++------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt index a162e54eaf92..f7a9797af697 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt @@ -1,11 +1,11 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags --------------------- ------------ ---------- ---------------------- -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Template Name Short Name Language Tags +-------------- ---------- ---------- ---------------------- +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console An example would be: dotnet new console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt index a162e54eaf92..f7a9797af697 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt @@ -1,11 +1,11 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags --------------------- ------------ ---------- ---------------------- -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Template Name Short Name Language Tags +-------------- ---------- ---------- ---------------------- +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console An example would be: dotnet new console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt index 3fb16efb43e9..11a07d87a2aa 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt @@ -1,13 +1,13 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags --------------------- ------------ ---------- ---------------------- -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -Windows Forms App winforms [C#],VB Common/WinForms -WPF Application wpf [C#],VB Common/WPF +Template Name Short Name Language Tags +----------------- ---------- ---------- ---------------------- +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +Windows Forms App winforms [C#],VB Common/WinForms +WPF Application wpf [C#],VB Common/WPF An example would be: dotnet new console From 9d7465b18e8877de714c2e27257d260d4d5474b6 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Sun, 5 Nov 2023 10:30:47 +0100 Subject: [PATCH 326/550] fix CanShowConfigWithDebugShowConfig test --- ...nShowConfigWithDebugShowConfig.Linux.verified.txt | 8 ++++---- ...CanShowConfigWithDebugShowConfig.OSX.verified.txt | 8 ++++---- ...howConfigWithDebugShowConfig.Windows.verified.txt | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt index c676b946120e..c59212585932 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt @@ -14,11 +14,11 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console An example would be: dotnet new console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt index c676b946120e..c59212585932 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt @@ -14,11 +14,11 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console An example would be: dotnet new console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt index 9b9380248dca..4dc58e26060f 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt @@ -14,13 +14,13 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -Windows Forms App winforms [C#],VB Common/WinForms -WPF Application wpf [C#],VB Common/WPF +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +Windows Forms App winforms [C#],VB Common/WinForms +WPF Application wpf [C#],VB Common/WPF An example would be: dotnet new console From 773348684854dbc4ccf69cc8b3093d4686eb96f5 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Thu, 23 Nov 2023 13:23:51 +0100 Subject: [PATCH 327/550] add spaces --- ...ts.CanShowConfigWithDebugShowConfig.Linux.verified.txt | 4 ++-- ...ests.CanShowConfigWithDebugShowConfig.OSX.verified.txt | 4 ++-- ....CanShowConfigWithDebugShowConfig.Windows.verified.txt | 8 ++++---- .../DotnetNewTests.CanShowBasicInfo.Linux.verified.txt | 4 ++-- .../DotnetNewTests.CanShowBasicInfo.OSX.verified.txt | 4 ++-- .../DotnetNewTests.CanShowBasicInfo.Windows.verified.txt | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt index c59212585932..624a762ad7a4 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt @@ -17,8 +17,8 @@ Common templates are: Template Name Short Name Language Tags %TABLE HEADER DELIMITER% Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console An example would be: dotnet new console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt index c59212585932..624a762ad7a4 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt @@ -17,8 +17,8 @@ Common templates are: Template Name Short Name Language Tags %TABLE HEADER DELIMITER% Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console An example would be: dotnet new console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt index 4dc58e26060f..4c2fea227658 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt @@ -17,10 +17,10 @@ Common templates are: Template Name Short Name Language Tags %TABLE HEADER DELIMITER% Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -Windows Forms App winforms [C#],VB Common/WinForms -WPF Application wpf [C#],VB Common/WPF +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +Windows Forms App winforms [C#],VB Common/WinForms +WPF Application wpf [C#],VB Common/WPF An example would be: dotnet new console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt index f7a9797af697..51a2601e12e2 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt @@ -4,8 +4,8 @@ Common templates are: Template Name Short Name Language Tags -------------- ---------- ---------- ---------------------- Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console An example would be: dotnet new console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt index f7a9797af697..51a2601e12e2 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt @@ -4,8 +4,8 @@ Common templates are: Template Name Short Name Language Tags -------------- ---------- ---------- ---------------------- Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console An example would be: dotnet new console diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt index 11a07d87a2aa..59d4cc3ec567 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt @@ -4,10 +4,10 @@ Common templates are: Template Name Short Name Language Tags ----------------- ---------- ---------- ---------------------- Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -Windows Forms App winforms [C#],VB Common/WinForms -WPF Application wpf [C#],VB Common/WPF +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +Windows Forms App winforms [C#],VB Common/WinForms +WPF Application wpf [C#],VB Common/WPF An example would be: dotnet new console From 236f420116407c7245673ff44de865f349a7e6aa Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada Date: Thu, 23 Nov 2023 14:47:36 +0100 Subject: [PATCH 328/550] add more spaces --- ...onsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt | 2 +- ...tionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt | 2 +- ...sTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt | 2 +- .../DotnetNewTests.CanShowBasicInfo.Linux.verified.txt | 2 +- .../Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt | 2 +- .../DotnetNewTests.CanShowBasicInfo.Windows.verified.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt index 624a762ad7a4..640c3a5af928 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt @@ -14,7 +14,7 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt index 624a762ad7a4..640c3a5af928 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt @@ -14,7 +14,7 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt index 4c2fea227658..4bbeae77fd59 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt @@ -14,7 +14,7 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt index 51a2601e12e2..ae5a7b8a37f8 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt @@ -1,7 +1,7 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags -------------- ---------- ---------- ---------------------- Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt index 51a2601e12e2..ae5a7b8a37f8 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt @@ -1,7 +1,7 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags -------------- ---------- ---------- ---------------------- Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library diff --git a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt index 59d4cc3ec567..e0cb3b78ef7f 100644 --- a/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt +++ b/src/Tests/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt @@ -1,7 +1,7 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags ----------------- ---------- ---------- ---------------------- Blazor Web App blazor [C#] Web/Blazor/WebAssembly Class Library classlib [C#],F#,VB Common/Library From 39b4807837c986987f5399784e2b96a6e4d0eaab Mon Sep 17 00:00:00 2001 From: Mark Li Date: Tue, 28 Nov 2023 03:24:44 -0800 Subject: [PATCH 329/550] style fix --- src/Cli/dotnet/CommonOptions.cs | 7 ++++--- .../ToolInstallGlobalOrToolPathCommand.cs | 16 +++++++--------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs index 420de1bd4886..3a168ee13dba 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -23,7 +23,8 @@ internal static class CommonOptions new ForwardedOption("--verbosity", "-v") { Description = CommonLocalizableStrings.VerbosityOptionDescription, - HelpName = CommonLocalizableStrings.LevelArgumentName + HelpName = CommonLocalizableStrings.LevelArgumentName, + DefaultValueFactory = _ => VerbosityOptions.minimal }.ForwardAsSingle(o => $"-verbosity:{o}"); public static CliOption HiddenVerbosityOption = @@ -281,10 +282,10 @@ internal static CliArgument AddCompletions(this CliArgument argument, F public enum VerbosityOptions { - minimal, - m, quiet, q, + minimal, + m, normal, n, detailed, diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs index 911e7aa34483..5e7d08c6ce24 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs @@ -169,17 +169,15 @@ public override int Execute() { _environmentPathInstruction.PrintAddPathInstructionIfPathDoesNotExist(); } - if (_verbosity.IsQuiet()) + if (!_verbosity.IsQuiet()) { - return 0; + _reporter.WriteLine( + string.Format( + LocalizableStrings.InstallationSucceeded, + string.Join(", ", package.Commands.Select(c => c.Name)), + package.Id, + package.Version.ToNormalizedString()).Green()); } - _reporter.WriteLine( - string.Format( - LocalizableStrings.InstallationSucceeded, - string.Join(", ", package.Commands.Select(c => c.Name)), - package.Id, - package.Version.ToNormalizedString()).Green()); - return 0; } catch (Exception ex) when (InstallToolCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex)) From e41e5d4f9108e1ee6c847c22cbb3543885640e61 Mon Sep 17 00:00:00 2001 From: Mark Li Date: Tue, 28 Nov 2023 03:26:27 -0800 Subject: [PATCH 330/550] Style Fix --- .../dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs index 5e7d08c6ce24..5dad8a824c11 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs @@ -169,6 +169,7 @@ public override int Execute() { _environmentPathInstruction.PrintAddPathInstructionIfPathDoesNotExist(); } + if (!_verbosity.IsQuiet()) { _reporter.WriteLine( @@ -178,6 +179,7 @@ public override int Execute() package.Id, package.Version.ToNormalizedString()).Green()); } + return 0; } catch (Exception ex) when (InstallToolCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex)) From d934b8a22528283f4a4bb285a959627fc35c0b35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 13:33:14 +0000 Subject: [PATCH 331/550] Update dependencies from https://github.com/dotnet/msbuild build 20231128.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23577-01 -> To Version 17.9.0-preview-23578-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bffce803ea24..ce8654911360 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 31108edc1f9cafc0103ed467906a31ddd8f914fa + 5fcddc790f4eeaf953a3d283e39751dd0e1f2992 - + https://github.com/dotnet/msbuild - 31108edc1f9cafc0103ed467906a31ddd8f914fa + 5fcddc790f4eeaf953a3d283e39751dd0e1f2992 - + https://github.com/dotnet/msbuild - 31108edc1f9cafc0103ed467906a31ddd8f914fa + 5fcddc790f4eeaf953a3d283e39751dd0e1f2992 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d56a1928afc0..42f4aec3bc30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23577-01 + 17.9.0-preview-23578-04 $(MicrosoftBuildPackageVersion) - 17.9.0-preview-23574-01 - 17.9.0-preview-23574-01 - 17.9.0-preview-23574-01 + 17.9.0-preview-23578-03 + 17.9.0-preview-23578-03 + 17.9.0-preview-23578-03 From c4796f427ebae995690d41a82803f6b35c73cbb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 13:34:24 +0000 Subject: [PATCH 333/550] Update dependencies from https://github.com/dotnet/razor build 20231127.4 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23571.4 -> To Version 7.0.0-preview.23577.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bffce803ea24..e1dc7bcc5343 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - d377a1ab10aca62178d4ebe5e5f2130343e8b6cd + 6951c49bf4fc099dbbbc733e087c262329032590 - + https://github.com/dotnet/razor - d377a1ab10aca62178d4ebe5e5f2130343e8b6cd + 6951c49bf4fc099dbbbc733e087c262329032590 - + https://github.com/dotnet/razor - d377a1ab10aca62178d4ebe5e5f2130343e8b6cd + 6951c49bf4fc099dbbbc733e087c262329032590 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d56a1928afc0..5c99f5f01b02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23571.4 - 7.0.0-preview.23571.4 - 7.0.0-preview.23571.4 + 7.0.0-preview.23577.4 + 7.0.0-preview.23577.4 + 7.0.0-preview.23577.4 From abc1cff5be255554b50a89ee509e707a6d23d835 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Tue, 28 Nov 2023 09:07:05 -0600 Subject: [PATCH 334/550] unify comparisons across scheme names --- .../AuthHandshakeMessageHandler.cs | 84 ++++++++++--------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs b/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs index e47b96713991..10ff6c46a554 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs @@ -31,6 +31,8 @@ internal sealed partial class AuthHandshakeMessageHandler : DelegatingHandler /// Valid characters for this clientID are in the unicode range 20-7E /// private const string ClientID = "netsdkcontainers"; + private const string BasicAuthScheme = "Basic"; + private const string BearerAuthScheme = "Bearer"; private sealed record AuthInfo(string Realm, string? Service, string? Scope); @@ -72,11 +74,11 @@ private static bool TryParseAuthenticationInfo(HttpResponseMessage msg, [NotNull return false; } - if (header.Scheme.Equals("Basic", StringComparison.OrdinalIgnoreCase)) + if (header.Scheme.Equals(BasicAuthScheme, StringComparison.OrdinalIgnoreCase)) { return TryParseBasicAuthInfo(keyValues, msg.RequestMessage!.RequestUri!, out bearerAuthInfo); } - else if (header.Scheme.Equals("Bearer", StringComparison.OrdinalIgnoreCase)) + else if (header.Scheme.Equals(BearerAuthScheme, StringComparison.OrdinalIgnoreCase)) { return TryParseBearerAuthInfo(keyValues, out bearerAuthInfo); } @@ -135,8 +137,10 @@ static bool TryParseBasicAuthInfo(Dictionary authValues, Uri req private sealed record TokenResponse(string? token, string? access_token, int? expires_in, DateTimeOffset? issued_at) { public string ResolvedToken => token ?? access_token ?? throw new ArgumentException(Resource.GetString(nameof(Strings.InvalidTokenResponse))); - public DateTimeOffset ResolvedExpiration { - get { + public DateTimeOffset ResolvedExpiration + { + get + { var issueTime = this.issued_at ?? DateTimeOffset.UtcNow; // per spec, if no issued_at use the current time var validityDuration = this.expires_in ?? 60; // per spec, if no expires_in use 60 seconds var expirationTime = issueTime.AddSeconds(validityDuration); @@ -168,12 +172,12 @@ public DateTimeOffset ResolvedExpiration { privateRepoCreds = await GetLoginCredentials(registry).ConfigureAwait(false); } - if (scheme is "Basic") + if (scheme.Equals(BasicAuthScheme, StringComparison.OrdinalIgnoreCase)) { - var authValue = new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($"{privateRepoCreds.Username}:{privateRepoCreds.Password}"))); - return new (authValue, DateTimeOffset.MaxValue); + var authValue = new AuthenticationHeaderValue(BasicAuthScheme, Convert.ToBase64String(Encoding.ASCII.GetBytes($"{privateRepoCreds.Username}:{privateRepoCreds.Password}"))); + return new(authValue, DateTimeOffset.MaxValue); } - else if (scheme is "Bearer") + else if (scheme.Equals(BearerAuthScheme, StringComparison.OrdinalIgnoreCase)) { Debug.Assert(bearerAuthInfo is not null); @@ -240,7 +244,7 @@ public DateTimeOffset ResolvedExpiration { TokenResponse? tokenResponse = JsonSerializer.Deserialize(postResponse.Content.ReadAsStream(cancellationToken)); if (tokenResponse is { } tokenEnvelope) { - var authValue = new AuthenticationHeaderValue("Bearer", tokenResponse.ResolvedToken); + var authValue = new AuthenticationHeaderValue(BearerAuthScheme, tokenResponse.ResolvedToken); return (authValue, tokenResponse.ResolvedExpiration); } else @@ -256,39 +260,39 @@ public DateTimeOffset ResolvedExpiration { /// private async Task<(AuthenticationHeaderValue, DateTimeOffset)?> TryTokenGetAsync(DockerCredentials privateRepoCreds, AuthInfo bearerAuthInfo, CancellationToken cancellationToken) { - // this doesn't seem to be called out in the spec, but actual username/password auth information should be converted into Basic auth here, - // even though the overall Scheme we're authenticating for is Bearer - var header = privateRepoCreds.Username == "" - ? new AuthenticationHeaderValue("Bearer", privateRepoCreds.Password) - : new AuthenticationHeaderValue("Basic", Convert.ToBase64String(Encoding.ASCII.GetBytes($"{privateRepoCreds.Username}:{privateRepoCreds.Password}"))); - var builder = new UriBuilder(new Uri(bearerAuthInfo.Realm)); - - _logger.LogTrace("Attempting to authenticate on {uri} using GET.", bearerAuthInfo.Realm); - var queryDict = System.Web.HttpUtility.ParseQueryString(""); - if (bearerAuthInfo.Service is string svc) - { - queryDict["service"] = svc; - } - if (bearerAuthInfo.Scope is string s) - { - queryDict["scope"] = s; - } - builder.Query = queryDict.ToString(); - var message = new HttpRequestMessage(HttpMethod.Get, builder.ToString()); - message.Headers.Authorization = header; + // this doesn't seem to be called out in the spec, but actual username/password auth information should be converted into Basic auth here, + // even though the overall Scheme we're authenticating for is Bearer + var header = privateRepoCreds.Username == "" + ? new AuthenticationHeaderValue(BearerAuthScheme, privateRepoCreds.Password) + : new AuthenticationHeaderValue(BasicAuthScheme, Convert.ToBase64String(Encoding.ASCII.GetBytes($"{privateRepoCreds.Username}:{privateRepoCreds.Password}"))); + var builder = new UriBuilder(new Uri(bearerAuthInfo.Realm)); + + _logger.LogTrace("Attempting to authenticate on {uri} using GET.", bearerAuthInfo.Realm); + var queryDict = System.Web.HttpUtility.ParseQueryString(""); + if (bearerAuthInfo.Service is string svc) + { + queryDict["service"] = svc; + } + if (bearerAuthInfo.Scope is string s) + { + queryDict["scope"] = s; + } + builder.Query = queryDict.ToString(); + var message = new HttpRequestMessage(HttpMethod.Get, builder.ToString()); + message.Headers.Authorization = header; - using var tokenResponse = await base.SendAsync(message, cancellationToken).ConfigureAwait(false); - if (!tokenResponse.IsSuccessStatusCode) - { - throw new UnableToAccessRepositoryException(_registryName); - } + using var tokenResponse = await base.SendAsync(message, cancellationToken).ConfigureAwait(false); + if (!tokenResponse.IsSuccessStatusCode) + { + throw new UnableToAccessRepositoryException(_registryName); + } - TokenResponse? token = JsonSerializer.Deserialize(tokenResponse.Content.ReadAsStream(cancellationToken)); - if (token is null) - { - throw new ArgumentException(Resource.GetString(nameof(Strings.CouldntDeserializeJsonToken))); - } - return (new AuthenticationHeaderValue("Bearer", token.ResolvedToken), token.ResolvedExpiration); + TokenResponse? token = JsonSerializer.Deserialize(tokenResponse.Content.ReadAsStream(cancellationToken)); + if (token is null) + { + throw new ArgumentException(Resource.GetString(nameof(Strings.CouldntDeserializeJsonToken))); + } + return (new AuthenticationHeaderValue(BearerAuthScheme, token.ResolvedToken), token.ResolvedExpiration); } private static async Task GetLoginCredentials(string registry) From e1194bdcf4c96e6e5f33618306088099e86bef3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Nov 2023 13:30:48 +0000 Subject: [PATCH 335/550] Update dependencies from https://github.com/dotnet/sourcelink build 20231128.1 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23567.1 -> To Version 8.0.0-beta.23578.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55fb661bf8b9..dbf186f9f20c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -347,30 +347,30 @@ https://github.com/dotnet/deployment-tools 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/sourcelink - 9241f4814d9996d7468d5c60fdf1eb0779049434 + f6b97c9ef635ad82b195a952ac0e0a969b9cf39c - + https://github.com/dotnet/sourcelink - 9241f4814d9996d7468d5c60fdf1eb0779049434 + f6b97c9ef635ad82b195a952ac0e0a969b9cf39c - + https://github.com/dotnet/sourcelink - 9241f4814d9996d7468d5c60fdf1eb0779049434 + f6b97c9ef635ad82b195a952ac0e0a969b9cf39c - + https://github.com/dotnet/sourcelink - 9241f4814d9996d7468d5c60fdf1eb0779049434 + f6b97c9ef635ad82b195a952ac0e0a969b9cf39c - + https://github.com/dotnet/sourcelink - 9241f4814d9996d7468d5c60fdf1eb0779049434 + f6b97c9ef635ad82b195a952ac0e0a969b9cf39c - + https://github.com/dotnet/sourcelink - 9241f4814d9996d7468d5c60fdf1eb0779049434 + f6b97c9ef635ad82b195a952ac0e0a969b9cf39c diff --git a/eng/Versions.props b/eng/Versions.props index d63f991f2a70..0c392f41ff60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -177,12 +177,12 @@ - 8.0.0-beta.23567.1 - 8.0.0-beta.23567.1 - 8.0.0-beta.23567.1 - 8.0.0-beta.23567.1 - 8.0.0-beta.23567.1 - 8.0.0-beta.23567.1 + 8.0.0-beta.23578.1 + 8.0.0-beta.23578.1 + 8.0.0-beta.23578.1 + 8.0.0-beta.23578.1 + 8.0.0-beta.23578.1 + 8.0.0-beta.23578.1 From 4771d73bb89644fddb4c518b4657032e4802c174 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Nov 2023 13:31:18 +0000 Subject: [PATCH 336/550] Update dependencies from https://github.com/dotnet/fsharp build 20231129.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23574.3 -> To Version 8.0.200-beta.23579.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55fb661bf8b9..b8a17c516ade 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 5fcddc790f4eeaf953a3d283e39751dd0e1f2992 - + https://github.com/dotnet/fsharp - 5a2ef93ff28d0a9a7e9419d652e9b009557e3925 + b88819c8f0720961fff8c831c863537fde53bb28 - + https://github.com/dotnet/fsharp - 5a2ef93ff28d0a9a7e9419d652e9b009557e3925 + b88819c8f0720961fff8c831c863537fde53bb28 diff --git a/eng/Versions.props b/eng/Versions.props index d63f991f2a70..712a9ab91f50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23574.3 + 12.8.0-beta.23579.1 From 3afa5fbdce800893028c7f074dc277469ebc9838 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Nov 2023 13:32:02 +0000 Subject: [PATCH 337/550] Update dependencies from https://github.com/microsoft/vstest build 20231128.4 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23578-03 -> To Version 17.9.0-preview-23578-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55fb661bf8b9..86752574a15f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/microsoft/vstest - 693b5b25ee6143ec187f1936649b3380f77f5f10 + 80d479084e7905a764d3421bdc70f00c59b761ca - + https://github.com/microsoft/vstest - 693b5b25ee6143ec187f1936649b3380f77f5f10 + 80d479084e7905a764d3421bdc70f00c59b761ca - + https://github.com/microsoft/vstest - 693b5b25ee6143ec187f1936649b3380f77f5f10 + 80d479084e7905a764d3421bdc70f00c59b761ca https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d63f991f2a70..840e71d2297c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23578-03 - 17.9.0-preview-23578-03 - 17.9.0-preview-23578-03 + 17.9.0-preview-23578-04 + 17.9.0-preview-23578-04 + 17.9.0-preview-23578-04 From 50fac20997274b56c33d0530eae0141d465e38a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Nov 2023 13:32:13 +0000 Subject: [PATCH 338/550] Update dependencies from https://github.com/dotnet/razor build 20231128.5 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23577.4 -> To Version 7.0.0-preview.23578.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55fb661bf8b9..272ce1cbad49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 6951c49bf4fc099dbbbc733e087c262329032590 + f1a00bbad964b63ea12105c8743c489082bf6354 - + https://github.com/dotnet/razor - 6951c49bf4fc099dbbbc733e087c262329032590 + f1a00bbad964b63ea12105c8743c489082bf6354 - + https://github.com/dotnet/razor - 6951c49bf4fc099dbbbc733e087c262329032590 + f1a00bbad964b63ea12105c8743c489082bf6354 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d63f991f2a70..f88a376969be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23577.4 - 7.0.0-preview.23577.4 - 7.0.0-preview.23577.4 + 7.0.0-preview.23578.5 + 7.0.0-preview.23578.5 + 7.0.0-preview.23578.5 From 2713c7e7a8e1b14f513c2d44aef2f40805a3a13f Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 29 Nov 2023 09:34:05 -0600 Subject: [PATCH 339/550] enforce behavior where ASPNETCORE_URLS overrides ASPNETCORE_HTTP(S)_PORTS --- .../ImageBuilder.cs | 40 ++++++++------- .../ImageBuilderTests.cs | 50 +++++++++++++++++-- 2 files changed, 69 insertions(+), 21 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs index 37f94c6e8819..a45a618ee26b 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs @@ -237,13 +237,32 @@ internal void AssignUserFromEnvironment() /// internal void AssignPortsFromEnvironment() { - // asp.net images control port bindings via three environment variables. we should check for those variables and ensure that ports are created for them + // asp.net images control port bindings via three environment variables. we should check for those variables and ensure that ports are created for them. + // precendence is captured at https://github.com/dotnet/aspnetcore/blob/f49c1c7f7467c184ffb630086afac447772096c6/src/Hosting/Hosting/src/GenericHost/GenericWebHostService.cs#L68-L119 + // ASPNETCORE_URLS is the most specific and is the only one used is present, followed by ASPNETCORE_HTTPS_PORT and ASPNETCORE_HTTP_PORT together + // https://learn.microsoft.com//aspnet/core/fundamentals/host/web-host?view=aspnetcore-8.0#server-urls - the format of ASPNETCORE_URLS has been stable for many years now + if (_baseImageConfig.EnvironmentVariables.TryGetValue(EnvironmentVariables.ASPNETCORE_URLS, out string? urls)) + { + foreach (var url in Split(urls)) + { + _logger.LogTrace("Setting ports from ASPNETCORE_URLS environment variable"); + var match = aspnetPortRegex.Match(url); + if (match.Success && int.TryParse(match.Groups["port"].Value, out int port)) + { + _logger.LogTrace("Added port {port}", port); + ExposePort(port, PortType.tcp); + } + } + return; // we're done here - ASPNETCORE_URLS is the most specific and overrides the other two + } + + // port-specific // https://learn.microsoft.com/aspnet/core/fundamentals/servers/kestrel/endpoints?view=aspnetcore-8.0#specify-ports-only - new for .NET 8 - allows just changing port(s) easily if (_baseImageConfig.EnvironmentVariables.TryGetValue(EnvironmentVariables.ASPNETCORE_HTTP_PORTS, out string? httpPorts)) { _logger.LogTrace("Setting ports from ASPNETCORE_HTTP_PORTS environment variable"); - foreach(var port in Split(httpPorts)) + foreach (var port in Split(httpPorts)) { if (int.TryParse(port, out int parsedPort)) { @@ -260,7 +279,7 @@ internal void AssignPortsFromEnvironment() if (_baseImageConfig.EnvironmentVariables.TryGetValue(EnvironmentVariables.ASPNETCORE_HTTPS_PORTS, out string? httpsPorts)) { _logger.LogTrace("Setting ports from ASPNETCORE_HTTPS_PORTS environment variable"); - foreach(var port in Split(httpsPorts)) + foreach (var port in Split(httpsPorts)) { if (int.TryParse(port, out int parsedPort)) { @@ -274,21 +293,6 @@ internal void AssignPortsFromEnvironment() } } - // https://learn.microsoft.com//aspnet/core/fundamentals/host/web-host?view=aspnetcore-8.0#server-urls - the format of ASPNETCORE_URLS has been stable for many years now - if (_baseImageConfig.EnvironmentVariables.TryGetValue(EnvironmentVariables.ASPNETCORE_URLS, out string? urls)) - { - foreach(var url in Split(urls)) - { - _logger.LogTrace("Setting ports from ASPNETCORE_URLS environment variable"); - var match = aspnetPortRegex.Match(url); - if (match.Success && int.TryParse(match.Groups["port"].Value, out int port)) - { - _logger.LogTrace("Added port {port}", port); - ExposePort(port, PortType.tcp); - } - } - } - static string[] Split(string input) { return input.Split(';', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageBuilderTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageBuilderTests.cs index dcd988eb373e..ed8edf9aba86 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageBuilderTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ImageBuilderTests.cs @@ -221,7 +221,7 @@ public void CanAddPortsToImage() Assert.Equal(2, resultPorts.Count); Assert.NotNull(resultPorts["6000/tcp"] as JsonObject); - Assert.NotNull( resultPorts["6010/udp"] as JsonObject); + Assert.NotNull(resultPorts["6010/udp"] as JsonObject); } [Fact] @@ -562,12 +562,56 @@ public void CanSetPortFromEnvVarFromUser(string envVar, string envValue, params Assert.Equal(assignedPorts, expectedPorts); } + [Fact] + public void WhenMultipleUrlSourcesAreSetOnlyAspnetcoreUrlsIsUsed() + { + var builder = FromBaseImageConfig($$""" + { + "architecture": "amd64", + "config": { + "Hostname": "", + "Domainname": "", + "User": "", + "Env": [ + "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" + ], + "Cmd": ["bash"], + "Image": "sha256:d772d27ebeec80393349a4770dc37f977be2c776a01c88b624d43f93fa369d69", + "WorkingDir": "" + }, + "created": "2023-02-04T08:14:52.000901321Z", + "os": "linux", + "rootfs": { + "type": "layers", + "diff_ids": [ + "sha256:bd2fe8b74db65d82ea10db97368d35b92998d4ea0e7e7dc819481fe4a68f64cf", + "sha256:94100d1041b650c6f7d7848c550cd98c25d0bdc193d30692e5ea5474d7b3b085", + "sha256:53c2a75a33c8f971b4b5036d34764373e134f91ee01d8053b4c3573c42e1cf5d", + "sha256:49a61320e585180286535a2545be5722b09e40ad44c7c190b20ec96c9e42e4a3", + "sha256:8a379cce2ac272aa71aa029a7bbba85c852ba81711d9f90afaefd3bf5036dc48" + ] + } + } + """); + + builder.AddEnvironmentVariable(ImageBuilder.EnvironmentVariables.ASPNETCORE_URLS, "https://*:12345"); + builder.AddEnvironmentVariable(ImageBuilder.EnvironmentVariables.ASPNETCORE_HTTPS_PORTS, "456"); + var builtImage = builder.Build(); + JsonNode? result = JsonNode.Parse(builtImage.Config); + Assert.NotNull(result); + var portsObject = result["config"]?["ExposedPorts"]?.AsObject(); + var assignedPorts = portsObject?.AsEnumerable().Select(portString => int.Parse(portString.Key.Split('/')[0])).ToArray(); + Assert.Equal([12345], assignedPorts); + } + private ImageBuilder FromBaseImageConfig(string baseImageConfig, [CallerMemberName] string testName = "") { - var manifest = new ManifestV2() { + var manifest = new ManifestV2() + { SchemaVersion = 2, MediaType = SchemaTypes.DockerManifestV2, - Config = new ManifestConfig() { + Config = new ManifestConfig() + { mediaType = "", size = 0, digest = "sha256:0" From e6734f8d9596f37035cc511fa84e89ccaa4e59f1 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 29 Nov 2023 10:23:17 -0600 Subject: [PATCH 340/550] Update src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs Co-authored-by: Rainer Sigwald --- src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs index a45a618ee26b..f3f699ff7435 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/ImageBuilder.cs @@ -239,7 +239,7 @@ internal void AssignPortsFromEnvironment() { // asp.net images control port bindings via three environment variables. we should check for those variables and ensure that ports are created for them. // precendence is captured at https://github.com/dotnet/aspnetcore/blob/f49c1c7f7467c184ffb630086afac447772096c6/src/Hosting/Hosting/src/GenericHost/GenericWebHostService.cs#L68-L119 - // ASPNETCORE_URLS is the most specific and is the only one used is present, followed by ASPNETCORE_HTTPS_PORT and ASPNETCORE_HTTP_PORT together + // ASPNETCORE_URLS is the most specific and is the only one used if present, followed by ASPNETCORE_HTTPS_PORT and ASPNETCORE_HTTP_PORT together // https://learn.microsoft.com//aspnet/core/fundamentals/host/web-host?view=aspnetcore-8.0#server-urls - the format of ASPNETCORE_URLS has been stable for many years now if (_baseImageConfig.EnvironmentVariables.TryGetValue(EnvironmentVariables.ASPNETCORE_URLS, out string? urls)) From 9fde210643aa93af32c260de9b9ba84f7b318084 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 29 Nov 2023 11:01:33 -0600 Subject: [PATCH 341/550] don't use cookies to unblock CSRF workflows --- .../Registry/DefaultRegistryAPI.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs index e83a4da029b3..22d4d333c4bf 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs @@ -30,7 +30,10 @@ internal DefaultRegistryAPI(string registryName, Uri baseUri, ILogger logger) private static HttpClient CreateClient(string registryName, Uri baseUri, ILogger logger, bool isAmazonECRRegistry = false) { - var innerHandler = new SocketsHttpHandler(); + var innerHandler = new SocketsHttpHandler() + { + UseCookies = false, + }; // Ignore certificate for https localhost repository. if (baseUri.Host == "localhost" && baseUri.Scheme == "https") From 6277083c43984aa8055967bc5b8298034725fa3d Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Wed, 29 Nov 2023 09:56:41 -0800 Subject: [PATCH 342/550] Fix install state file for MSI based installs --- .../commands/dotnet-workload/install/MsiInstallerBase.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs index 50ad621afc1e..7a58b9646a43 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs @@ -499,9 +499,9 @@ protected void UpdateDependent(InstallRequestType requestType, string providerKe /// The feature band of the install state file. protected void RemoveInstallStateFile(SdkFeatureBand sdkFeatureBand) { - string path = WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, null); + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, null), "default.json"); - if (File.Exists(path)) + if (!File.Exists(path)) { Log?.LogMessage($"Install state file does not exist: {path}"); return; @@ -527,7 +527,7 @@ protected void RemoveInstallStateFile(SdkFeatureBand sdkFeatureBand) /// The contents of the JSON file, formatted as a single line. protected void WriteInstallStateFile(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) { - string path = WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, null); + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, null), "default.json"); Elevate(); if (IsElevated) From da2d559207623021caa0675b6b6a9bb7990dfe5e Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Wed, 29 Nov 2023 11:36:30 -0800 Subject: [PATCH 343/550] Update src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props --- src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props index 547b2c13aae5..000a83615152 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.props @@ -31,7 +31,7 @@ Copyright (c) .NET Foundation. All rights reserved. --> true - $(MSBuildThisFileDirectory)UseArtifactsOutputPath.props + $(CustomAfterDirectoryBuildProps);$(MSBuildThisFileDirectory)UseArtifactsOutputPath.props From 85280ae8996cc2d68f75c88c1a6ec1d4520abd5a Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Wed, 29 Nov 2023 17:23:55 -0800 Subject: [PATCH 344/550] Add unit test --- .../GivenThatWeWantToPublishASingleFileApp.cs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs index 21a1c24b5ed2..57c50ae45b85 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishASingleFileApp.cs @@ -150,6 +150,25 @@ public void It_generates_publishing_single_file_with_win7() .Pass(); } + [Fact] + public void Target_after_AfterSdkPublish_executes() + { + var projectChanges = (XDocument doc) => + { + var ns = doc.Root.Name.Namespace; + var target = new XElement("Target"); + target.ReplaceAttributes(new XAttribute[] { new XAttribute("Name", "AfterAfterSdkPublish"), new XAttribute("AfterTargets", "AfterSdkPublish") }); + var message = new XElement("Message"); + message.ReplaceAttributes(new XAttribute[] { new XAttribute("Importance", "High"), new XAttribute("Text", "Executed AfterAfterSdkPublish") }); + target.Add(message); + doc.Root.Add(target); + }; + + var publishResults = GetPublishCommand(projectChanges: projectChanges).Execute(); + publishResults.Should().Pass(); + publishResults.Should().HaveStdOutContaining("Executed AfterAfterSdkPublish"); + } + [Fact] public void It_errors_when_publishing_single_file_lib() { From 464619e4c00b8c1418a1092655b11c68a6933a40 Mon Sep 17 00:00:00 2001 From: Mark Li Date: Thu, 30 Nov 2023 02:10:07 -0800 Subject: [PATCH 345/550] Remove default verbosity and fix test cases --- src/Cli/dotnet/CommonOptions.cs | 3 +-- .../ToolInstallGlobalOrToolPathCommandTests.cs | 12 ++++++------ .../ToolUninstallGlobalOrToolPathCommandTests.cs | 6 +++--- .../ToolUpdateGlobalOrToolPathCommandTests.cs | 10 +++++----- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs index 3a168ee13dba..3547fd59ed1c 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -23,8 +23,7 @@ internal static class CommonOptions new ForwardedOption("--verbosity", "-v") { Description = CommonLocalizableStrings.VerbosityOptionDescription, - HelpName = CommonLocalizableStrings.LevelArgumentName, - DefaultValueFactory = _ => VerbosityOptions.minimal + HelpName = CommonLocalizableStrings.LevelArgumentName }.ForwardAsSingle(o => $"-verbosity:{o}"); public static CliOption HiddenVerbosityOption = diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs index f64a5b84e6e5..c7f1f5bb1df7 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs @@ -60,7 +60,7 @@ public ToolInstallGlobalOrToolPathCommandTests(ITestOutputHelper log): base(log) _createToolPackageStoresAndDownloader = (location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, CreateToolPackageDownloader()); - _parseResult = Parser.Instance.Parse($"dotnet tool install -g {PackageId}"); + _parseResult = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --verbosity minimal"); } [Fact] @@ -283,7 +283,7 @@ public void WhenRunWithPackageIdItShouldShowSuccessMessage() } [Fact] - public void WhenRunWithPackageIdWithQuietItShouldShowSuccessMessage() + public void WhenRunWithPackageIdWithQuietItShouldShowNoSuccessMessage() { var parseResultQuiet = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --verbosity quiet"); var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( @@ -330,7 +330,7 @@ public void WhenRunWithInvalidVersionItShouldThrow() [Fact] public void WhenRunWithExactVersionItShouldSucceed() { - ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion}"); + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion} --verbosity minimal"); var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( result, @@ -354,7 +354,7 @@ public void WhenRunWithExactVersionItShouldSucceed() [Fact] public void WhenRunWithValidVersionRangeItShouldSucceed() { - ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version [1.0,2.0]"); + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version [1.0,2.0] --verbosity minimal"); var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( result, @@ -410,7 +410,7 @@ public void WhenRunWithPrereleaseItShouldSucceed() { IToolPackageDownloader toolToolPackageDownloader = GetToolToolPackageDownloaderWithPreviewInFeed(); - ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --prerelease"); + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --prerelease --verbosity minimal"); var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( result, @@ -502,7 +502,7 @@ public void WhenRunWithoutAMatchingRangeItShouldFail() [Fact] public void WhenRunWithValidVersionWildcardItShouldSucceed() { - ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version 1.0.*"); + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version 1.0.* --verbosity minimal"); var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( result, diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUninstallGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUninstallGlobalOrToolPathCommandTests.cs index 0f6842dc5751..ff66e73a09bb 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUninstallGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUninstallGlobalOrToolPathCommandTests.cs @@ -56,7 +56,7 @@ public void GivenANonExistentPackageItErrors() [Fact] public void GivenAPackageItUninstalls() { - CreateInstallCommand($"-g {PackageId}").Execute().Should().Be(0); + CreateInstallCommand($"-g {PackageId} --verbosity minimal").Execute().Should().Be(0); _reporter .Lines @@ -98,7 +98,7 @@ public void GivenAPackageItUninstalls() [Fact] public void GivenAPackageWhenCallFromUninstallRedirectCommandItUninstalls() { - CreateInstallCommand($"-g {PackageId}").Execute().Should().Be(0); + CreateInstallCommand($"-g {PackageId} --verbosity minimal").Execute().Should().Be(0); _reporter .Lines @@ -168,7 +168,7 @@ var uninstallCommand [Fact] public void GivenAFailureToUninstallItLeavesItInstalled() { - CreateInstallCommand($"-g {PackageId}").Execute().Should().Be(0); + CreateInstallCommand($"-g {PackageId} --verbosity minimal").Execute().Should().Be(0); _reporter .Lines diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs index b5eb57b1ea78..9ab3c4a71560 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs @@ -143,7 +143,7 @@ public void GivenAnExistedLowerversionInstallationWhenCallItCanPrintSuccessMessa CreateInstallCommand($"-g {_packageId} --version {LowerPackageVersion}").Execute(); _reporter.Lines.Clear(); - var command = CreateUpdateCommand($"-g {_packageId}"); + var command = CreateUpdateCommand($"-g {_packageId} --verbosity minimal"); command.Execute(); @@ -158,7 +158,7 @@ public void GivenAnExistedLowerversionInstallationWhenCallWithWildCardVersionItC CreateInstallCommand($"-g {_packageId} --version {LowerPackageVersion}").Execute(); _reporter.Lines.Clear(); - var command = CreateUpdateCommand($"-g {_packageId} --version 1.0.5-*"); + var command = CreateUpdateCommand($"-g {_packageId} --version 1.0.5-* --verbosity minimal"); command.Execute(); @@ -173,7 +173,7 @@ public void GivenAnExistedLowerversionInstallationWhenCallWithPrereleaseVersionI CreateInstallCommand($"-g {_packageId} --version {LowerPackageVersion}").Execute(); _reporter.Lines.Clear(); - var command = CreateUpdateCommand($"-g {_packageId} --prerelease"); + var command = CreateUpdateCommand($"-g {_packageId} --prerelease --verbosity minimal"); command.Execute(); @@ -208,7 +208,7 @@ public void GivenAnExistedSameVersionInstallationWhenCallItCanPrintSuccessMessag CreateInstallCommand($"-g {_packageId} --version {HigherPackageVersion}").Execute(); _reporter.Lines.Clear(); - var command = CreateUpdateCommand($"-g {_packageId}"); + var command = CreateUpdateCommand($"-g {_packageId} --verbosity minimal"); command.Execute(); @@ -223,7 +223,7 @@ public void GivenAnExistedSameVersionInstallationWhenCallWithPrereleaseItUsesAPr CreateInstallCommand($"-g {_packageId} --version {HigherPreviewPackageVersion}").Execute(); _reporter.Lines.Clear(); - var command = CreateUpdateCommand($"-g {_packageId} --version {HigherPreviewPackageVersion}"); + var command = CreateUpdateCommand($"-g {_packageId} --version {HigherPreviewPackageVersion} --verbosity minimal"); command.Execute(); From c4ece8ee3a2b43607035e17e2fc5cf49f6b9a68c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Nov 2023 13:28:47 +0000 Subject: [PATCH 346/550] Update dependencies from https://github.com/dotnet/msbuild build 20231130.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23578-04 -> To Version 17.9.0-preview-23580-04 --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 53cfaed682a2..bf580609f0ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4723b21c49e..fe13d4008996 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 1b7f3a6560f6fb5f32b2758603c0376037f555ea - + https://github.com/dotnet/msbuild - 5fcddc790f4eeaf953a3d283e39751dd0e1f2992 + e1652ea4983c7b0f9ad0e46e2a6bff640073a165 - + https://github.com/dotnet/msbuild - 5fcddc790f4eeaf953a3d283e39751dd0e1f2992 + e1652ea4983c7b0f9ad0e46e2a6bff640073a165 - + https://github.com/dotnet/msbuild - 5fcddc790f4eeaf953a3d283e39751dd0e1f2992 + e1652ea4983c7b0f9ad0e46e2a6bff640073a165 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 05a8f217551c..ca139d19d75f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23578-04 + 17.9.0-preview-23580-04 $(MicrosoftBuildPackageVersion) - 17.9.0-preview-23580-04 + 17.9.0-preview-23601-02 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23579.1 + 12.8.0-beta.23580.2 From d58a675856b8a418001c8a8377d73a362c137bc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Dec 2023 13:37:25 +0000 Subject: [PATCH 349/550] Update dependencies from https://github.com/microsoft/vstest build 20231130.1 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23578-04 -> To Version 17.9.0-preview-23580-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe13d4008996..82da4d9e7a42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/microsoft/vstest - 80d479084e7905a764d3421bdc70f00c59b761ca + d6dc5a0343fec142369c744466be1d1fc52fecdb - + https://github.com/microsoft/vstest - 80d479084e7905a764d3421bdc70f00c59b761ca + d6dc5a0343fec142369c744466be1d1fc52fecdb - + https://github.com/microsoft/vstest - 80d479084e7905a764d3421bdc70f00c59b761ca + d6dc5a0343fec142369c744466be1d1fc52fecdb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ca139d19d75f..908dabe084b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23578-04 - 17.9.0-preview-23578-04 - 17.9.0-preview-23578-04 + 17.9.0-preview-23580-01 + 17.9.0-preview-23580-01 + 17.9.0-preview-23580-01 From 1c36ea9882f94601b3a8dcbbd9e699493ab38a7c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 1 Dec 2023 09:10:05 -0800 Subject: [PATCH 350/550] Fix the emsdk coherency dependency so that the runtime update works correctly --- NuGet.config | 8 ++- eng/Version.Details.xml | 130 ++++++++++++++++++++-------------------- eng/Versions.props | 38 ++++++------ 3 files changed, 90 insertions(+), 86 deletions(-) diff --git a/NuGet.config b/NuGet.config index bf580609f0ce..bade25373cf4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,8 +6,9 @@ - - + + + @@ -45,6 +46,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe13d4008996..49e077729712 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,46 +10,46 @@ https://github.com/dotnet/templating cb7b1558321784e4f2d9ca815836e7dc1b4c240c - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/emsdk - 1b7f3a6560f6fb5f32b2758603c0376037f555ea + 2406616d0e3a31d80b326e27c156955bfa41c791 https://github.com/dotnet/msbuild @@ -73,9 +73,9 @@ b88819c8f0720961fff8c831c863537fde53bb28 - - https://github.com/dotnet/format - 28925c0e519d66c80328aacf973b74e40bb1d5bd + + https://dev.azure.com/dnceng/internal/_git/dotnet-format + 2651752953c0d41c8c7b8d661cf2237151af33d0 @@ -192,25 +192,25 @@ https://github.com/microsoft/vstest 80d479084e7905a764d3421bdc70f00c59b761ca - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -385,29 +385,29 @@ - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 @@ -428,9 +428,9 @@ https://github.com/dotnet/arcade 080141bf0f9f15408bb6eb8e301b23bddf81d054 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index ca139d19d75f..6d74356f993f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,12 +36,12 @@ 7.0.0 8.0.0-beta.23556.5 7.0.0-preview.22423.2 - 8.0.0-rtm.23520.16 + 8.0.0 4.3.0 4.3.0 4.0.5 7.0.3 - 8.0.0-rtm.23520.16 + 8.0.0 4.6.0 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 @@ -49,20 +49,20 @@ - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 + 8.0.0 + 8.0.0-rtm.23531.3 + 8.0.0 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 + 8.0.0 + 8.0.0 + 8.0.0-rtm.23531.3 + 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 @@ -89,13 +89,13 @@ - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 + 8.0.0 + 8.0.0 + 8.0.0 - 8.0.456602 + 8.0.453106 @@ -208,7 +208,7 @@ - 8.0.0-rtm.23511.3 + 8.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) From 23cffcd5d784d36af8f1c30bfc19571ab225f503 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 Dec 2023 18:21:54 +0000 Subject: [PATCH 351/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#37271) [release/8.0.2xx] Update dependencies from dotnet/razor --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe13d4008996..ec4bcb14498f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - f1a00bbad964b63ea12105c8743c489082bf6354 + 9ba6281c649ddc7a1b52ea36c699443e94dbe303 - + https://github.com/dotnet/razor - f1a00bbad964b63ea12105c8743c489082bf6354 + 9ba6281c649ddc7a1b52ea36c699443e94dbe303 - + https://github.com/dotnet/razor - f1a00bbad964b63ea12105c8743c489082bf6354 + 9ba6281c649ddc7a1b52ea36c699443e94dbe303 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ca139d19d75f..e896c1f45ee6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23578.5 - 7.0.0-preview.23578.5 - 7.0.0-preview.23578.5 + 7.0.0-preview.23601.1 + 7.0.0-preview.23601.1 + 7.0.0-preview.23601.1 From 57f05ca0c6dae94f6e7d4c28da4722734a65d2d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 2 Dec 2023 13:30:27 +0000 Subject: [PATCH 352/550] Update dependencies from https://github.com/dotnet/fsharp build 20231201.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23580.2 -> To Version 8.0.200-beta.23601.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3446631d9f2e..cffd3b9a0c37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 67916dc4592efb2a0bec902aa1a77105859ee245 - + https://github.com/dotnet/fsharp - a0396b1cade0e705abd16526f5f165a9894c055d + e9b931144831808a66d75964ae52e4b467eb8efc - + https://github.com/dotnet/fsharp - a0396b1cade0e705abd16526f5f165a9894c055d + e9b931144831808a66d75964ae52e4b467eb8efc diff --git a/eng/Versions.props b/eng/Versions.props index 4d49c25489d4..b3858899e299 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.8.0-beta.23580.2 + 12.8.0-beta.23601.2 From e09f31257f4c77c1136c275588d022b4a11c004f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 3 Dec 2023 13:23:43 +0000 Subject: [PATCH 353/550] Update dependencies from https://github.com/dotnet/fsharp build 20231201.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23580.2 -> To Version 8.0.200-beta.23601.2 From 1dcb0095d54e430f42c5744a6e3005819e92fc29 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 3 Dec 2023 13:24:24 +0000 Subject: [PATCH 354/550] Update dependencies from https://github.com/dotnet/razor build 20231202.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23601.1 -> To Version 7.0.0-preview.23602.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3446631d9f2e..96c1812c72cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 9ba6281c649ddc7a1b52ea36c699443e94dbe303 + 2d191ab8c8b23ce0297a8f5a32d33833d4db4cfc - + https://github.com/dotnet/razor - 9ba6281c649ddc7a1b52ea36c699443e94dbe303 + 2d191ab8c8b23ce0297a8f5a32d33833d4db4cfc - + https://github.com/dotnet/razor - 9ba6281c649ddc7a1b52ea36c699443e94dbe303 + 2d191ab8c8b23ce0297a8f5a32d33833d4db4cfc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4d49c25489d4..2dc7fd53a37a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,9 +158,9 @@ - 7.0.0-preview.23601.1 - 7.0.0-preview.23601.1 - 7.0.0-preview.23601.1 + 7.0.0-preview.23602.1 + 7.0.0-preview.23602.1 + 7.0.0-preview.23602.1 From 9888308bb4779a36f1c7e18eaad72adead7b5b43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Dec 2023 13:20:02 +0000 Subject: [PATCH 355/550] Update dependencies from https://github.com/dotnet/msbuild build 20231204.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23601-02 -> To Version 17.9.0-preview-23604-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec4c311b7fcc..d321b42e7c03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - 67916dc4592efb2a0bec902aa1a77105859ee245 + f5ae5c6896f934f790fc000b7f3761c3c93aa9a9 - + https://github.com/dotnet/msbuild - 67916dc4592efb2a0bec902aa1a77105859ee245 + f5ae5c6896f934f790fc000b7f3761c3c93aa9a9 - + https://github.com/dotnet/msbuild - 67916dc4592efb2a0bec902aa1a77105859ee245 + f5ae5c6896f934f790fc000b7f3761c3c93aa9a9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 55b46e4085b8..f58a08a54204 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23601-02 + 17.9.0-preview-23604-01 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23601.2 + 12.8.0-beta.23604.1 From 36ea170a2c23217bd9e3426a311340566cf660fb Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Thu, 31 Aug 2023 22:30:44 -0700 Subject: [PATCH 357/550] Add --allow-downgrade option for ToolInstallCommandParser --- .../commands/dotnet-tool/install/LocalizableStrings.resx | 3 +++ .../commands/dotnet-tool/install/ToolInstallCommandParser.cs | 3 +++ .../dotnet-tool/install/xlf/LocalizableStrings.cs.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.de.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.es.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.fr.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.it.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.ja.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.ko.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.pl.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.ru.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.tr.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf | 5 +++++ .../dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf | 5 +++++ 15 files changed, 71 insertions(+) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx index cf87d1bac6c3..bacf2bd43283 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx @@ -235,4 +235,7 @@ If you would like to create a manifest, use `dotnet new tool-manifest`, usually Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed + + Allow package downgrade when installing a .NET tool package. + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs index 4f79a5a2362e..49b8136c4950 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs @@ -48,6 +48,8 @@ internal static class ToolInstallCommandParser Description = LocalizableStrings.CreateManifestIfNeededOptionDescription }; + public static readonly CliOption AllowPackageDowngradeOption = new CliOption("--allow-downgrade", LocalizableStrings.AllowPackageDowngradeOptionDescription); + public static readonly CliOption VerbosityOption = CommonOptions.VerbosityOption; // Don't use the common options version as we don't want this to be a forwarded option @@ -94,6 +96,7 @@ private static CliCommand ConstructCommand() command.Options.Add(VerbosityOption); command.Options.Add(ArchitectureOption); command.Options.Add(CreateManifestIfNeededOption); + command.Options.Add(AllowPackageDowngradeOption); command.SetAction((parseResult) => new ToolInstallCommand(parseResult).Execute()); diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf index 1073407eb811..f9b349905330 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed Vytvořte manifest nástroje, pokud se nějaký nenajde během instalace nástroje. Informace o tom, jak se manifesty nacházejí, najdete v tématu https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf index 8439dc3b3908..16870572afa8 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed Erstellen Sie ein Toolmanifest, wenn es während der Toolinstallation nicht gefunden wird. Informationen dazu, wie Manifeste gefunden werden, finden Sie unter https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf index 1bea2d9d6a19..2d3ceb437a0d 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed Cree un manifiesto de herramienta si no se encuentra ninguno durante la instalación de la herramienta. Para obtener información sobre cómo se encuentran los manifiestos, consulte https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf index 62b5b8ea09b7..f0b26485df8b 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed Créez un manifeste d'outil si aucun n'est trouvé lors de l'installation de l'outil. Pour plus d'informations sur la localisation des manifestes, voir https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf index 5b79eb906320..18a37a323a37 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed Creare un manifesto dello strumento se non ne viene trovato uno durante l'installazione dello strumento. Per informazioni sulla posizione dei manifesti, vedere https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf index dc9cbe468dfa..e4fb5d830160 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed ツールのインストール中にツール マニフェスト見つからない場合は作成します。マニフェストの場所については、https://aka.ms/dotnet/tools/create-manifest-if-needed を参照してください diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf index 09523ab43bdc..312a81ff45ac 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed 도구 설치 중에 도구 매니페스트를 찾을 수 없는 경우 도구 매니페스트를 만드세요. 매니페스트의 위치는 https://aka.ms/dotnet/tools/create-manifest-if-needed를 참조하세요. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf index 76b632ec7f10..e81725a330f8 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed Utwórz manifest narzędzi, jeśli nie zostanie znaleziony podczas instalacji narzędzia. Aby uzyskać informacje o lokalizacji manifestów, zobacz https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf index 7392c799046c..231fd74d2cbb 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed Crie um manifesto de ferramenta se nenhum for encontrado durante a instalação da ferramenta. Para obter informações sobre como os manifestos estão localizados, consulte https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf index 94c8bd4d3f22..9e06971364c8 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed Создайте манифест инструмента, если он не найден во время установки инструмента. Сведения о способе размещения манифестов см. на странице https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf index 6977fd232503..de68df203c29 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed Araç yüklemesi sırasında bir araç bildirimi bulunmazsa bir araç bildirimi oluşturun. Bildirimlerin nasıl bulunduğu hakkında bilgi edinmek için bkz. https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf index 1687123d06da..befd846b3d95 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed 如果在工具安装期间找不到工具清单,请创建一个工具清单。若要了解如何查找清单,请参阅 https://aka.ms/dotnet/tools/create-manifest-if-needed diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf index 23b08414bf46..3c5ad6c15e28 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -2,6 +2,11 @@ + + Allow package downgrade when installing a .NET tool package. + Allow package downgrade when installing a .NET tool package. + + Create a tool manifest if one isn't found during tool installation. For information on how manifests are located, see https://aka.ms/dotnet/tools/create-manifest-if-needed 如果在工具安裝期間找不到工具資訊清單,則建立工具資訊清單。如需如何尋找資訊清單的相關資訊,請參閱 https://aka.ms/dotnet/tools/create-manifest-if-needed From 9af4ed710818f33cdf2302a5e49b04d2ed05c7bb Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Fri, 1 Sep 2023 10:17:34 -0700 Subject: [PATCH 358/550] Restructure ToolInstallCommandParser to pass runtime error --- .../commands/dotnet-tool/install/ToolInstallCommandParser.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs index 49b8136c4950..babdef73d0ef 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallCommandParser.cs @@ -48,7 +48,10 @@ internal static class ToolInstallCommandParser Description = LocalizableStrings.CreateManifestIfNeededOptionDescription }; - public static readonly CliOption AllowPackageDowngradeOption = new CliOption("--allow-downgrade", LocalizableStrings.AllowPackageDowngradeOptionDescription); + public static readonly CliOption AllowPackageDowngradeOption = new("--allow-downgrade") + { + Description = LocalizableStrings.AllowPackageDowngradeOptionDescription + }; public static readonly CliOption VerbosityOption = CommonOptions.VerbosityOption; From e539fa67df7dd6df3b918aec803853171d57f1fe Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Fri, 1 Sep 2023 11:59:13 -0700 Subject: [PATCH 359/550] Add automatic upgrade and downgrade for ToolInstallLocalCommand and add automatic upgrade for ToolUpdateCommand; Add --allow-downgrade feature --- .../install/ToolInstallLocalCommand.cs | 80 ++++++++++++++++++- .../update/LocalizableStrings.resx | 4 +- .../update/ToolUpdateLocalCommand.cs | 68 +--------------- .../update/xlf/LocalizableStrings.cs.xlf | 10 +-- .../update/xlf/LocalizableStrings.de.xlf | 10 +-- .../update/xlf/LocalizableStrings.es.xlf | 10 +-- .../update/xlf/LocalizableStrings.fr.xlf | 10 +-- .../update/xlf/LocalizableStrings.it.xlf | 10 +-- .../update/xlf/LocalizableStrings.ja.xlf | 10 +-- .../update/xlf/LocalizableStrings.ko.xlf | 10 +-- .../update/xlf/LocalizableStrings.pl.xlf | 10 +-- .../update/xlf/LocalizableStrings.pt-BR.xlf | 10 +-- .../update/xlf/LocalizableStrings.ru.xlf | 10 +-- .../update/xlf/LocalizableStrings.tr.xlf | 10 +-- .../update/xlf/LocalizableStrings.zh-Hans.xlf | 10 +-- .../update/xlf/LocalizableStrings.zh-Hant.xlf | 10 +-- .../ToolUpdateLocalCommandTests.cs | 2 +- 17 files changed, 146 insertions(+), 138 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs index 9f9980ba9371..ae242365147f 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs @@ -19,6 +19,8 @@ internal class ToolInstallLocalCommand : CommandBase private readonly ILocalToolsResolverCache _localToolsResolverCache; private readonly ToolInstallLocalInstaller _toolLocalPackageInstaller; private readonly IReporter _reporter; + private readonly PackageId _packageId; + private readonly bool _allowPackageDowngrade; private readonly string _explicitManifestFile; private readonly bool _createManifestIfNeeded; @@ -44,15 +46,87 @@ public ToolInstallLocalCommand( _toolManifestEditor = toolManifestEditor ?? new ToolManifestEditor(); _localToolsResolverCache = localToolsResolverCache ?? new LocalToolsResolverCache(); _toolLocalPackageInstaller = new ToolInstallLocalInstaller(parseResult, toolPackageDownloader); + _packageId = new PackageId(parseResult.GetValue(ToolUpdateCommandParser.PackageIdArgument)); + _allowPackageDowngrade = parseResult.GetValue(ToolInstallCommandParser.AllowPackageDowngradeOption); } + public override int Execute() { - FilePath manifestFile = GetManifestFilePath(); - return Install(manifestFile); + (FilePath? manifestFileOptional, string warningMessage) = + _toolManifestFinder.ExplicitManifestOrFindManifestContainPackageId(_explicitManifestFile, _packageId); + + if (warningMessage != null) + { + _reporter.WriteLine(warningMessage.Yellow()); + } + + FilePath manifestFile = manifestFileOptional ?? GetManifestFilePath(); + var existingPackageWithPackageId = _toolManifestFinder.Find(manifestFile).Where(p => p.PackageId.Equals(_packageId)); + + if (!existingPackageWithPackageId.Any()) + { + return InstallNewTool(manifestFile); + } + + var existingPackage = existingPackageWithPackageId.Single(); + var toolDownloadedPackage = _toolLocalPackageInstaller.Install(manifestFile); + + InstallToolUpdate(existingPackage, toolDownloadedPackage, manifestFile); + + _localToolsResolverCache.SaveToolPackage( + toolDownloadedPackage, + _toolLocalPackageInstaller.TargetFrameworkToInstall); + + return 0; } - public int Install(FilePath manifestFile) + public int InstallToolUpdate(ToolManifestPackage existingPackage, IToolPackage toolDownloadedPackage, FilePath manifestFile) + { + if (existingPackage.Version > toolDownloadedPackage.Version && !_allowPackageDowngrade) + { + throw new GracefulException(new[] + { + string.Format( + Update.LocalizableStrings.UpdateLocalToolToLowerVersion, + toolDownloadedPackage.Version.ToNormalizedString(), + existingPackage.Version.ToNormalizedString(), + manifestFile.Value) + }, + isUserError: false); + } + else if (existingPackage.Version == toolDownloadedPackage.Version) + { + _reporter.WriteLine( + string.Format( + Update.LocalizableStrings.UpdateLocaToolSucceededVersionNoChange, + toolDownloadedPackage.Id, + existingPackage.Version.ToNormalizedString(), + manifestFile.Value)); + } + else + { + _toolManifestEditor.Edit( + manifestFile, + _packageId, + toolDownloadedPackage.Version, + toolDownloadedPackage.Commands.Select(c => c.Name).ToArray()); + _reporter.WriteLine( + string.Format( + Update.LocalizableStrings.UpdateLocalToolSucceeded, + toolDownloadedPackage.Id, + existingPackage.Version.ToNormalizedString(), + toolDownloadedPackage.Version.ToNormalizedString(), + manifestFile.Value).Green()); + } + + _localToolsResolverCache.SaveToolPackage( + toolDownloadedPackage, + _toolLocalPackageInstaller.TargetFrameworkToInstall); + + return 0; + } + public int InstallNewTool(FilePath manifestFile) { IToolPackage toolDownloadedPackage = _toolLocalPackageInstaller.Install(manifestFile); diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx index af3c3cf46ee8..5337b9218764 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx @@ -218,10 +218,10 @@ and the corresponding package Ids for installed tools using the command Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). - + The requested version {0} is lower than existing version {1} (manifest file {2}). Tool '{0}' is up to date (version '{1}' manifest file {2}) . - + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs index 8118adee5229..93bab935a7f7 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateLocalCommand.cs @@ -72,73 +72,7 @@ public ToolUpdateLocalCommand( public override int Execute() { - (FilePath? manifestFileOptional, string warningMessage) = - _toolManifestFinder.ExplicitManifestOrFindManifestContainPackageId(_explicitManifestFile, _packageId); - - var manifestFile = manifestFileOptional ?? _toolManifestFinder.FindFirst(); - - var toolDownloadedPackage = _toolLocalPackageInstaller.Install(manifestFile); - var existingPackageWithPackageId = - _toolManifestFinder - .Find(manifestFile) - .Where(p => p.PackageId.Equals(_packageId)); - - if (!existingPackageWithPackageId.Any()) - { - return _toolInstallLocalCommand.Value.Install(manifestFile); - } - - var existingPackage = existingPackageWithPackageId.Single(); - if (existingPackage.Version > toolDownloadedPackage.Version) - { - throw new GracefulException(new[] - { - string.Format( - LocalizableStrings.UpdateLocaToolToLowerVersion, - toolDownloadedPackage.Version.ToNormalizedString(), - existingPackage.Version.ToNormalizedString(), - manifestFile.Value) - }, - isUserError: false); - } - - if (existingPackage.Version != toolDownloadedPackage.Version) - { - _toolManifestEditor.Edit( - manifestFile, - _packageId, - toolDownloadedPackage.Version, - toolDownloadedPackage.Commands.Select(c => c.Name).ToArray()); - } - - _localToolsResolverCache.SaveToolPackage( - toolDownloadedPackage, - _toolLocalPackageInstaller.TargetFrameworkToInstall); - - if (warningMessage != null) - { - _reporter.WriteLine(warningMessage.Yellow()); - } - - if (existingPackage.Version == toolDownloadedPackage.Version) - { - _reporter.WriteLine( - string.Format( - LocalizableStrings.UpdateLocaToolSucceededVersionNoChange, - toolDownloadedPackage.Id, - existingPackage.Version.ToNormalizedString(), - manifestFile.Value)); - } - else - { - _reporter.WriteLine( - string.Format( - LocalizableStrings.UpdateLocalToolSucceeded, - toolDownloadedPackage.Id, - existingPackage.Version.ToNormalizedString(), - toolDownloadedPackage.Version.ToNormalizedString(), - manifestFile.Value).Green()); - } + _toolInstallLocalCommand.Value.Execute(); return 0; } diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf index 49017f3ead99..65296bb3cbca 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf @@ -42,16 +42,16 @@ Nástroj {0} je aktuální (verze {1}, soubor manifestu {2}). - - The requested version {0} is lower than existing version {1} (manifest file {2}). - Požadovaná verze {0} je nižší než stávající verze {1} (soubor manifestu {2}). - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). Nástroj {0} byl úspěšně aktualizován z verze {1} na verzi {2} (soubor manifestu {3}). + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). Nástroj{0}byl znovu nainstalován s nejnovější předběžnou verzí (verze{1}). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf index 36cf57b95ead..286a1bfbb200 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf @@ -42,16 +42,16 @@ Das Tool "{0}" ist auf dem neuesten Stand (Version {1}, Manifestdatei "{2}"). - - The requested version {0} is lower than existing version {1} (manifest file {2}). - Die angeforderte Version {0} ist niedriger als die vorhandene Version {1} (Manifestdatei "{2}"). - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). Das Tool "{0}" wurde erfolgreich von Version {1} auf Version {2} aktualisiert (Manifestdatei "{3}"). + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). Das Tool „{0}“ wurde in der neuesten Vorabversion neu installiert (Version „{1}“). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf index e57a011b7607..d127885daa80 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf @@ -42,16 +42,16 @@ La herramienta "{0}" está actualizada (versión "{1}", archivo de manifiesto {2}) . - - The requested version {0} is lower than existing version {1} (manifest file {2}). - La versión solicitada {0} es anterior a la versión existente {1} (archivo de manifiesto {2}). - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). La herramienta "{0}" se actualizó correctamente de la versión "{1}" a la versión "{2}" (archivo de manifiesto {3}). + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). La herramienta "{0}" se ha reinstalado con la versión preliminar más reciente (versión "{1}"). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf index 4bf16511cbb6..0efd80b9ed91 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf @@ -42,16 +42,16 @@ L'outil '{0}' est à jour (version '{1}', fichier manifeste {2}). - - The requested version {0} is lower than existing version {1} (manifest file {2}). - La version demandée {0} est inférieure à la version existante {1} (fichier manifeste {2}). - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). L'outil '{0}' a été correctement mis à jour de la version '{1}' à la version '{2}' (fichier manifeste {3}). + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). L'outil '{0}' a été réinstallé avec la dernière version préliminaire (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf index 1b64464c6117..536836352698 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf @@ -42,16 +42,16 @@ Lo strumento '{0}' è aggiornato (file manifesto {2} versione '{1}'). - - The requested version {0} is lower than existing version {1} (manifest file {2}). - La versione richiesta {0} è inferiore a quella esistente {1} (file manifesto {2}). - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). Lo strumento '{0}' è stato aggiornato dalla versione '{1}' alla versione '{2}' (file manifesto {3}). + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). Lo strumento '{0}' è stato reinstallato con l'ultima versione preliminare (versione '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf index 3d7d560ea2a2..d04705c2d983 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf @@ -42,16 +42,16 @@ ツール '{0}' は最新の状態です (バージョン '{1}' マニフェスト ファイル {2})。 - - The requested version {0} is lower than existing version {1} (manifest file {2}). - 要求されたバージョン {0} は、既存のバージョン {1} (マニフェスト ファイル {2}) よりも低くなっています。 - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). ツール '{0}' がバージョン '{1}' からバージョン '{2}' (マニフェストファイル {3}) に正常に更新されました。 + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). ツール '{0}' は、最新のプレリリース バージョン (バージョン '{1}') で再インストールされました。 diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf index e89364423fa2..f1defd809a8a 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf @@ -42,16 +42,16 @@ '{0}' 도구는 최신 버전(버전 '{1}' 매니페스트 파일 {2})입니다. - - The requested version {0} is lower than existing version {1} (manifest file {2}). - 요청된 버전 {0}이(가) 기존 버전 {1}(매니페스트 파일 {2})보다 낮습니다. - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). '{0}' 도구가 '{1}' 버전에서 '{2}' 버전(매니페스트 파일 {3})으로 업데이트되었습니다. + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). 도구 '{0}'이(가) 최신 시험판 버전(버전 '{1}')으로 다시 설치되었습니다. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf index d9ebce6c0772..21a57d09c0b2 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf @@ -42,16 +42,16 @@ Narzędzie „{0}” jest aktualne (wersja „{1}”, plik manifestu {2}). - - The requested version {0} is lower than existing version {1} (manifest file {2}). - Żądana wersja {0} jest niższa niż obecna wersja {1} (plik manifestu {2}). - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). Narzędzie „{0}” zostało pomyślnie zaktualizowane z wersji „{1}” do wersji „{2}” (plik manifestu {3}). + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). Narzędzie „{0}” zostało ponownie zainstalowane przy użyciu najnowszej stabilnej wersji (wersja „{1}”). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf index 88f0816772ae..6b69485a2294 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf @@ -42,16 +42,16 @@ A ferramenta '{0}' está atualizada (versão '{1}' arquivo de manifesto {2}) . - - The requested version {0} is lower than existing version {1} (manifest file {2}). - A versão solicitada {0} é inferior à versão existente {1} (arquivo de manifesto {2}). - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). A ferramenta '{0}' foi atualizada com êxito da versão '{1}' para a versão '{2}' (arquivo de manifesto {3}). + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). A ferramenta '{0}' foi reinstalada com a versão de pré-lançamento mais recente (versão '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf index 46bf064da5cd..74a00df1d768 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf @@ -42,16 +42,16 @@ Средство "{0}" обновлено (версия "{1}", файл манифеста {2}). - - The requested version {0} is lower than existing version {1} (manifest file {2}). - Запрошенная версия {0} ниже существующей версии {1} (файл манифеста {2}). - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). Средство "{0}" обновлено с версии "{1}" до версии "{2}" (файл манифеста {3}). + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). Инструмент "{0}" был переустановлен с последней предварительной версией (версией "{1}"). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf index 9ae1020925b0..d81ada20c78c 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf @@ -42,16 +42,16 @@ '{0}' aracı güncel (sürüm '{1}' bildirim dosyası {2}). - - The requested version {0} is lower than existing version {1} (manifest file {2}). - İstenen sürüm ({0}) mevcut sürümünden ({1}) (bildirim dosyası {2}) düşük. - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). '{0}' aracı, '{1}' sürümünden '{2}' (bildirim dosyası {3}) sürümüne başarıyla güncelleştirildi. + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). '{0}' aracı, en yeni ön sürüm (sürüm '{1}') ile yeniden yüklendi. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf index a7264b53a603..06aa58b846fe 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -42,16 +42,16 @@ 工具“{0}”是最新的(版本“{1}”清单文件 {2})。 - - The requested version {0} is lower than existing version {1} (manifest file {2}). - 请求的版本 {0} 低于现有版本 {1} (清单文件{2})。 - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). 工具“{0}”已成功从版本“{1}”更新到版本“{2}”(清单文件 {3})。 + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). 工具“{0}”已重新安装最新预发行版本(版本“{1}”)。 diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf index 24f4b489a06f..3543343886be 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -42,16 +42,16 @@ 工具 '{0}' 為最新 (版本 '{1}' 資訊清單檔 {2})。 - - The requested version {0} is lower than existing version {1} (manifest file {2}). - 要求的版本 {0} 低於現有版本 {1} (資訊清單檔 {2})。 - - Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). 已成功將工具 '{0}' 從 '{1}' 版更新為 '{2}' 版 (資訊清單檔 {3})。 + + The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). + + Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). 已使用最新搶鮮版 ('{0}' 版) 來重新安裝工具 '{1}'。 diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs index 78c4958e1c18..5af7e77810a3 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs @@ -305,7 +305,7 @@ public void GivenFeedVersionIsLowerRunPackageIdItShouldThrow() _reporter.Clear(); Action a = () => _defaultToolUpdateLocalCommand.Execute(); a.Should().Throw().And.Message.Should().Contain(string.Format( - LocalizableStrings.UpdateLocaToolToLowerVersion, + LocalizableStrings.UpdateLocalToolToLowerVersion, "0.9.0", _packageOriginalVersionA.ToNormalizedString(), _manifestFilePath)); From 2429d14a3eae9b4c5b78763b65140addb0403a5c Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Fri, 1 Sep 2023 12:09:08 -0700 Subject: [PATCH 360/550] Add tests for auto upgrade & downgrade for ToolInstallLocalCommand --- .../dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs index 898223f16c62..5727066c1eb6 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs @@ -39,13 +39,16 @@ public class ToolInstallLocalCommandTests:SdkTest private readonly string _manifestFilePath; private readonly PackageId _packageIdA = new PackageId("local.tool.console.a"); private readonly NuGetVersion _packageVersionA; + private readonly NuGetVersion _packageNewVersionA; private readonly ToolCommandName _toolCommandNameA = new ToolCommandName("a"); private readonly ToolManifestFinder _toolManifestFinder; private readonly ToolManifestEditor _toolManifestEditor; + private readonly MockFeed _mockFeed; public ToolInstallLocalCommandTests(ITestOutputHelper log):base(log) { _packageVersionA = NuGetVersion.Parse("1.0.4"); + _packageNewVersionA = NuGetVersion.Parse("2.0.0"); _reporter = new BufferedReporter(); _fileSystem = new FileSystemMockBuilder().UseCurrentSystemTemporaryDirectory().Build(); From 3ed62760f180fe032f7d7e7ec5580c63d9a1adb3 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Fri, 1 Sep 2023 16:56:58 -0700 Subject: [PATCH 361/550] Resolved the case that ToolInstallLocalCommand can automatically create manifest file --- .../dotnet-tool/install/ToolInstallLocalCommand.cs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs index ae242365147f..d304e68f2f48 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs @@ -53,12 +53,16 @@ public ToolInstallLocalCommand( public override int Execute() { - (FilePath? manifestFileOptional, string warningMessage) = - _toolManifestFinder.ExplicitManifestOrFindManifestContainPackageId(_explicitManifestFile, _packageId); - - if (warningMessage != null) + FilePath? manifestFileOptional = null; + if (_explicitManifestFile != null) { - _reporter.WriteLine(warningMessage.Yellow()); + (manifestFileOptional, string warningMessage) = + _toolManifestFinder.ExplicitManifestOrFindManifestContainPackageId(_explicitManifestFile, _packageId); + + if (warningMessage != null) + { + _reporter.WriteLine(warningMessage.Yellow()); + } } FilePath manifestFile = manifestFileOptional ?? GetManifestFilePath(); From 319aef8431f5d1933caaed09b22d215ba7bb2084 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Mon, 4 Sep 2023 02:16:29 -0700 Subject: [PATCH 362/550] Refine the logic of ToolInstallLocalCommand --- .../install/ToolInstallLocalCommand.cs | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs index d304e68f2f48..d9c5fcfaec00 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallLocalCommand.cs @@ -53,19 +53,17 @@ public ToolInstallLocalCommand( public override int Execute() { - FilePath? manifestFileOptional = null; - if (_explicitManifestFile != null) - { - (manifestFileOptional, string warningMessage) = - _toolManifestFinder.ExplicitManifestOrFindManifestContainPackageId(_explicitManifestFile, _packageId); + FilePath manifestFile = GetManifestFilePath(); + + (FilePath? manifestFileOptional, string warningMessage) = + _toolManifestFinder.ExplicitManifestOrFindManifestContainPackageId(_explicitManifestFile, _packageId); - if (warningMessage != null) - { - _reporter.WriteLine(warningMessage.Yellow()); - } + if (warningMessage != null) + { + _reporter.WriteLine(warningMessage.Yellow()); } - FilePath manifestFile = manifestFileOptional ?? GetManifestFilePath(); + manifestFile = manifestFileOptional ?? GetManifestFilePath(); var existingPackageWithPackageId = _toolManifestFinder.Find(manifestFile).Where(p => p.PackageId.Equals(_packageId)); if (!existingPackageWithPackageId.Any()) @@ -156,7 +154,7 @@ public int InstallNewTool(FilePath manifestFile) return 0; } - private FilePath GetManifestFilePath() + public FilePath GetManifestFilePath() { try { From c0b55289a6db73c8d0303395a5daefbf7a532872 Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Mon, 4 Dec 2023 15:21:45 -0600 Subject: [PATCH 363/550] Minimize and update MSBuild in dotnet-watch (#37310) Dotnet-watch was distributing copies of MSBuild assemblies, including StringTools, from the older (VS compatibility) MSBuild version referenced repo-wide instead of the "current" MSBuild distributed with the SDK itself. Added central versions for the MSBuild packages that weren't there already, referenced them in the redist and tool_msbuild projects, and updated dotnet-watch to stop distributing the other MSBuild assemblies. --- Directory.Packages.props | 1 + eng/Versions.props | 1 + src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 3 +++ src/Layout/redist/redist.csproj | 1 + src/Layout/tool_msbuild/tool_msbuild.csproj | 1 + 5 files changed, 7 insertions(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index eb74dea8e7f6..efa446634113 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -41,6 +41,7 @@ + diff --git a/eng/Versions.props b/eng/Versions.props index 2b591f0593d3..b99767b65577 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -117,6 +117,7 @@ $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildTasksCorePackageVersion) + $(MicrosoftBuildPackageVersion) diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj index 1a03973fcd4f..747b43b278a6 100644 --- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj @@ -26,9 +26,12 @@ + + + - 17.9.0-preview-23604-01 + 17.9.0-preview-23605-02 $(MicrosoftBuildPackageVersion) - 12.8.0-beta.23604.1 + 12.8.200-beta.23605.2 From b6bacfcc5cad48486026fb64c05914b9e2e1dc1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Dec 2023 13:57:48 +0000 Subject: [PATCH 371/550] Update dependencies from https://github.com/microsoft/vstest build 20231204.1 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23580-01 -> To Version 17.9.0-preview-23604-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 256387014dfc..cddee0af0efb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client 707c46e558b2b027d7ae942028c369e26545f10a - + https://github.com/microsoft/vstest - d6dc5a0343fec142369c744466be1d1fc52fecdb + 3dec0798866b2d16b838d7a78421070b99574861 - + https://github.com/microsoft/vstest - d6dc5a0343fec142369c744466be1d1fc52fecdb + 3dec0798866b2d16b838d7a78421070b99574861 - + https://github.com/microsoft/vstest - d6dc5a0343fec142369c744466be1d1fc52fecdb + 3dec0798866b2d16b838d7a78421070b99574861 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b99767b65577..09efe8ebf31d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23580-01 - 17.9.0-preview-23580-01 - 17.9.0-preview-23580-01 + 17.9.0-preview-23604-01 + 17.9.0-preview-23604-01 + 17.9.0-preview-23604-01 From c94aaa195c39fa15f53bc19b6fcedde8dec1c5f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Dec 2023 13:58:07 +0000 Subject: [PATCH 372/550] Update dependencies from https://github.com/dotnet/razor build 20231205.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23602.1 -> To Version 7.0.0-preview.23605.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 256387014dfc..573e5e7416a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 2d191ab8c8b23ce0297a8f5a32d33833d4db4cfc + 96a1ad3afcdfa47f0989dd0440c909ef2e5166e2 - + https://github.com/dotnet/razor - 2d191ab8c8b23ce0297a8f5a32d33833d4db4cfc + 96a1ad3afcdfa47f0989dd0440c909ef2e5166e2 - + https://github.com/dotnet/razor - 2d191ab8c8b23ce0297a8f5a32d33833d4db4cfc + 96a1ad3afcdfa47f0989dd0440c909ef2e5166e2 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b99767b65577..a80eafe16d5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23602.1 - 7.0.0-preview.23602.1 - 7.0.0-preview.23602.1 + 7.0.0-preview.23605.1 + 7.0.0-preview.23605.1 + 7.0.0-preview.23605.1 From df20c62f59589aec18ae09ff01754e5d97efe59a Mon Sep 17 00:00:00 2001 From: Michal Pavlik Date: Tue, 21 Nov 2023 14:17:59 +0100 Subject: [PATCH 373/550] Containers support was moved higher to enable creating image of CLI applications. --- src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets | 13 +++++++++++++ .../Publish/Targets/Microsoft.NET.Sdk.Publish.props | 3 --- .../Targets/Microsoft.NET.Sdk.Publish.targets | 13 ------------- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets index 136d5d2cb673..511ae5a4cf7c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets @@ -52,4 +52,17 @@ Copyright (c) .NET Foundation. All rights reserved. + + + + <_ContainersTargetsDir Condition=" '$(_ContainersTargetsDir)'=='' ">$(MSBuildThisFileDirectory)..\..\..\Containers\build\ + + + + + diff --git a/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.props b/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.props index ac284f1689d5..862cdafc5d89 100644 --- a/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.props +++ b/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.props @@ -15,7 +15,4 @@ Copyright (c) .NET Foundation. All rights reserved. true - - diff --git a/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets b/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets index f6779faa84a6..31fa12dbe509 100644 --- a/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets +++ b/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets @@ -29,7 +29,6 @@ Copyright (C) Microsoft Corporation. All rights reserved. <_PublishTargetsDir Condition=" '$(_PublishTargetsDir)'=='' ">$(MSBuildThisFileDirectory)PublishTargets\ <_DotNetCLIToolTargetsDir Condition=" '$(_DotNetCLIToolTargetsDir)'=='' ">$(MSBuildThisFileDirectory)DotNetCLIToolTargets\ <_PublishProfilesDir Condition=" '$(_PublishProfilesDir)'=='' ">$(MSBuildThisFileDirectory)PublishProfiles\ - <_ContainersTargetsDir Condition=" '$(_ContainersTargetsDir)'=='' ">$(MSBuildThisFileDirectory)..\..\..\Containers\build\ - - - - + Condition="'$(IsPublishable)' == 'true' AND '$(EnableSdkContainerSupport)' == 'true'"> $(NetCoreRoot) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets index 511ae5a4cf7c..a506081a2017 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets @@ -59,10 +59,8 @@ Copyright (c) .NET Foundation. All rights reserved. + Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\Containers\build\Microsoft.NET.Build.Containers.props')" /> + Condition="Exists('$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets') AND '$(TargetFramework)' != ''" /> From 9606dfe2fcd1097a2af737469b08c8b5a28bd49c Mon Sep 17 00:00:00 2001 From: Michal Pavlik Date: Tue, 5 Dec 2023 16:28:06 +0100 Subject: [PATCH 375/550] Added end to end test --- .../EndToEndTests.cs | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index c012fbd153f3..756e29a19645 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -6,6 +6,8 @@ using Microsoft.NET.Build.Containers.LocalDaemons; using Microsoft.NET.Build.Containers.Resources; using Microsoft.NET.Build.Containers.UnitTests; +using Newtonsoft.Json.Linq; +using NuGet.ProjectModel; using ILogger = Microsoft.Extensions.Logging.ILogger; namespace Microsoft.NET.Build.Containers.IntegrationTests; @@ -209,6 +211,90 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st return publishDirectory; } + // [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/36160")] + [Fact] + public async Task EndToEnd_MultiProjectSolution() + { + ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution)); + DirectoryInfo newSolutionDir = new(Path.Combine(TestSettings.TestArtifactsDirectory, $"CreateNewImageTest_EndToEnd_MultiProjectSolution")); + + if (newSolutionDir.Exists) + { + newSolutionDir.Delete(recursive: true); + } + + newSolutionDir.Create(); + + // Create solution with projects + new DotnetNewCommand(_testOutput, "sln", "-n", nameof(EndToEnd_MultiProjectSolution)) + .WithVirtualHive() + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + new DotnetNewCommand(_testOutput, "console", "-n", "ConsoleApp") + .WithVirtualHive() + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + new DotnetCommand(_testOutput, "sln", "add", "ConsoleApp\\ConsoleApp.csproj") + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + new DotnetNewCommand(_testOutput, "web", "-n", "WebApp") + .WithVirtualHive() + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + new DotnetCommand(_testOutput, "sln", "add", "WebApp\\WebApp.csproj") + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute() + .Should().Pass(); + + // Add 'EnableSdkContainerSupport' property to the ConsoleApp and set TFM + using (FileStream stream = File.Open(Path.Join(newSolutionDir.FullName, "ConsoleApp", "ConsoleApp.csproj"), FileMode.Open, FileAccess.ReadWrite)) + { + XDocument document = await XDocument.LoadAsync(stream, LoadOptions.None, CancellationToken.None); + document + .Descendants() + .First(e => e.Name.LocalName == "PropertyGroup")? + .Add(new XElement("EnableSdkContainerSupport", "true")); + document + .Descendants() + .First(e => e.Name.LocalName == "TargetFramework") + .Value = ToolsetInfo.CurrentTargetFramework; + + stream.SetLength(0); + await document.SaveAsync(stream, SaveOptions.None, CancellationToken.None); + } + + // Set TFM for WebApp + using (FileStream stream = File.Open(Path.Join(newSolutionDir.FullName, "WebApp", "WebApp.csproj"), FileMode.Open, FileAccess.ReadWrite)) + { + XDocument document = await XDocument.LoadAsync(stream, LoadOptions.None, CancellationToken.None); + document + .Descendants() + .First(e => e.Name.LocalName == "TargetFramework") + .Value = ToolsetInfo.CurrentTargetFramework; + + stream.SetLength(0); + await document.SaveAsync(stream, SaveOptions.None, CancellationToken.None); + } + + // Publish + CommandResult commandResult = new DotnetCommand(_testOutput, "publish", "/t:PublishContainer") + .WithWorkingDirectory(newSolutionDir.FullName) + .Execute(); + + string stdOut = commandResult.StdOut; + + commandResult.Should().Pass(); + commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'"); + commandResult.Should().HaveStdOutContaining("Pushed image 'consoleapp:latest'"); + } [DockerAvailableTheory()] [InlineData("webapi", false)] From c7bec2af9294d67ccf983a4ceab408a11897c9eb Mon Sep 17 00:00:00 2001 From: Michal Pavlik Date: Tue, 5 Dec 2023 16:29:16 +0100 Subject: [PATCH 376/550] Enabled DockerAvailableFact for the test --- .../EndToEndTests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 756e29a19645..bdb1af605eb2 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -211,8 +211,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st return publishDirectory; } - // [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/36160")] - [Fact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/36160")] public async Task EndToEnd_MultiProjectSolution() { ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution)); From d520218f734e2838ce46e8a66873d9c632805d21 Mon Sep 17 00:00:00 2001 From: Michal Pavlik Date: Tue, 5 Dec 2023 16:32:52 +0100 Subject: [PATCH 377/550] Removed unnecessary assignment --- .../EndToEndTests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index bdb1af605eb2..e1392fd7829a 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -288,8 +288,6 @@ public async Task EndToEnd_MultiProjectSolution() .WithWorkingDirectory(newSolutionDir.FullName) .Execute(); - string stdOut = commandResult.StdOut; - commandResult.Should().Pass(); commandResult.Should().HaveStdOutContaining("Pushed image 'webapp:latest'"); commandResult.Should().HaveStdOutContaining("Pushed image 'consoleapp:latest'"); From 7792bc2408abd2065b87a8d4bbc13549f817a552 Mon Sep 17 00:00:00 2001 From: Michal Pavlik Date: Tue, 5 Dec 2023 16:33:39 +0100 Subject: [PATCH 378/550] Removed unnecessary usings --- .../EndToEndTests.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index e1392fd7829a..0339d2d3324a 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -6,8 +6,6 @@ using Microsoft.NET.Build.Containers.LocalDaemons; using Microsoft.NET.Build.Containers.Resources; using Microsoft.NET.Build.Containers.UnitTests; -using Newtonsoft.Json.Linq; -using NuGet.ProjectModel; using ILogger = Microsoft.Extensions.Logging.ILogger; namespace Microsoft.NET.Build.Containers.IntegrationTests; From 44870500e04c3e9a5a9b0e4274862377b83037e7 Mon Sep 17 00:00:00 2001 From: Jason Malinowski Date: Wed, 22 Nov 2023 13:44:07 -0800 Subject: [PATCH 379/550] Ensure we deploy all Roslyn binaries into the MSBuildWorkspace BuildHosts This unblocks the flow from Roslyn to the SDK repo. --- .../redist/targets/PublishDotnetWatch.targets | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/Layout/redist/targets/PublishDotnetWatch.targets b/src/Layout/redist/targets/PublishDotnetWatch.targets index 71c633552f01..be9cf2b38d6f 100644 --- a/src/Layout/redist/targets/PublishDotnetWatch.targets +++ b/src/Layout/redist/targets/PublishDotnetWatch.targets @@ -14,12 +14,17 @@ To reduce the size of the SDK, we use the compiler dependencies that are located in the `Roslyn/bincore` location instead of shipping our own copies in the dotnet-watch tool. These assemblies will be resolved by path in the dotnet-watch executable. + + We make an exception for the Microsoft.CodeAnalysis binaries deployed with the MSBuildWorkspace BuildHosts, since those don't + have any logic to pick up Roslyn from another location. Those can be addressed a different way which tracked in + https://github.com/dotnet/roslyn/issues/70945. --> <_DotnetWatchInputFile Include="@(_DotnetWatchBuildOutput)" - Condition="'%(Filename)' != 'Microsoft.CodeAnalysis' and - '%(Filename)' != 'Microsoft.CodeAnalysis.resources' and - '%(Filename)' != 'Microsoft.CodeAnalysis.CSharp' and - '%(Filename)' != 'Microsoft.CodeAnalysis.CSharp.resources'"/> + Condition="('%(Filename)' != 'Microsoft.CodeAnalysis' and + '%(Filename)' != 'Microsoft.CodeAnalysis.resources' and + '%(Filename)' != 'Microsoft.CodeAnalysis.CSharp' and + '%(Filename)' != 'Microsoft.CodeAnalysis.CSharp.resources') or + $([MSBuild]::ValueOrDefault('%(FullPath)', '').Contains('BuildHost'))" /> From 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Tue, 5 Dec 2023 19:02:52 -0600 Subject: [PATCH 380/550] Correct emsdk Version.Details.xml sha (#37305) --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a87cf5bae919..086a0bb46c29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,7 +49,7 @@ https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 https://github.com/dotnet/msbuild From 525c78bfc0270b056083c890ff4b5f1f47090da3 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Tue, 5 Dec 2023 22:13:08 -0800 Subject: [PATCH 381/550] fix build error --- .../ToolInstallGlobalOrToolPathCommand.cs | 68 ++++++++----------- ...ToolInstallGlobalOrToolPathCommandTests.cs | 2 +- 2 files changed, 31 insertions(+), 39 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs index b26cc6dd3dea..a8384ee9de7e 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs @@ -231,18 +231,7 @@ private void RunWithHandlingUninstallError(Action uninstallAction) { try { - uninstallAction(); - if (!_verbosity.IsQuiet()) - { - _reporter.WriteLine( - string.Format( - LocalizableStrings.InstallationSucceeded, - string.Join(", ", package.Commands.Select(c => c.Name)), - package.Id, - package.Version.ToNormalizedString()).Green()); - } - - return 0; + uninstallAction(); } catch (Exception ex) when (ToolUninstallCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex)) @@ -296,33 +285,36 @@ private IToolPackage GetOldPackage(IToolPackageStoreQuery toolPackageStoreQuery) private void PrintSuccessMessage(IToolPackage oldPackage, IToolPackage newInstalledPackage) { - if (oldPackage == null) - { - _reporter.WriteLine( - string.Format( - Install.LocalizableStrings.InstallationSucceeded, - string.Join(", ", newInstalledPackage.Commands.Select(c => c.Name)), - newInstalledPackage.Id, - newInstalledPackage.Version.ToNormalizedString()).Green()); - } - else if (oldPackage.Version != newInstalledPackage.Version) - { - _reporter.WriteLine( - string.Format( - Update.LocalizableStrings.UpdateSucceeded, - newInstalledPackage.Id, - oldPackage.Version.ToNormalizedString(), - newInstalledPackage.Version.ToNormalizedString()).Green()); - } - else + if (!_verbosity.IsQuiet()) { - _reporter.WriteLine( - string.Format( - ( - newInstalledPackage.Version.IsPrerelease ? - Update.LocalizableStrings.UpdateSucceededPreVersionNoChange : Update.LocalizableStrings.UpdateSucceededStableVersionNoChange - ), - newInstalledPackage.Id, newInstalledPackage.Version).Green()); + if (oldPackage == null) + { + _reporter.WriteLine( + string.Format( + Install.LocalizableStrings.InstallationSucceeded, + string.Join(", ", newInstalledPackage.Commands.Select(c => c.Name)), + newInstalledPackage.Id, + newInstalledPackage.Version.ToNormalizedString()).Green()); + } + else if (oldPackage.Version != newInstalledPackage.Version) + { + _reporter.WriteLine( + string.Format( + Update.LocalizableStrings.UpdateSucceeded, + newInstalledPackage.Id, + oldPackage.Version.ToNormalizedString(), + newInstalledPackage.Version.ToNormalizedString()).Green()); + } + else + { + _reporter.WriteLine( + string.Format( + ( + newInstalledPackage.Version.IsPrerelease ? + Update.LocalizableStrings.UpdateSucceededPreVersionNoChange : Update.LocalizableStrings.UpdateSucceededStableVersionNoChange + ), + newInstalledPackage.Id, newInstalledPackage.Version).Green()); + } } } } diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs index 43507c40fa3a..35259d0a81c4 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs @@ -298,7 +298,7 @@ public void WhenRunWithPackageIdWithQuietItShouldShowNoSuccessMessage() var parseResultQuiet = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --verbosity quiet"); var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( parseResultQuiet, - _createToolPackageStoresAndDownloader, + _createToolPackageStoreDownloaderUninstaller, _createShellShimRepository, new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), _reporter); From 381a5e042a65eb6e7b4c736c9b9b6187cbcfb888 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Wed, 6 Dec 2023 02:49:43 -0800 Subject: [PATCH 382/550] add global tool install test --- ...ToolInstallGlobalOrToolPathCommandTests.cs | 224 ++++++++++++++++++ 1 file changed, 224 insertions(+) diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs index 35259d0a81c4..454deda48a47 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs @@ -20,6 +20,7 @@ using static System.Formats.Asn1.AsnWriter; using CreateShellShimRepository = Microsoft.DotNet.Tools.Tool.Install.CreateShellShimRepository; + namespace Microsoft.DotNet.Tests.Commands.Tool { public class ToolInstallGlobalOrToolPathCommandTests: SdkTest @@ -39,6 +40,8 @@ public class ToolInstallGlobalOrToolPathCommandTests: SdkTest private readonly string _pathToPlacePackages; private const string PackageId = "global.tool.console.demo"; private const string PackageVersion = "1.0.4"; + private const string HigherPackageVersion = "2.0.0"; + private const string LowerPackageVersion = "1.0.0"; private const string ToolCommandName = "SimulatorCommand"; private readonly string UnlistedPackageId = "elemental.sysinfotool"; @@ -361,6 +364,171 @@ public void WhenRunWithExactVersionItShouldSucceed() PackageVersion).Green()); } + [Fact] + public void WhenInstallTheSameVersionTwiceItShouldSucceed() + { + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion} --verbosity minimal"); + + var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( + result, + _createToolPackageStoreDownloaderUninstaller, + _createShellShimRepository, + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), + _reporter); + + toolInstallGlobalOrToolPathCommand.Execute().Should().Be(0); + + _reporter + .Lines + .Should() + .Equal(string.Format( + LocalizableStrings.InstallationSucceeded, + ToolCommandName, + PackageId, + PackageVersion).Green()); + _reporter.Clear(); + + toolInstallGlobalOrToolPathCommand.Execute().Should().Be(0); + + _reporter + .Lines + .Should() + .Equal(string.Format( + Microsoft.DotNet.Tools.Tool.Update.LocalizableStrings.UpdateSucceededStableVersionNoChange, + PackageId, + PackageVersion).Green()); + } + + [Fact] + public void WhenInstallWithHigherVersionItShouldUpdate() + { + IToolPackageDownloader toolToolPackageDownloader = GetToolPackageDownloaderWithHigherVersionInFeed(); + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion} --verbosity minimal"); + + var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( + result, + (location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolToolPackageDownloader, _toolPackageUninstallerMock), + _createShellShimRepository, + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), + _reporter); + + toolInstallGlobalOrToolPathCommand.Execute().Should().Be(0); + + _reporter + .Lines + .Should() + .Equal(string.Format( + LocalizableStrings.InstallationSucceeded, + ToolCommandName, + PackageId, + PackageVersion).Green()); + _reporter.Clear(); + + ParseResult result2 = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {HigherPackageVersion} --verbosity minimal"); + + var toolInstallGlobalOrToolPathCommand2 = new ToolInstallGlobalOrToolPathCommand( + result2, + (location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolToolPackageDownloader, _toolPackageUninstallerMock), + _createShellShimRepository, + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), + _reporter); + + toolInstallGlobalOrToolPathCommand2.Execute().Should().Be(0); + + _reporter + .Lines + .Should() + .Equal(string.Format( + Microsoft.DotNet.Tools.Tool.Update.LocalizableStrings.UpdateSucceeded, + PackageId, + PackageVersion, + HigherPackageVersion).Green()); + } + + [Fact] + public void WhenInstallWithLowerVersionWithAllowDowngradeOptionItShouldDowngrade() + { + IToolPackageDownloader toolToolPackageDownloader = GetToolPackageDownloaderWithLowerVersionInFeed(); + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion} --verbosity minimal"); + + var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( + result, + (location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolToolPackageDownloader, _toolPackageUninstallerMock), + _createShellShimRepository, + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), + _reporter); + + toolInstallGlobalOrToolPathCommand.Execute().Should().Be(0); + + _reporter + .Lines + .Should() + .Equal(string.Format( + LocalizableStrings.InstallationSucceeded, + ToolCommandName, + PackageId, + PackageVersion).Green()); + _reporter.Clear(); + + ParseResult result2 = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {LowerPackageVersion} --verbosity minimal --allow-downgrade"); + + var toolInstallGlobalOrToolPathCommand2 = new ToolInstallGlobalOrToolPathCommand( + result2, + (location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolToolPackageDownloader, _toolPackageUninstallerMock), + _createShellShimRepository, + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), + _reporter); + + toolInstallGlobalOrToolPathCommand2.Execute().Should().Be(0); + + _reporter + .Lines + .Should() + .Equal(string.Format( + Microsoft.DotNet.Tools.Tool.Update.LocalizableStrings.UpdateSucceeded, + PackageId, + PackageVersion, + LowerPackageVersion).Green()); + } + + [Fact] + public void WhenInstallWithLowerVersionItShouldFail() + { + IToolPackageDownloader toolToolPackageDownloader = GetToolPackageDownloaderWithLowerVersionInFeed(); + ParseResult result = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {PackageVersion} --verbosity minimal"); + + var toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( + result, + (location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolToolPackageDownloader, _toolPackageUninstallerMock), + _createShellShimRepository, + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), + _reporter); + + toolInstallGlobalOrToolPathCommand.Execute().Should().Be(0); + + _reporter + .Lines + .Should() + .Equal(string.Format( + LocalizableStrings.InstallationSucceeded, + ToolCommandName, + PackageId, + PackageVersion).Green()); + _reporter.Clear(); + + ParseResult result2 = Parser.Instance.Parse($"dotnet tool install -g {PackageId} --version {LowerPackageVersion} --verbosity minimal"); + + var toolInstallGlobalOrToolPathCommand2 = new ToolInstallGlobalOrToolPathCommand( + result2, + (location, forwardArguments) => (_toolPackageStore, _toolPackageStoreQuery, toolToolPackageDownloader, _toolPackageUninstallerMock), + _createShellShimRepository, + new EnvironmentPathInstructionMock(_reporter, _pathToPlaceShim, true), + _reporter); + + Action a = () => toolInstallGlobalOrToolPathCommand2.Execute(); + a.Should().Throw(); + } + [Fact] public void WhenRunWithValidVersionRangeItShouldSucceed() { @@ -504,6 +672,62 @@ private IToolPackageDownloader GetToolToolPackageDownloaderWithPreviewInFeed() return toolToolPackageDownloader; } + private IToolPackageDownloader GetToolPackageDownloaderWithLowerVersionInFeed() + { + var toolToolPackageDownloader = CreateToolPackageDownloader( + feeds: new List + { + new MockFeed + { + Type = MockFeedType.ImplicitAdditionalFeed, + Packages = new List + { + new MockFeedPackage + { + PackageId = PackageId, + Version = "1.0.4", + ToolCommandName = "SimulatorCommand" + }, + new MockFeedPackage + { + PackageId = PackageId, + Version = "1.0.0", + ToolCommandName = "SimulatorCommand" + } + } + } + }); + return toolToolPackageDownloader; + } + + private IToolPackageDownloader GetToolPackageDownloaderWithHigherVersionInFeed() + { + var toolToolPackageDownloader = CreateToolPackageDownloader( + feeds: new List + { + new MockFeed + { + Type = MockFeedType.ImplicitAdditionalFeed, + Packages = new List + { + new MockFeedPackage + { + PackageId = PackageId, + Version = "1.0.4", + ToolCommandName = "SimulatorCommand" + }, + new MockFeedPackage + { + PackageId = PackageId, + Version = "2.0.0", + ToolCommandName = "SimulatorCommand" + } + } + } + }); + return toolToolPackageDownloader; + } + [Fact] public void WhenRunWithoutAMatchingRangeItShouldFail() { From 1bbd8e0c84425aa5b7c2c13d5be1dc9d87a3fb95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Dec 2023 13:52:12 +0000 Subject: [PATCH 383/550] Update dependencies from https://github.com/dotnet/fsharp build 20231206.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23605.2 -> To Version 8.0.200-beta.23606.1 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.0 -> To Version 8.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2ef5127f374..e7bed064e5a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,7 +49,7 @@ https://github.com/dotnet/emsdk - 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + 2406616d0e3a31d80b326e27c156955bfa41c791 https://github.com/dotnet/msbuild @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 2f3d37672a69142a13a62856b09034a915bedc70 - + https://github.com/dotnet/fsharp - 05bb885a7119b541816e16ca9980ab685ffbfaa5 + 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 - + https://github.com/dotnet/fsharp - 05bb885a7119b541816e16ca9980ab685ffbfaa5 + 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 diff --git a/eng/Versions.props b/eng/Versions.props index 0ab74cb5aad6..47585593d722 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,7 +134,7 @@ - 12.8.200-beta.23605.2 + 12.8.200-beta.23606.1 @@ -210,7 +210,7 @@ 8.0.0 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) + 8.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 98137382ff6e32ac25bce48726a7e36cc121b2ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 22:40:29 +0000 Subject: [PATCH 384/550] [release/8.0.2xx] Update dependencies from dotnet/sourcelink (#37357) [release/8.0.2xx] Update dependencies from dotnet/sourcelink - Coherency Updates: - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100: from 8.0.0 to 8.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 14 +++++++------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2ef5127f374..6f3f21c4007d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -49,7 +49,7 @@ https://github.com/dotnet/emsdk - 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + 2406616d0e3a31d80b326e27c156955bfa41c791 https://github.com/dotnet/msbuild @@ -347,30 +347,30 @@ https://github.com/dotnet/deployment-tools 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/sourcelink - f6b97c9ef635ad82b195a952ac0e0a969b9cf39c + 61bad8d452942eba97afabd479a58a0b1c288ee0 - + https://github.com/dotnet/sourcelink - f6b97c9ef635ad82b195a952ac0e0a969b9cf39c + 61bad8d452942eba97afabd479a58a0b1c288ee0 - + https://github.com/dotnet/sourcelink - f6b97c9ef635ad82b195a952ac0e0a969b9cf39c + 61bad8d452942eba97afabd479a58a0b1c288ee0 - + https://github.com/dotnet/sourcelink - f6b97c9ef635ad82b195a952ac0e0a969b9cf39c + 61bad8d452942eba97afabd479a58a0b1c288ee0 - + https://github.com/dotnet/sourcelink - f6b97c9ef635ad82b195a952ac0e0a969b9cf39c + 61bad8d452942eba97afabd479a58a0b1c288ee0 - + https://github.com/dotnet/sourcelink - f6b97c9ef635ad82b195a952ac0e0a969b9cf39c + 61bad8d452942eba97afabd479a58a0b1c288ee0 diff --git a/eng/Versions.props b/eng/Versions.props index 0ab74cb5aad6..85aa4d514f99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,12 +178,12 @@ - 8.0.0-beta.23578.1 - 8.0.0-beta.23578.1 - 8.0.0-beta.23578.1 - 8.0.0-beta.23578.1 - 8.0.0-beta.23578.1 - 8.0.0-beta.23578.1 + 8.0.0-beta.23605.1 + 8.0.0-beta.23605.1 + 8.0.0-beta.23605.1 + 8.0.0-beta.23605.1 + 8.0.0-beta.23605.1 + 8.0.0-beta.23605.1 @@ -210,7 +210,7 @@ 8.0.0 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) + 8.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 6 Dec 2023 22:40:38 +0000 Subject: [PATCH 385/550] [release/8.0.2xx] Update dependencies from nuget/nuget.client (#37358) [release/8.0.2xx] Update dependencies from nuget/nuget.client - Coherency Updates: - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100: from 8.0.0 to 8.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f3f21c4007d..530d2d46caa6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 85aa4d514f99..8913da5ae538 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.45 - 6.9.0-preview.1.45 + 6.9.0-preview.1.49 + 6.9.0-preview.1.49 6.0.0-rc.278 - 6.9.0-preview.1.45 - 6.9.0-preview.1.45 - 6.9.0-preview.1.45 - 6.9.0-preview.1.45 - 6.9.0-preview.1.45 - 6.9.0-preview.1.45 - 6.9.0-preview.1.45 - 6.9.0-preview.1.45 - 6.9.0-preview.1.45 + 6.9.0-preview.1.49 + 6.9.0-preview.1.49 + 6.9.0-preview.1.49 + 6.9.0-preview.1.49 + 6.9.0-preview.1.49 + 6.9.0-preview.1.49 + 6.9.0-preview.1.49 + 6.9.0-preview.1.49 + 6.9.0-preview.1.49 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From acd780029dbec62701a3644e0f64b1019021ba0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 00:32:04 +0000 Subject: [PATCH 386/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#36861) [release/8.0.2xx] Update dependencies from dotnet/roslyn --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 530d2d46caa6..a1d1aad468bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 + 6e0810e5148df608d62d169b007f6cbbe376a81e - + https://github.com/dotnet/roslyn - 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 + 6e0810e5148df608d62d169b007f6cbbe376a81e - + https://github.com/dotnet/roslyn - 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 + 6e0810e5148df608d62d169b007f6cbbe376a81e - + https://github.com/dotnet/roslyn - 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 + 6e0810e5148df608d62d169b007f6cbbe376a81e - + https://github.com/dotnet/roslyn - 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 + 6e0810e5148df608d62d169b007f6cbbe376a81e - + https://github.com/dotnet/roslyn - 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 + 6e0810e5148df608d62d169b007f6cbbe376a81e - + https://github.com/dotnet/roslyn - 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 + 6e0810e5148df608d62d169b007f6cbbe376a81e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8913da5ae538..9967f86141fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-2.23562.2 - 4.9.0-2.23562.2 - 4.9.0-2.23562.2 - 4.9.0-2.23562.2 - 4.9.0-2.23562.2 - 4.9.0-2.23562.2 - 4.9.0-2.23562.2 + 4.9.0-3.23605.1 + 4.9.0-3.23605.1 + 4.9.0-3.23605.1 + 4.9.0-3.23605.1 + 4.9.0-3.23605.1 + 4.9.0-3.23605.1 + 4.9.0-3.23605.1 $(MicrosoftNetCompilersToolsetPackageVersion) From fdb11302fe08b6250033c90a5cd58434686baeab Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Wed, 6 Dec 2023 19:31:54 -0800 Subject: [PATCH 387/550] fix tests --- .../ToolUpdateGlobalOrToolPathCommand.cs | 3 ++- ...ToolInstallGlobalOrToolPathCommandTests.cs | 20 +++++++++---------- .../ToolInstallLocalCommandTests.cs | 10 +--------- 3 files changed, 12 insertions(+), 21 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs index cfa39bcbb1b2..54ad0d036886 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs @@ -40,7 +40,8 @@ public ToolUpdateGlobalOrToolPathCommand(ParseResult parseResult, () => new ToolInstallGlobalOrToolPathCommand( parseResult, _createToolPackageStoreDownloaderUninstaller, - _createShellShimRepository)); + _createShellShimRepository, + reporter: reporter)); } public override int Execute() diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs index 454deda48a47..0d15084cb1f3 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallGlobalOrToolPathCommandTests.cs @@ -1,24 +1,22 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.CommandLine; +using System.Text.Json; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.ToolPackage; using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Tools; +using Microsoft.DotNet.ShellShim; using Microsoft.DotNet.ToolPackage; -using Microsoft.DotNet.Tools.Tool.Install; +using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.Tests.ComponentMocks; -using Microsoft.DotNet.ShellShim; +using Microsoft.DotNet.Tools.Tool.Install; +using Microsoft.DotNet.Tools.Tool.Update; using Microsoft.Extensions.DependencyModel.Tests; using Microsoft.Extensions.EnvironmentAbstractions; +using CreateShellShimRepository = Microsoft.DotNet.Tools.Tool.Install.CreateShellShimRepository; using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings; -using System.Text.Json; -using System.CommandLine; using Parser = Microsoft.DotNet.Cli.Parser; -using Microsoft.DotNet.Cli.NuGetPackageDownloader; -using Microsoft.NET.TestFramework; -using Microsoft.DotNet.Cli.ToolPackage; -using Microsoft.DotNet.Tools.Tool.Update; -using static System.Formats.Asn1.AsnWriter; -using CreateShellShimRepository = Microsoft.DotNet.Tools.Tool.Install.CreateShellShimRepository; namespace Microsoft.DotNet.Tests.Commands.Tool diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs index 9c6e1f4b4101..c4f0f2f9751f 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolInstallLocalCommandTests.cs @@ -1,11 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using FluentAssertions; using System.CommandLine; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.ToolPackage; @@ -16,12 +11,9 @@ using Microsoft.DotNet.Tools.Tool.Install; using Microsoft.Extensions.DependencyModel.Tests; using Microsoft.Extensions.EnvironmentAbstractions; -using Xunit; +using NuGet.Frameworks; using NuGet.Versioning; using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Install.LocalizableStrings; -using Microsoft.NET.TestFramework.Utilities; -using System.CommandLine.Parsing; -using NuGet.Frameworks; using Parser = Microsoft.DotNet.Cli.Parser; namespace Microsoft.DotNet.Tests.Commands.Tool From e8048bcfa3f329f686f616b562f7557b3dc56d91 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Wed, 6 Dec 2023 19:38:00 -0800 Subject: [PATCH 388/550] add fail to update to lower version --- .../ToolUpdateGlobalOrToolPathCommandTests.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs index 2fbbe9c1c450..3478cf6c5a1c 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateGlobalOrToolPathCommandTests.cs @@ -152,6 +152,21 @@ public void GivenAnExistedLowerversionInstallationWhenCallItCanPrintSuccessMessa _packageId, LowerPackageVersion, HigherPackageVersion)); } + [Fact] + public void GivenAnExistedHigherversionInstallationWhenUpdateToLowerVersionItErrors() + { + CreateInstallCommand($"-g {_packageId} --version {HigherPackageVersion}").Execute(); + _reporter.Lines.Clear(); + + var command = CreateUpdateCommand($"-g {_packageId} --version {LowerPackageVersion} --verbosity minimal"); + + Action a = () => command.Execute(); + + a.Should().Throw().And.Message + .Should().Contain( + string.Format(LocalizableStrings.UpdateToLowerVersion, LowerPackageVersion, HigherPackageVersion)); + } + [Fact] public void GivenAnExistedLowerversionInstallationWhenCallWithWildCardVersionItCanPrintSuccessMessage() { From 891e77865e78bdc17b727183d74d0be852987f01 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Wed, 6 Dec 2023 19:43:54 -0800 Subject: [PATCH 389/550] Update update message --- .../commands/dotnet-tool/update/LocalizableStrings.resx | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.cs.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.de.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.es.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.fr.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.it.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.ja.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.ko.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.pl.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.ru.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.tr.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf | 8 ++++---- .../dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf | 8 ++++---- 14 files changed, 54 insertions(+), 54 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx index 5337b9218764..a6d39289fd5b 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx @@ -183,10 +183,10 @@ and the corresponding package Ids for installed tools using the command 'dotnet tool list'. - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). + Tool '{0}' was reinstalled with the stable version (version '{1}'). Tool '{0}' failed to update due to the following: diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf index 65296bb3cbca..b37e373dc13c 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - Nástroj{0}byl znovu nainstalován s nejnovější předběžnou verzí (verze{1}). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Nástroj{0}byl znovu nainstalován s nejnovější předběžnou verzí (verze{1}). - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - Nástroj {0} byl přeinstalován nejnovější stabilní verzí (verze {1}). + Tool '{0}' was reinstalled with the stable version (version '{1}'). + Nástroj {0} byl přeinstalován nejnovější stabilní verzí (verze {1}). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf index 286a1bfbb200..f1055f4f47ce 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - Das Tool „{0}“ wurde in der neuesten Vorabversion neu installiert (Version „{1}“). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Das Tool „{0}“ wurde in der neuesten Vorabversion neu installiert (Version „{1}“). - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - Das Tool "{0}" wurde in der neuesten stabilen Version neu installiert (Version {1}). + Tool '{0}' was reinstalled with the stable version (version '{1}'). + Das Tool "{0}" wurde in der neuesten stabilen Version neu installiert (Version {1}). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf index d127885daa80..dbcec7c79278 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - La herramienta "{0}" se ha reinstalado con la versión preliminar más reciente (versión "{1}"). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + La herramienta "{0}" se ha reinstalado con la versión preliminar más reciente (versión "{1}"). - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - La herramienta "{0}" se reinstaló con la versión estable más reciente (versión "{1}"). + Tool '{0}' was reinstalled with the stable version (version '{1}'). + La herramienta "{0}" se reinstaló con la versión estable más reciente (versión "{1}"). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf index 0efd80b9ed91..b8e72a13aebc 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - L'outil '{0}' a été réinstallé avec la dernière version préliminaire (version '{1}'). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + L'outil '{0}' a été réinstallé avec la dernière version préliminaire (version '{1}'). - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - L'outil '{0}' a été réinstallé avec la dernière version stable (version '{1}'). + Tool '{0}' was reinstalled with the stable version (version '{1}'). + L'outil '{0}' a été réinstallé avec la dernière version stable (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf index 536836352698..ab8a4fc96ac2 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - Lo strumento '{0}' è stato reinstallato con l'ultima versione preliminare (versione '{1}'). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Lo strumento '{0}' è stato reinstallato con l'ultima versione preliminare (versione '{1}'). - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - Lo strumento '{0}' è stato reinstallato con l'ultima versione stabile (versione '{1}'). + Tool '{0}' was reinstalled with the stable version (version '{1}'). + Lo strumento '{0}' è stato reinstallato con l'ultima versione stabile (versione '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf index d04705c2d983..505dff1ccb0e 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - ツール '{0}' は、最新のプレリリース バージョン (バージョン '{1}') で再インストールされました。 + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + ツール '{0}' は、最新のプレリリース バージョン (バージョン '{1}') で再インストールされました。 - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - ツール '{0}' が安定した最新バージョン (バージョン '{1}') で再インストールされました。 + Tool '{0}' was reinstalled with the stable version (version '{1}'). + ツール '{0}' が安定した最新バージョン (バージョン '{1}') で再インストールされました。 diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf index f1defd809a8a..83a95ead3e8c 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - 도구 '{0}'이(가) 최신 시험판 버전(버전 '{1}')으로 다시 설치되었습니다. + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + 도구 '{0}'이(가) 최신 시험판 버전(버전 '{1}')으로 다시 설치되었습니다. - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - '{0}' 도구가 안정적인 최신 버전('{1}' 버전)으로 다시 설치되었습니다. + Tool '{0}' was reinstalled with the stable version (version '{1}'). + '{0}' 도구가 안정적인 최신 버전('{1}' 버전)으로 다시 설치되었습니다. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf index 21a57d09c0b2..60397d66f1f9 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - Narzędzie „{0}” zostało ponownie zainstalowane przy użyciu najnowszej stabilnej wersji (wersja „{1}”). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Narzędzie „{0}” zostało ponownie zainstalowane przy użyciu najnowszej stabilnej wersji (wersja „{1}”). - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - Narzędzie „{0}” zostało ponownie zainstalowane przy użyciu najnowszej stabilnej wersji (wersja „{1}”). + Tool '{0}' was reinstalled with the stable version (version '{1}'). + Narzędzie „{0}” zostało ponownie zainstalowane przy użyciu najnowszej stabilnej wersji (wersja „{1}”). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf index 6b69485a2294..c7aa8dbee058 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - A ferramenta '{0}' foi reinstalada com a versão de pré-lançamento mais recente (versão '{1}'). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + A ferramenta '{0}' foi reinstalada com a versão de pré-lançamento mais recente (versão '{1}'). - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - A ferramenta '{0}' foi reinstalada com a versão estável mais recente (versão '{1}'). + Tool '{0}' was reinstalled with the stable version (version '{1}'). + A ferramenta '{0}' foi reinstalada com a versão estável mais recente (versão '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf index 74a00df1d768..3268e26c1f4c 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - Инструмент "{0}" был переустановлен с последней предварительной версией (версией "{1}"). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Инструмент "{0}" был переустановлен с последней предварительной версией (версией "{1}"). - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - Инструмент "{0}" был переустановлен с последней стабильной версией (версией "{1}"). + Tool '{0}' was reinstalled with the stable version (version '{1}'). + Инструмент "{0}" был переустановлен с последней стабильной версией (версией "{1}"). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf index d81ada20c78c..d7099b0186b2 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - '{0}' aracı, en yeni ön sürüm (sürüm '{1}') ile yeniden yüklendi. + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + '{0}' aracı, en yeni ön sürüm (sürüm '{1}') ile yeniden yüklendi. - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - '{0}' aracı, en son kararlı sürüm (sürüm '{1}') ile yeniden yüklendi. + Tool '{0}' was reinstalled with the stable version (version '{1}'). + '{0}' aracı, en son kararlı sürüm (sürüm '{1}') ile yeniden yüklendi. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf index 06aa58b846fe..8474fa765996 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - 工具“{0}”已重新安装最新预发行版本(版本“{1}”)。 + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + 工具“{0}”已重新安装最新预发行版本(版本“{1}”)。 - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - 工具“{0}”已重新安装最新稳定版本(版本“{1}”)。 + Tool '{0}' was reinstalled with the stable version (version '{1}'). + 工具“{0}”已重新安装最新稳定版本(版本“{1}”)。 diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf index 3543343886be..b9a45289c722 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -53,13 +53,13 @@ - Tool '{0}' was reinstalled with the latest prerelease version (version '{1}'). - 已使用最新搶鮮版 ('{0}' 版) 來重新安裝工具 '{1}'。 + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + 已使用最新搶鮮版 ('{0}' 版) 來重新安裝工具 '{1}'。 - Tool '{0}' was reinstalled with the latest stable version (version '{1}'). - 已使用最新穩定版本 ('{1}' 版) 來重新安裝工具 '{0}'。 + Tool '{0}' was reinstalled with the stable version (version '{1}'). + 已使用最新穩定版本 ('{1}' 版) 來重新安裝工具 '{0}'。 From 48eb9e1ecb17cca1e59a8db7767ae34fd90b7998 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 13:45:56 +0000 Subject: [PATCH 390/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.50 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.49 -> To Version 6.9.0-preview.1.50 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cef1616c0215..5d6a16a4729f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index d37de67c2ce5..669dd4500a55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.49 - 6.9.0-preview.1.49 + 6.9.0-preview.1.50 + 6.9.0-preview.1.50 6.0.0-rc.278 - 6.9.0-preview.1.49 - 6.9.0-preview.1.49 - 6.9.0-preview.1.49 - 6.9.0-preview.1.49 - 6.9.0-preview.1.49 - 6.9.0-preview.1.49 - 6.9.0-preview.1.49 - 6.9.0-preview.1.49 - 6.9.0-preview.1.49 + 6.9.0-preview.1.50 + 6.9.0-preview.1.50 + 6.9.0-preview.1.50 + 6.9.0-preview.1.50 + 6.9.0-preview.1.50 + 6.9.0-preview.1.50 + 6.9.0-preview.1.50 + 6.9.0-preview.1.50 + 6.9.0-preview.1.50 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 6f278fbe7c771d8132d3f44694714f37e2556b75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 13:46:35 +0000 Subject: [PATCH 391/550] Update dependencies from https://github.com/dotnet/roslyn build 20231206.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23605.1 -> To Version 4.9.0-3.23606.8 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cef1616c0215..6e8250614a44 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 6e0810e5148df608d62d169b007f6cbbe376a81e + d0a733c809d479b4608af6fd64c97d4c3d12112b - + https://github.com/dotnet/roslyn - 6e0810e5148df608d62d169b007f6cbbe376a81e + d0a733c809d479b4608af6fd64c97d4c3d12112b - + https://github.com/dotnet/roslyn - 6e0810e5148df608d62d169b007f6cbbe376a81e + d0a733c809d479b4608af6fd64c97d4c3d12112b - + https://github.com/dotnet/roslyn - 6e0810e5148df608d62d169b007f6cbbe376a81e + d0a733c809d479b4608af6fd64c97d4c3d12112b - + https://github.com/dotnet/roslyn - 6e0810e5148df608d62d169b007f6cbbe376a81e + d0a733c809d479b4608af6fd64c97d4c3d12112b - + https://github.com/dotnet/roslyn - 6e0810e5148df608d62d169b007f6cbbe376a81e + d0a733c809d479b4608af6fd64c97d4c3d12112b - + https://github.com/dotnet/roslyn - 6e0810e5148df608d62d169b007f6cbbe376a81e + d0a733c809d479b4608af6fd64c97d4c3d12112b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d37de67c2ce5..e9013001a2b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23605.1 - 4.9.0-3.23605.1 - 4.9.0-3.23605.1 - 4.9.0-3.23605.1 - 4.9.0-3.23605.1 - 4.9.0-3.23605.1 - 4.9.0-3.23605.1 + 4.9.0-3.23606.8 + 4.9.0-3.23606.8 + 4.9.0-3.23606.8 + 4.9.0-3.23606.8 + 4.9.0-3.23606.8 + 4.9.0-3.23606.8 + 4.9.0-3.23606.8 $(MicrosoftNetCompilersToolsetPackageVersion) From 8689d6e45b11658246b3918107fde171895bbece Mon Sep 17 00:00:00 2001 From: Michal Pavlik Date: Thu, 7 Dec 2023 15:18:37 +0100 Subject: [PATCH 392/550] Fixed sdk container image creation when package is referenced --- .../build/Microsoft.NET.Build.Containers.targets | 16 +++++++++++++++- .../EndToEndTests.cs | 5 +++-- .../Targets/Microsoft.NET.Sdk.Publish.targets | 10 ---------- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets index f4506e7cc494..0b42c7eddc78 100644 --- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets +++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets @@ -184,10 +184,24 @@ _ContainerVerifySDKVersion; - ComputeContainerConfig + ComputeContainerConfig; + _CheckContainersPackage + + + Microsoft.NET.Build.Containers + + + + + + + true + + + diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 0339d2d3324a..8a7dbc271ed8 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -209,7 +209,7 @@ private string BuildLocalApp([CallerMemberName] string testName = "TestName", st return publishDirectory; } - [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/36160")] + [DockerAvailableFact] public async Task EndToEnd_MultiProjectSolution() { ILogger logger = _loggerFactory.CreateLogger(nameof(EndToEnd_MultiProjectSolution)); @@ -524,7 +524,8 @@ public void EndToEnd_NoAPI_Console() $"/p:ContainerRegistry={DockerRegistryManager.LocalRegistry}", $"/p:ContainerRepository={imageName}", $"/p:RuntimeFrameworkVersion=8.0.0-preview.3.23174.8", - $"/p:ContainerImageTag={imageTag}") + $"/p:ContainerImageTag={imageTag}", + "/bl:E:\\test.binlog") .WithEnvironmentVariable("NUGET_PACKAGES", privateNuGetAssets.FullName) .WithWorkingDirectory(newProjectDir.FullName) .Execute() diff --git a/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets b/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets index 31fa12dbe509..be1190acfbf4 100644 --- a/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets +++ b/src/WebSdk/Publish/Targets/Microsoft.NET.Sdk.Publish.targets @@ -170,16 +170,6 @@ Copyright (C) Microsoft Corporation. All rights reserved. Condition=" '$(DeployOnBuild)' == 'true' " > - - - Microsoft.NET.Build.Containers - - - - - - - $(_DotNetPublishComputeFiles); From 5abfce6cd93424cc7e76db55ab75f4561f757b42 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 10:26:20 +0000 Subject: [PATCH 393/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#37361) [release/8.0.2xx] Update dependencies from dotnet/razor - Coherency Updates: - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100: from 8.0.0 to 8.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Merge branch 'release/8.0.2xx' of https://github.com/dotnet/sdk into darc-release/8.0.2xx-58380e9a-e7ac-4e9b-84ad-97966cc44ec4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37a9cb1fab1f..1f148e7a6aef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 96a1ad3afcdfa47f0989dd0440c909ef2e5166e2 + 69d077c78502a18f3a7dd25ac2f7f171c542e524 - + https://github.com/dotnet/razor - 96a1ad3afcdfa47f0989dd0440c909ef2e5166e2 + 69d077c78502a18f3a7dd25ac2f7f171c542e524 - + https://github.com/dotnet/razor - 96a1ad3afcdfa47f0989dd0440c909ef2e5166e2 + 69d077c78502a18f3a7dd25ac2f7f171c542e524 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 558279266db4..0916ead91567 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23605.1 - 7.0.0-preview.23605.1 - 7.0.0-preview.23605.1 + 7.0.0-preview.23606.1 + 7.0.0-preview.23606.1 + 7.0.0-preview.23606.1 From 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Dec 2023 10:41:17 +0000 Subject: [PATCH 394/550] [release/8.0.2xx] Update dependencies from microsoft/vstest (#37360) [release/8.0.2xx] Update dependencies from microsoft/vstest - Coherency Updates: - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100: from 8.0.0 to 8.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Merge branch 'release/8.0.2xx' of https://github.com/dotnet/sdk into darc-release/8.0.2xx-35126a8d-8aa1-43e6-b838-a19328543f9f --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f148e7a6aef..fc122860016a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/microsoft/vstest - 3dec0798866b2d16b838d7a78421070b99574861 + 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 - + https://github.com/microsoft/vstest - 3dec0798866b2d16b838d7a78421070b99574861 + 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 - + https://github.com/microsoft/vstest - 3dec0798866b2d16b838d7a78421070b99574861 + 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0916ead91567..1605f92354d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23604-01 - 17.9.0-preview-23604-01 - 17.9.0-preview-23604-01 + 17.9.0-preview-23606-01 + 17.9.0-preview-23606-01 + 17.9.0-preview-23606-01 From 65196151a274540f2a7bd6400912c3ff1e2c66e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 13:49:36 +0000 Subject: [PATCH 395/550] Update dependencies from https://github.com/dotnet/fsharp build 20231207.6 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23606.1 -> To Version 8.0.200-beta.23607.6 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc122860016a..baa5b6c0a703 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 2f3d37672a69142a13a62856b09034a915bedc70 - + https://github.com/dotnet/fsharp - 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 + a57b5e75c970694cd6159f827ffbdd14f87db185 - + https://github.com/dotnet/fsharp - 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 + a57b5e75c970694cd6159f827ffbdd14f87db185 diff --git a/eng/Versions.props b/eng/Versions.props index 1605f92354d6..f346b0737aa7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,7 +134,7 @@ - 12.8.200-beta.23606.1 + 12.8.200-beta.23607.6 From a0960fb7ab3e16afe4999f4a8d8b6d79e50e2eba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 13:49:56 +0000 Subject: [PATCH 396/550] Update dependencies from https://github.com/dotnet/roslyn build 20231207.11 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23606.8 -> To Version 4.9.0-3.23607.11 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc122860016a..3fed64f5e361 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - d0a733c809d479b4608af6fd64c97d4c3d12112b + 3ed29fed2de537fb06dccd854b1c343b7d01b3de - + https://github.com/dotnet/roslyn - d0a733c809d479b4608af6fd64c97d4c3d12112b + 3ed29fed2de537fb06dccd854b1c343b7d01b3de - + https://github.com/dotnet/roslyn - d0a733c809d479b4608af6fd64c97d4c3d12112b + 3ed29fed2de537fb06dccd854b1c343b7d01b3de - + https://github.com/dotnet/roslyn - d0a733c809d479b4608af6fd64c97d4c3d12112b + 3ed29fed2de537fb06dccd854b1c343b7d01b3de - + https://github.com/dotnet/roslyn - d0a733c809d479b4608af6fd64c97d4c3d12112b + 3ed29fed2de537fb06dccd854b1c343b7d01b3de - + https://github.com/dotnet/roslyn - d0a733c809d479b4608af6fd64c97d4c3d12112b + 3ed29fed2de537fb06dccd854b1c343b7d01b3de - + https://github.com/dotnet/roslyn - d0a733c809d479b4608af6fd64c97d4c3d12112b + 3ed29fed2de537fb06dccd854b1c343b7d01b3de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1605f92354d6..bd0cc133c4e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23606.8 - 4.9.0-3.23606.8 - 4.9.0-3.23606.8 - 4.9.0-3.23606.8 - 4.9.0-3.23606.8 - 4.9.0-3.23606.8 - 4.9.0-3.23606.8 + 4.9.0-3.23607.11 + 4.9.0-3.23607.11 + 4.9.0-3.23607.11 + 4.9.0-3.23607.11 + 4.9.0-3.23607.11 + 4.9.0-3.23607.11 + 4.9.0-3.23607.11 $(MicrosoftNetCompilersToolsetPackageVersion) From 9213c851c9530e456839c6aed677c0bfc4cb5dec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 13:50:38 +0000 Subject: [PATCH 397/550] Update dependencies from https://github.com/dotnet/razor build 20231207.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23606.1 -> To Version 7.0.0-preview.23607.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc122860016a..28d89e9c2c33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 69d077c78502a18f3a7dd25ac2f7f171c542e524 + bb0358a2e95c7904222db8654f5ba067d28456ff - + https://github.com/dotnet/razor - 69d077c78502a18f3a7dd25ac2f7f171c542e524 + bb0358a2e95c7904222db8654f5ba067d28456ff - + https://github.com/dotnet/razor - 69d077c78502a18f3a7dd25ac2f7f171c542e524 + bb0358a2e95c7904222db8654f5ba067d28456ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1605f92354d6..75c1670c6644 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23606.1 - 7.0.0-preview.23606.1 - 7.0.0-preview.23606.1 + 7.0.0-preview.23607.3 + 7.0.0-preview.23607.3 + 7.0.0-preview.23607.3 From 6c6f56c51f9d712dd987f93dd84f56b742f19ae1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Dec 2023 13:31:38 +0000 Subject: [PATCH 398/550] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20231208.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23525.2 -> To Version 3.11.0-beta1.23608.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfd8d175ba95..df98afd3c01e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -311,17 +311,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - b4d9a1334d5189172977ba8fddd00bda70161e4a + 7e5f47318a24358e504e9588945a71acf49f5697 - + https://github.com/dotnet/roslyn-analyzers - b4d9a1334d5189172977ba8fddd00bda70161e4a + 7e5f47318a24358e504e9588945a71acf49f5697 - + https://github.com/dotnet/roslyn-analyzers - b4d9a1334d5189172977ba8fddd00bda70161e4a + 7e5f47318a24358e504e9588945a71acf49f5697 diff --git a/eng/Versions.props b/eng/Versions.props index 2752b4cac440..b349ce1074e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -99,8 +99,8 @@ - 8.0.0-preview.23525.2 - 3.11.0-beta1.23525.2 + 8.0.0-preview.23608.1 + 3.11.0-beta1.23608.1 From 6bedb32b541f76778d7e824f42b6cd19bc5e4aa1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Dec 2023 13:32:15 +0000 Subject: [PATCH 399/550] Update dependencies from https://github.com/dotnet/fsharp build 20231208.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23607.6 -> To Version 8.0.200-beta.23608.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfd8d175ba95..a603a6bed6da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 2f3d37672a69142a13a62856b09034a915bedc70 - + https://github.com/dotnet/fsharp - a57b5e75c970694cd6159f827ffbdd14f87db185 + e479cbe697a26f864e60ea49f02c278a8331f7bc - + https://github.com/dotnet/fsharp - a57b5e75c970694cd6159f827ffbdd14f87db185 + e479cbe697a26f864e60ea49f02c278a8331f7bc diff --git a/eng/Versions.props b/eng/Versions.props index 2752b4cac440..d3088a0d2c43 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,7 +134,7 @@ - 12.8.200-beta.23607.6 + 12.8.200-beta.23608.3 From bff9d5793e57740694bd201c84ed3c31d96fdd8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Dec 2023 13:32:34 +0000 Subject: [PATCH 400/550] Update dependencies from https://github.com/dotnet/roslyn build 20231208.9 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23607.11 -> To Version 4.9.0-3.23608.9 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfd8d175ba95..4561ad8f9c5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 3ed29fed2de537fb06dccd854b1c343b7d01b3de + 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f - + https://github.com/dotnet/roslyn - 3ed29fed2de537fb06dccd854b1c343b7d01b3de + 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f - + https://github.com/dotnet/roslyn - 3ed29fed2de537fb06dccd854b1c343b7d01b3de + 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f - + https://github.com/dotnet/roslyn - 3ed29fed2de537fb06dccd854b1c343b7d01b3de + 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f - + https://github.com/dotnet/roslyn - 3ed29fed2de537fb06dccd854b1c343b7d01b3de + 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f - + https://github.com/dotnet/roslyn - 3ed29fed2de537fb06dccd854b1c343b7d01b3de + 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f - + https://github.com/dotnet/roslyn - 3ed29fed2de537fb06dccd854b1c343b7d01b3de + 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2752b4cac440..e1617a45901e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23607.11 - 4.9.0-3.23607.11 - 4.9.0-3.23607.11 - 4.9.0-3.23607.11 - 4.9.0-3.23607.11 - 4.9.0-3.23607.11 - 4.9.0-3.23607.11 + 4.9.0-3.23608.9 + 4.9.0-3.23608.9 + 4.9.0-3.23608.9 + 4.9.0-3.23608.9 + 4.9.0-3.23608.9 + 4.9.0-3.23608.9 + 4.9.0-3.23608.9 $(MicrosoftNetCompilersToolsetPackageVersion) From fbd946141934eb8966082bdee44b22c279dc1f9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Dec 2023 13:32:54 +0000 Subject: [PATCH 401/550] Update dependencies from https://github.com/dotnet/razor build 20231208.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23607.3 -> To Version 7.0.0-preview.23608.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfd8d175ba95..01ef88b87b2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - bb0358a2e95c7904222db8654f5ba067d28456ff + 1c7ba81e3e9dbfc4de611fa1543b4246093283f8 - + https://github.com/dotnet/razor - bb0358a2e95c7904222db8654f5ba067d28456ff + 1c7ba81e3e9dbfc4de611fa1543b4246093283f8 - + https://github.com/dotnet/razor - bb0358a2e95c7904222db8654f5ba067d28456ff + 1c7ba81e3e9dbfc4de611fa1543b4246093283f8 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2752b4cac440..239dbc7a76e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23607.3 - 7.0.0-preview.23607.3 - 7.0.0-preview.23607.3 + 7.0.0-preview.23608.6 + 7.0.0-preview.23608.6 + 7.0.0-preview.23608.6 From e8cc6b91d5860743048eeb4fab6b78c394dc4a33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Dec 2023 13:28:16 +0000 Subject: [PATCH 402/550] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20231208.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.23525.2 -> To Version 3.11.0-beta1.23608.1 From 66929bbcb6d16c55bb529bf88f95cbcb04418be9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Dec 2023 13:28:58 +0000 Subject: [PATCH 403/550] Update dependencies from https://github.com/dotnet/fsharp build 20231208.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23607.6 -> To Version 8.0.200-beta.23608.3 From 2bbe6b58721b65c6b0fc70853f2f28e20ee1f637 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Dec 2023 13:29:22 +0000 Subject: [PATCH 404/550] Update dependencies from https://github.com/dotnet/roslyn build 20231208.9 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23607.11 -> To Version 4.9.0-3.23608.9 From 8d40444a975b27569ff8df2844e3f533a72530e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Dec 2023 13:29:46 +0000 Subject: [PATCH 405/550] Update dependencies from https://github.com/dotnet/razor build 20231208.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23607.3 -> To Version 7.0.0-preview.23608.6 From dd2727df9ddda7773fb22e85ab3a50b81518c345 Mon Sep 17 00:00:00 2001 From: Michal Pavlik Date: Mon, 11 Dec 2023 11:26:40 +0100 Subject: [PATCH 406/550] Fixed failing test --- .../EndToEndTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 8a7dbc271ed8..9724f94d92cd 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -235,7 +235,7 @@ public async Task EndToEnd_MultiProjectSolution() .Execute() .Should().Pass(); - new DotnetCommand(_testOutput, "sln", "add", "ConsoleApp\\ConsoleApp.csproj") + new DotnetCommand(_testOutput, "sln", "add", Path.Combine("ConsoleApp", "ConsoleApp.csproj")) .WithWorkingDirectory(newSolutionDir.FullName) .Execute() .Should().Pass(); @@ -246,7 +246,7 @@ public async Task EndToEnd_MultiProjectSolution() .Execute() .Should().Pass(); - new DotnetCommand(_testOutput, "sln", "add", "WebApp\\WebApp.csproj") + new DotnetCommand(_testOutput, "sln", "add", Path.Combine("WebApp", "WebApp.csproj")) .WithWorkingDirectory(newSolutionDir.FullName) .Execute() .Should().Pass(); From 4c427283e00acb776b20fe0d8f5a8bbce6dc0a3f Mon Sep 17 00:00:00 2001 From: Damon Tivel Date: Mon, 11 Dec 2023 07:06:04 -0800 Subject: [PATCH 407/550] [release/8.0.2xx] Trusted roots: 2023-11 CTL (#37403) --- .../redist/trustedroots/codesignctl.pem | 49 ++++++++ .../redist/trustedroots/timestampctl.pem | 116 ++++++++++++++++++ 2 files changed, 165 insertions(+) diff --git a/src/Layout/redist/trustedroots/codesignctl.pem b/src/Layout/redist/trustedroots/codesignctl.pem index d6635511755a..11978a9a649f 100644 --- a/src/Layout/redist/trustedroots/codesignctl.pem +++ b/src/Layout/redist/trustedroots/codesignctl.pem @@ -8571,3 +8571,52 @@ ADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/6 vmjkI6TZraE3 -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFmzCCA4OgAwIBAgIQEJfEnIwlQyi7pui5m6tPoTANBgkqhkiG9w0BAQsFADBX +MQswCQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMS4wLAYDVQQD +DCVTU0wuY29tIENvZGUgU2lnbmluZyBSU0EgUm9vdCBDQSAyMDIyMB4XDTIyMDgy +NTE2MzIwOFoXDTQ2MDgxOTE2MzIwN1owVzELMAkGA1UEBhMCVVMxGDAWBgNVBAoM +D1NTTCBDb3Jwb3JhdGlvbjEuMCwGA1UEAwwlU1NMLmNvbSBDb2RlIFNpZ25pbmcg +UlNBIFJvb3QgQ0EgMjAyMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB +AIx1IMiM3E6RUQa1W+9Fu9n+YOtKk4fs/5ePYJOecWFA6u9Ly5JY2GsW3N4tiPLz +0wSWwCVnIeUd259SgfYAK2aQ8aweqE9hJN12LwPHNcg2rIFTYCLAUZKZ7+gmLplU +zQmPX1w88KvnO7OnqwbGMZe+TO30BoExgktQELWgEXncWMvA5R6zwW9IXK2XCrMe +rC5X2L2+OFBE4zP918G1v6JO+3i0OziYKOlWLVSAi2t+HeOVhqeeF1RGW17/n+Zr +NYpRpaZ7XAoiDcLXgy/aPD3yih79Hj6h2BxPbghSbk+sH8n+n5lNu1JUsZKDW0AT +7xS1M5E8gqSr9apIaum4+4BABvzlHn4/vAqrJuLFqwcE1014tevaa1NbU4qm8tde +USJNH8yqi7rADoLZFLrZ8i33JbjLqUPSTEQeFnXMteRwHymBVTSyPv7/0XgaQJIn +KmgltdKe77z4FEtvUiMWaxCJ1N+63MwYWXGp5svYkHG9IPSkaiZJlZ1GGEUWiR8V +XahDsGCXntc22jqyb0tyTpl21zA396adu9tdpu58GOxC+RXoDrjbbEJrEF1EDNbU +zoKM7yswi3HhCPJBkWPj/uDAqKWNmQBBYs5CRqGdyuWanFHbYHpEVQ4qKnCkmf8q +fmC0HZZXujv827/GMYCqOgAZL4gfSaTrd0D3TIPugpEvAgMBAAGjYzBhMA8GA1Ud +EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUx/bIC2LtFAyjF7aquR7R4INWoV0wHQYD +VR0OBBYEFMf2yAti7RQMoxe2qrke0eCDVqFdMA4GA1UdDwEB/wQEAwIBhjANBgkq +hkiG9w0BAQsFAAOCAgEAYlDeMj/rNjV4jYl3SA8Po10HqLr2Uj82Us61wHlM610r ++BKsQ9vne4wpKp9rOtN89RV3lzv9If3zyFzJPgWUr3ur6I3irw3AoBvfrwu6qrRF +VYHIYZlhuLCa6FnMCRPZp1YHhu7toOyNAWWamcwjosCRHV0G3Q2n+jzExFkixps6 +wB1pPSy2sR6Kvj2CD2sxcmBXkAtUit5VCh51SQBstkoz70bY1svE8XxsCZbpqeEY +/a//tM9nb38HpUiNBRCWOZB5Wpa34+Y3ODKxxjEBJHQCxMsLz7p2vlyKIMPpdGfr +bRKcOT3gitUrSyTjeYxInJGr14IhOL/Es8EH7pA9rfqivilbUjGqbLMcdfPmoNiM +A5aIuvjKUTNhCx3Va5wTGS4Wz88Nh0uXxAfZC6uYkeq6B4OYkkAKIM24a5r3gP47 +yeL5Q8go502XF8B38zDqJoQb1VO8MIVfae48tAnosZukOIK668BqjG0rKDB45DKr +txvhUiQAkedLGtuhiAxu6l0cR5mNcU293t5AmQSzQOHDi6rEkhiXe/zMg4A82iny +f87EaQCbYX1tltYVgoz1gyoc91N2ciXwKYDEMmRTD09U9FcN1gvc/nKItF9L2R4/ +A4YvORA2pzHFJgeVi0hx8assBurSHE6VjecX6q2xRkXTNv3LxGFvCSJEMiena2g= +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIICSzCCAdKgAwIBAgIQbo7kWxBMyQx+tNiIj+XsZDAKBggqhkjOPQQDAzBXMQsw +CQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMS4wLAYDVQQDDCVT +U0wuY29tIENvZGUgU2lnbmluZyBFQ0MgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2 +MzEzNVoXDTQ2MDgxOTE2MzEzNFowVzELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NT +TCBDb3Jwb3JhdGlvbjEuMCwGA1UEAwwlU1NMLmNvbSBDb2RlIFNpZ25pbmcgRUND +IFJvb3QgQ0EgMjAyMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABHbIrNTWlZJ8FzLl +y2tB+Sm7seuidrU22GxLjeU+SlcmJsefO19GZidRwCxjHHTdrDnTbz0OlL6+KzCS +zqJCVg1Q1KQscfQnYduggT/VTVYWtcwcN8szNBFoxzx7DemUzaNjMGEwDwYDVR0T +AQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRYXhbDLbPm6qNJs6W+1t6ueZVrjTAdBgNV +HQ4EFgQUWF4Wwy2z5uqjSbOlvtbernmVa40wDgYDVR0PAQH/BAQDAgGGMAoGCCqG +SM49BAMDA2cAMGQCMFOMczFOgFy3njsPCFgTvtlA9vG/ffeZoOvMgAANqnA27TYj +e0G4FBVWdtOW4xWFZAIwJOT2+L0Tbjq3P9y/zXjfJoBXEq9oZ0//8iuxoqGZtMOT +G456y3y/FI7r6rj+4QNf +-----END CERTIFICATE----- + diff --git a/src/Layout/redist/trustedroots/timestampctl.pem b/src/Layout/redist/trustedroots/timestampctl.pem index e97ea2f009c5..592079fa33ae 100644 --- a/src/Layout/redist/trustedroots/timestampctl.pem +++ b/src/Layout/redist/trustedroots/timestampctl.pem @@ -9141,3 +9141,119 @@ G4fSJZP29CmjjLEg1BHz4PzxZ7F++iAbKdOwSalNVNmqduMnYFkKE1M3LjVxiJ5R wyY+yw0SA2BnkQyMAdxv+8ALpRv5xI+OAegoZPS/BHLZ3NH0iv/K -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFlTCCA32gAwIBAgIQQAE0jMIAAAAAAAAAAZdY9DANBgkqhkiG9w0BAQwFADBU +MQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290 +IENBMR8wHQYDVQQDExZUV0NBIEdsb2JhbCBSb290IENBIEcyMB4XDTIyMTEyMjA2 +NDIyMVoXDTQ3MTEyMjE1NTk1OVowVDELMAkGA1UEBhMCVFcxEjAQBgNVBAoTCVRB +SVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEfMB0GA1UEAxMWVFdDQSBHbG9iYWwg +Um9vdCBDQSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKoO1SCS +Aa2C+QwIkTRrihbQRhb/A7jYjeqTNPv/K739bqrcm/KGgVX1iRzEjXVqWHiREx4C +E3A9774K5wCPuDHldMUwvv991pnlwkKjzyHWswh/kdVh5qKVEA3vXpcLSTjVIrDX +i1lvnzWbf9KRzHp/u6Cf3lUz9kuNCup9CcB53L1E4v4c52QhKM8ESuK0v4Z5KrsO +k8mPXqwwOVKQB7nqnCZCFMRnRv7RGmihPlAZoyYKJymQwva063OaeB7hmPRlDDUh +BvgL3mLlTcGzXdm5+mGXKuPqx0RVJJL+Eqc/xHfgLQKBB9X7feYQnjq0qO/s+1Dq +Nc/MfrtCuURsUum/KnIfP96bcOncWsU7u7/wWYWvL8GwFHkFrHWfJfURJwZgIcdt +Zb6oiZzlrEbf+F1EA41gvfexDcwv70FUL+5rlblOfDTfO/l3nX3NBz0cBjMSgOxy +nPItgtrVO8TH+QTDZAJ89TVgp7RGKS4b76VYgC56iVE4Njz9oXe4gDDQit6NpzQm +7CO7GFUYNkXu7QEGqk2/ZAzKmJcaMQJm+HhoW4jfCajnm/o0bXAcIa0Ii/Khtqx2 +ar/xgCUAvjweTa65PLaVY71rfkcSkFVFEY3sFx/BvieBk1djaQAmd4vDWeV70Q1E +8qjw94WaBffCLnCak4XYlZAxkFSm7AufN0UPAgMBAAGjYzBhMA4GA1UdDwEB/wQE +AwIBBjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFJKM1DbRW0dTxHENhN1k +KvU2ZEDnMB0GA1UdDgQWBBSSjNQ20VtHU8RxDYTdZCr1NmRA5zANBgkqhkiG9w0B +AQwFAAOCAgEAJfxL2pC02nXnQTqB0ab+oGrzGHFiaiQIi6l6TclVzs8QKC4EGZYF +z10CICo7s1U/Ac1CzbJ37f9183x325alz4xnBvSkm3L2IUkJmKMyXndaYwnvYkOX +Aji16jwYUGj8WVvZedTx5FZIE1bY03ELXniUOBFF+gUX9Q51HmJSYUa6LhmthrSI +D7FQ5kAANBqVnZPgUfnUVUbplTwlhi6X1wExGETsHGDpfWmvMviXQCUkto0aVTzF +t/e8BlI7cTBwPnEXfvFmBF5dvIoxQ6aSHXtU0qU2i2+N1l7a1MMuHd85VWCCMJ4n +/46A3WNMplU12NAzqYBtPl6dzKhngGb6mVcMUsoZdbA4NVUqgcWMHlbXX5DyINja +4GZx6bJ4q2e5JG5rNnL8b439f3I5KGdSkQUfV2XSo6cNYfqh59U1RpXJBof2MOwy +UamsVsAhTqMUdAU6vOO/bT1OP16lpG0pv4RRdVOOhhr1UXAqDRxOQOH9o+OlK2eQ +ksdsroW/OpsXFcqcKpPUTTkNvCAIo42IbAkNjK5EIU3JcezYJtcXni0RGDyjIn24 +J1S/aMg7QsyPXk7n3MLF+mpED41WiHrfiYRsoLM+PfFlAAmI6irrQM6zXawyF67B +m+nQwfVJlN2nznxaB+uuIJwXMJJpk3Lzmltxm/5q33owaY6zLtsPLN0= +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIFmzCCA4OgAwIBAgIQEJfEnIwlQyi7pui5m6tPoTANBgkqhkiG9w0BAQsFADBX +MQswCQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMS4wLAYDVQQD +DCVTU0wuY29tIENvZGUgU2lnbmluZyBSU0EgUm9vdCBDQSAyMDIyMB4XDTIyMDgy +NTE2MzIwOFoXDTQ2MDgxOTE2MzIwN1owVzELMAkGA1UEBhMCVVMxGDAWBgNVBAoM +D1NTTCBDb3Jwb3JhdGlvbjEuMCwGA1UEAwwlU1NMLmNvbSBDb2RlIFNpZ25pbmcg +UlNBIFJvb3QgQ0EgMjAyMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB +AIx1IMiM3E6RUQa1W+9Fu9n+YOtKk4fs/5ePYJOecWFA6u9Ly5JY2GsW3N4tiPLz +0wSWwCVnIeUd259SgfYAK2aQ8aweqE9hJN12LwPHNcg2rIFTYCLAUZKZ7+gmLplU +zQmPX1w88KvnO7OnqwbGMZe+TO30BoExgktQELWgEXncWMvA5R6zwW9IXK2XCrMe +rC5X2L2+OFBE4zP918G1v6JO+3i0OziYKOlWLVSAi2t+HeOVhqeeF1RGW17/n+Zr +NYpRpaZ7XAoiDcLXgy/aPD3yih79Hj6h2BxPbghSbk+sH8n+n5lNu1JUsZKDW0AT +7xS1M5E8gqSr9apIaum4+4BABvzlHn4/vAqrJuLFqwcE1014tevaa1NbU4qm8tde +USJNH8yqi7rADoLZFLrZ8i33JbjLqUPSTEQeFnXMteRwHymBVTSyPv7/0XgaQJIn +KmgltdKe77z4FEtvUiMWaxCJ1N+63MwYWXGp5svYkHG9IPSkaiZJlZ1GGEUWiR8V +XahDsGCXntc22jqyb0tyTpl21zA396adu9tdpu58GOxC+RXoDrjbbEJrEF1EDNbU +zoKM7yswi3HhCPJBkWPj/uDAqKWNmQBBYs5CRqGdyuWanFHbYHpEVQ4qKnCkmf8q +fmC0HZZXujv827/GMYCqOgAZL4gfSaTrd0D3TIPugpEvAgMBAAGjYzBhMA8GA1Ud +EwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUx/bIC2LtFAyjF7aquR7R4INWoV0wHQYD +VR0OBBYEFMf2yAti7RQMoxe2qrke0eCDVqFdMA4GA1UdDwEB/wQEAwIBhjANBgkq +hkiG9w0BAQsFAAOCAgEAYlDeMj/rNjV4jYl3SA8Po10HqLr2Uj82Us61wHlM610r ++BKsQ9vne4wpKp9rOtN89RV3lzv9If3zyFzJPgWUr3ur6I3irw3AoBvfrwu6qrRF +VYHIYZlhuLCa6FnMCRPZp1YHhu7toOyNAWWamcwjosCRHV0G3Q2n+jzExFkixps6 +wB1pPSy2sR6Kvj2CD2sxcmBXkAtUit5VCh51SQBstkoz70bY1svE8XxsCZbpqeEY +/a//tM9nb38HpUiNBRCWOZB5Wpa34+Y3ODKxxjEBJHQCxMsLz7p2vlyKIMPpdGfr +bRKcOT3gitUrSyTjeYxInJGr14IhOL/Es8EH7pA9rfqivilbUjGqbLMcdfPmoNiM +A5aIuvjKUTNhCx3Va5wTGS4Wz88Nh0uXxAfZC6uYkeq6B4OYkkAKIM24a5r3gP47 +yeL5Q8go502XF8B38zDqJoQb1VO8MIVfae48tAnosZukOIK668BqjG0rKDB45DKr +txvhUiQAkedLGtuhiAxu6l0cR5mNcU293t5AmQSzQOHDi6rEkhiXe/zMg4A82iny +f87EaQCbYX1tltYVgoz1gyoc91N2ciXwKYDEMmRTD09U9FcN1gvc/nKItF9L2R4/ +A4YvORA2pzHFJgeVi0hx8assBurSHE6VjecX6q2xRkXTNv3LxGFvCSJEMiena2g= +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIICSzCCAdKgAwIBAgIQbo7kWxBMyQx+tNiIj+XsZDAKBggqhkjOPQQDAzBXMQsw +CQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMS4wLAYDVQQDDCVT +U0wuY29tIENvZGUgU2lnbmluZyBFQ0MgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2 +MzEzNVoXDTQ2MDgxOTE2MzEzNFowVzELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NT +TCBDb3Jwb3JhdGlvbjEuMCwGA1UEAwwlU1NMLmNvbSBDb2RlIFNpZ25pbmcgRUND +IFJvb3QgQ0EgMjAyMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABHbIrNTWlZJ8FzLl +y2tB+Sm7seuidrU22GxLjeU+SlcmJsefO19GZidRwCxjHHTdrDnTbz0OlL6+KzCS +zqJCVg1Q1KQscfQnYduggT/VTVYWtcwcN8szNBFoxzx7DemUzaNjMGEwDwYDVR0T +AQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRYXhbDLbPm6qNJs6W+1t6ueZVrjTAdBgNV +HQ4EFgQUWF4Wwy2z5uqjSbOlvtbernmVa40wDgYDVR0PAQH/BAQDAgGGMAoGCCqG +SM49BAMDA2cAMGQCMFOMczFOgFy3njsPCFgTvtlA9vG/ffeZoOvMgAANqnA27TYj +e0G4FBVWdtOW4xWFZAIwJOT2+L0Tbjq3P9y/zXjfJoBXEq9oZ0//8iuxoqGZtMOT +G456y3y/FI7r6rj+4QNf +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIFpjCCA46gAwIBAgIUbHPJNrGF5QuATVvOwp+D0hpRwaMwDQYJKoZIhvcNAQEN +BQAwazELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xRDBCBgNV +BAMTO0VudHJ1c3QgRGlnaXRhbCBTaWduaW5nIFJvb3QgQ2VydGlmaWNhdGlvbiBB +dXRob3JpdHkgLSBEU1IxMB4XDTIxMTExMjE4Mjg0N1oXDTQwMTIzMDE4Mjg0N1ow +azELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xRDBCBgNVBAMT +O0VudHJ1c3QgRGlnaXRhbCBTaWduaW5nIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRo +b3JpdHkgLSBEU1IxMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAqS2C +6cK4I00zul2xjk6mWjsefTLMd9VRNwOxHEqwrNe39xjzzum6Fi64AUqED5EsHVzt +KqeoDlWjwzyjIvTxgIaCLBsDDKFdkXIg9buMl3ENopcTgz5Sbta4/0GxSCzgeb9L +fMLsDMdbOEZYwP6wcmJCSmWLJ/lEbO0HZVFktUoEilsUxHq9ErSUjFEAg9C0Phh7 +ihJ1YM3XyM0Cr3XT3CtNx2PAy6Ticoxp2S2JA9botrxQ+ebLVnNjz/yTwYGG6Tqv ++QdNRoLmVwPye8X8NNGc5j13PeNeWwXXxZIWIX9mnMyugAcyonNX5MQ+hsp/72UH +rbbQbtEzaZI0SBHx5Ee3o65S2QymhHuIWBWKQRaDbu/nhdqRtzLyaybx1enpkl1w +i4hqz7v1xEcpMu3FS1AlfoexFRSh0NoWGlj10EIkDO8IdDpTH5PghV6qYeVeg7i+ +2Zrb1vcMHQ5JRWbT6WDAEb1KMN0vuaZdWOkvP7EsRJlKxPtktOq3NcNwvmkhd3Bw +8IC0HbX8eT5v8mHlDHGlpvbSQH82j8EUW7ZD8aMvcB1X+ReNv6bTRloBF54kPxjS +XcV9ruHPQ/oRWPaKXYUXrciJy/uE7naIAHHqxUrqdy38g6NSiQL4S+qUE4eOfU+U +Kojit2ezLVkfifk5px4roxgQ7ha03SMC5sftT0cCAwEAAaNCMEAwHQYDVR0OBBYE +FKZlQYHyW4cFat39ilROj5h73CO4MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/ +BAQDAgGGMA0GCSqGSIb3DQEBDQUAA4ICAQCi6KUmCrRRytbVPFjX33uEW1Ny8j5R +xqpvLZ2H1/j9sAhmYdRYNSzJsedQCcFWoqFHBS7Oba+mk7vZPuZToldy27TqT/u2 +x81nvzjcjGijtWkidwwnCqLyj3EeieMJnOjceMoZ/7NSg9GM5Hz49C511DBXKY1O +gl+x4RgHMnM39GbAngPPlFDiM76sOP2NxEIlSja/judxsWm2Eh/tOHBnVJu+g6kw +Md7Oum1nG5RkUaHcUbUnJ5mlFsTUHAC0c85ky8CwX8uLoZ9Zk39ZLJYMpMtIhi5P +qCEaJkvxmDD9EXLlohH58EfV8s98aAQy3GOtkugHapntfbMHjSmPNPUDZo+RYq2s +OudOMnsm5FTkW83BDIgPeoLnxBZZHOVy4Yh6gdhpey0cuU5xD++mToxOKAv16LVT +WQv0Oifp/L+p7dbvsmndApaLGW4MnHSnn+9YIJav8WOo/zvKah0U4//xdaHWPQp8 +6Fv4hSWv67uF22v0leAA6fyhN86br750PIv7UR2kBZOfCnF8Fli7fAIzBOK20QTK +sEn9loiN7TPb5cHvtvLTRX9Dvr82zadlqpFiHzd/7Uvv7nMXbi8LgNW1asp98aib +0wGLtsZCwk7heIOOyen6mlJ9TQJsQZsN6QC9SFMjQ4DRRwSQ6ZxkSl1EwOIeFYBf +oTM3VxKKcl+Yqg== +-----END CERTIFICATE----- + From c23bbb7e0df3fc01f2ebb50e1a30117eb4b87f6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 22:33:17 +0000 Subject: [PATCH 408/550] [release/8.0.2xx] Update dependencies from microsoft/vstest (#37427) [release/8.0.2xx] Update dependencies from microsoft/vstest --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index beba7be1fb84..7e6f851c1a31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/microsoft/vstest - 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 + 50c0f7889fdd8d13381d325bdbb6d253e33da1ff - + https://github.com/microsoft/vstest - 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 + 50c0f7889fdd8d13381d325bdbb6d253e33da1ff - + https://github.com/microsoft/vstest - 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 + 50c0f7889fdd8d13381d325bdbb6d253e33da1ff https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 42f0de0666a8..2440dac3f4fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23606-01 - 17.9.0-preview-23606-01 - 17.9.0-preview-23606-01 + 17.9.0-preview-23610-02 + 17.9.0-preview-23610-02 + 17.9.0-preview-23610-02 From faccf2d37200f70301abc0ee304c8ae103c7d74f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 13:53:31 +0000 Subject: [PATCH 409/550] Update dependencies from https://github.com/dotnet/fsharp build 20231211.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23608.3 -> To Version 8.0.200-beta.23611.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e6f851c1a31..81e529c8f82b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild 2f3d37672a69142a13a62856b09034a915bedc70 - + https://github.com/dotnet/fsharp - e479cbe697a26f864e60ea49f02c278a8331f7bc + bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/dotnet/fsharp - e479cbe697a26f864e60ea49f02c278a8331f7bc + bb832169d6b799a62962452212010e66c3fecacf diff --git a/eng/Versions.props b/eng/Versions.props index 2440dac3f4fa..e26f14d25183 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,7 +134,7 @@ - 12.8.200-beta.23608.3 + 12.8.200-beta.23611.3 From 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:16:14 +0000 Subject: [PATCH 410/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#37457) [release/8.0.2xx] Update dependencies from dotnet/roslyn --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81e529c8f82b..52b131bf88a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d - + https://github.com/dotnet/roslyn - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d - + https://github.com/dotnet/roslyn - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d - + https://github.com/dotnet/roslyn - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d - + https://github.com/dotnet/roslyn - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d - + https://github.com/dotnet/roslyn - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d - + https://github.com/dotnet/roslyn - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e26f14d25183..710e2eafc64e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23608.9 - 4.9.0-3.23608.9 - 4.9.0-3.23608.9 - 4.9.0-3.23608.9 - 4.9.0-3.23608.9 - 4.9.0-3.23608.9 - 4.9.0-3.23608.9 + 4.9.0-3.23611.13 + 4.9.0-3.23611.13 + 4.9.0-3.23611.13 + 4.9.0-3.23611.13 + 4.9.0-3.23611.13 + 4.9.0-3.23611.13 + 4.9.0-3.23611.13 $(MicrosoftNetCompilersToolsetPackageVersion) From 8a4a88381a5cf417ba892fd3266648d0fd48b20a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:21:25 +0000 Subject: [PATCH 411/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#37458) [release/8.0.2xx] Update dependencies from dotnet/razor --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52b131bf88a9..65e224e38a42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 1c7ba81e3e9dbfc4de611fa1543b4246093283f8 + e754229eca1c8a15e043b04ece104d2760ecbcea - + https://github.com/dotnet/razor - 1c7ba81e3e9dbfc4de611fa1543b4246093283f8 + e754229eca1c8a15e043b04ece104d2760ecbcea - + https://github.com/dotnet/razor - 1c7ba81e3e9dbfc4de611fa1543b4246093283f8 + e754229eca1c8a15e043b04ece104d2760ecbcea https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 710e2eafc64e..fdab8ff4b566 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23608.6 - 7.0.0-preview.23608.6 - 7.0.0-preview.23608.6 + 7.0.0-preview.23611.2 + 7.0.0-preview.23611.2 + 7.0.0-preview.23611.2 From 6865971b8355b78c8a1d9a51a058456b4cb7de7e Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Tue, 12 Dec 2023 18:01:33 -0500 Subject: [PATCH 412/550] Add SkipGetTargetFrameworkProperties to redist.csproj One of the commits for [this PR](https://github.com/dotnet/installer/pull/17942) failed. On investigation, the dotnet-toolset-internal zip was missing a lot of Microsoft.NET.Build.Extensions files. Looking at the binlog for the dotnet/sdk build that produced this zip revealed that the `CopyAdditionalFilesToLayout` target from Microsoft.NET.Build.Extensions.Tasks.csproj ran after the `PublishMSBuildExtensions` target from redist.csproj. So the target which was laying out some of these files was running after the target that consumed them in another project. This appears to be because the `CopyAdditionalFilesToLayout` target only runs in the project's outer build. However, project references by default only build the inner build for the best matching target framework of the referenced project, so even though there was a project reference from redist.csproj to Microsoft.NET.Build.Extensions.Tasks.csproj, it wasn't ensuring the necessary target ordering. Adding `SkipGetTargetFrameworkProperties="true"` to the project reference should cause the outer build of the referenced project to run before the referencing project is built. --- src/Layout/redist/redist.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index 1ef39803b4a9..ec2c0605e067 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -59,8 +59,8 @@ - - + + From c725b9c4e2675a5a5b55ee0b90f6b16575425697 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 13:50:14 +0000 Subject: [PATCH 413/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.52 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.50 -> To Version 6.9.0-preview.1.52 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65e224e38a42..021ee6f8a756 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index fdab8ff4b566..030683a5b11b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.50 - 6.9.0-preview.1.50 + 6.9.0-preview.1.52 + 6.9.0-preview.1.52 6.0.0-rc.278 - 6.9.0-preview.1.50 - 6.9.0-preview.1.50 - 6.9.0-preview.1.50 - 6.9.0-preview.1.50 - 6.9.0-preview.1.50 - 6.9.0-preview.1.50 - 6.9.0-preview.1.50 - 6.9.0-preview.1.50 - 6.9.0-preview.1.50 + 6.9.0-preview.1.52 + 6.9.0-preview.1.52 + 6.9.0-preview.1.52 + 6.9.0-preview.1.52 + 6.9.0-preview.1.52 + 6.9.0-preview.1.52 + 6.9.0-preview.1.52 + 6.9.0-preview.1.52 + 6.9.0-preview.1.52 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 5a6fc4afe75e83b33168165c0ee7a4dacf5c6a75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 13:50:38 +0000 Subject: [PATCH 414/550] Update dependencies from https://github.com/dotnet/msbuild build 20231213.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23605-02 -> To Version 17.9.0-preview-23613-03 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65e224e38a42..082d6d0828ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - 2f3d37672a69142a13a62856b09034a915bedc70 + eea84ad7cf250b9dbf80f0981c594155d55de0b7 - + https://github.com/dotnet/msbuild - 2f3d37672a69142a13a62856b09034a915bedc70 + eea84ad7cf250b9dbf80f0981c594155d55de0b7 - + https://github.com/dotnet/msbuild - 2f3d37672a69142a13a62856b09034a915bedc70 + eea84ad7cf250b9dbf80f0981c594155d55de0b7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fdab8ff4b566..914c0c76b012 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23605-02 + 17.9.0-preview-23613-03 $(MicrosoftBuildPackageVersion) - 12.8.200-beta.23611.3 + 12.8.200-beta.23613.1 From ff9bdc13cfebff72d0d6e697e4cdfef506ae50eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 13:51:38 +0000 Subject: [PATCH 416/550] Update dependencies from https://github.com/dotnet/roslyn build 20231212.11 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23611.13 -> To Version 4.9.0-3.23612.11 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65e224e38a42..72b202013547 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index fdab8ff4b566..ad9fa8e40641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23611.13 - 4.9.0-3.23611.13 - 4.9.0-3.23611.13 - 4.9.0-3.23611.13 - 4.9.0-3.23611.13 - 4.9.0-3.23611.13 - 4.9.0-3.23611.13 + 4.9.0-3.23612.11 + 4.9.0-3.23612.11 + 4.9.0-3.23612.11 + 4.9.0-3.23612.11 + 4.9.0-3.23612.11 + 4.9.0-3.23612.11 + 4.9.0-3.23612.11 $(MicrosoftNetCompilersToolsetPackageVersion) From aa7d8f2d1ef9e68eac77ed6035203f91977fb467 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 13:51:57 +0000 Subject: [PATCH 417/550] Update dependencies from https://github.com/microsoft/vstest build 20231212.1 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23610-02 -> To Version 17.9.0-preview-23612-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65e224e38a42..ce8f1d40a425 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client a59e64507383b64bcfbe9bf63b34aca946ab0da9 - + https://github.com/microsoft/vstest - 50c0f7889fdd8d13381d325bdbb6d253e33da1ff + dc8fe3865011cef3a0891f5f55c1fc5c7f401066 - + https://github.com/microsoft/vstest - 50c0f7889fdd8d13381d325bdbb6d253e33da1ff + dc8fe3865011cef3a0891f5f55c1fc5c7f401066 - + https://github.com/microsoft/vstest - 50c0f7889fdd8d13381d325bdbb6d253e33da1ff + dc8fe3865011cef3a0891f5f55c1fc5c7f401066 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index fdab8ff4b566..32a3b99938eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23610-02 - 17.9.0-preview-23610-02 - 17.9.0-preview-23610-02 + 17.9.0-preview-23612-01 + 17.9.0-preview-23612-01 + 17.9.0-preview-23612-01 From 1f6f6f01560255f8f3a0d9ebc5e9ffd801c65397 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 13:52:17 +0000 Subject: [PATCH 418/550] Update dependencies from https://github.com/dotnet/razor build 20231212.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23611.2 -> To Version 7.0.0-preview.23612.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65e224e38a42..d9975457d79b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - e754229eca1c8a15e043b04ece104d2760ecbcea + 1b4fa3d2af3a46188ed2a3311b0c4dac4009ede5 - + https://github.com/dotnet/razor - e754229eca1c8a15e043b04ece104d2760ecbcea + 1b4fa3d2af3a46188ed2a3311b0c4dac4009ede5 - + https://github.com/dotnet/razor - e754229eca1c8a15e043b04ece104d2760ecbcea + 1b4fa3d2af3a46188ed2a3311b0c4dac4009ede5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index fdab8ff4b566..f659b18ebe8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23611.2 - 7.0.0-preview.23611.2 - 7.0.0-preview.23611.2 + 7.0.0-preview.23612.2 + 7.0.0-preview.23612.2 + 7.0.0-preview.23612.2 From e75caa0ef8555cf95fb1f1cb76efbe8d4783f71b Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Wed, 13 Dec 2023 13:42:37 -0500 Subject: [PATCH 419/550] Add comment for future reference --- src/Layout/redist/redist.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Layout/redist/redist.csproj b/src/Layout/redist/redist.csproj index ec2c0605e067..ebdfd9e7ef94 100644 --- a/src/Layout/redist/redist.csproj +++ b/src/Layout/redist/redist.csproj @@ -55,6 +55,10 @@ + From 469b306b7cedfcf1761ec2b64869ea382ce955d2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 13 Dec 2023 15:14:53 -0800 Subject: [PATCH 420/550] Change the logic for how we determine collisions in the SLN file. The item blocked by VS and msbuild is when one solution folder has two items parented by it that have the same name (whether they are projects or solution folders). Instead of trying to figure out the solution folder and matching it to existing ones, I moved to checking the exact parent at the time of adding it which should be more precise. --- .../App.sln | 82 +++++++++++++++++++ .../Base/Class1.cs | 8 ++ .../Base/Class2.cs | 8 ++ .../Base/Second/Class1.cs | 8 ++ .../Base/Second/Class2.cs | 8 ++ .../Base/Second/Class3.cs | 8 ++ .../Base/Second/Second.csproj | 7 ++ .../Base/Second/Test.csproj | 7 ++ .../Base/Second/TestCollision.csproj | 7 ++ .../Base/Second/Third/Class1.cs | 8 ++ .../Base/Second/Third/Class2.cs | 8 ++ .../Base/Second/Third/Second.csproj | 7 ++ .../Base/Second/Third/TestCollision.csproj | 7 ++ .../Base/Test.csproj | 7 ++ .../Base/TestCollision.csproj | 7 ++ src/Cli/dotnet/SlnFileExtensions.cs | 54 +++++++----- .../dotnet-sln.Tests/GivenDotnetSlnAdd.cs | 27 ++++++ 17 files changed, 248 insertions(+), 20 deletions(-) create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/App.sln create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Class1.cs create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Class2.cs create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class1.cs create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class2.cs create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class3.cs create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Second.csproj create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Test.csproj create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/TestCollision.csproj create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Class1.cs create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Class2.cs create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Second.csproj create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/TestCollision.csproj create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Test.csproj create mode 100644 src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/TestCollision.csproj diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/App.sln b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/App.sln new file mode 100644 index 000000000000..f2cd46c8e963 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/App.sln @@ -0,0 +1,82 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Base\Test.csproj", "{884E9311-BB85-494C-8588-1FAD4C93C0AC}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Base", "Base", "{C6C93973-1CD8-454F-AA3D-41E0052E8E26}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Base\Second\Test.csproj", "{B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestCollision", "Base\Second\Third\TestCollision.csproj", "{187AA828-6BDD-48AF-800E-26E65068CADC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Second", "Base\Second\Second.csproj", "{010A3387-74B8-467C-93B5-E07564F11C26}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Debug|x64.ActiveCfg = Debug|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Debug|x64.Build.0 = Debug|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Debug|x86.ActiveCfg = Debug|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Debug|x86.Build.0 = Debug|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Release|Any CPU.Build.0 = Release|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Release|x64.ActiveCfg = Release|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Release|x64.Build.0 = Release|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Release|x86.ActiveCfg = Release|Any CPU + {884E9311-BB85-494C-8588-1FAD4C93C0AC}.Release|x86.Build.0 = Release|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Debug|x64.ActiveCfg = Debug|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Debug|x64.Build.0 = Debug|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Debug|x86.ActiveCfg = Debug|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Debug|x86.Build.0 = Debug|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Release|Any CPU.Build.0 = Release|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Release|x64.ActiveCfg = Release|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Release|x64.Build.0 = Release|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Release|x86.ActiveCfg = Release|Any CPU + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1}.Release|x86.Build.0 = Release|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Debug|x64.ActiveCfg = Debug|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Debug|x64.Build.0 = Debug|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Debug|x86.ActiveCfg = Debug|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Debug|x86.Build.0 = Debug|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Release|Any CPU.Build.0 = Release|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Release|x64.ActiveCfg = Release|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Release|x64.Build.0 = Release|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Release|x86.ActiveCfg = Release|Any CPU + {187AA828-6BDD-48AF-800E-26E65068CADC}.Release|x86.Build.0 = Release|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Debug|Any CPU.Build.0 = Debug|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Debug|x64.ActiveCfg = Debug|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Debug|x64.Build.0 = Debug|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Debug|x86.ActiveCfg = Debug|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Debug|x86.Build.0 = Debug|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Release|Any CPU.ActiveCfg = Release|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Release|Any CPU.Build.0 = Release|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Release|x64.ActiveCfg = Release|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Release|x64.Build.0 = Release|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Release|x86.ActiveCfg = Release|Any CPU + {010A3387-74B8-467C-93B5-E07564F11C26}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {B7DAD6CF-BBE2-49FF-8FA0-84BA67263CB1} = {C6C93973-1CD8-454F-AA3D-41E0052E8E26} + {187AA828-6BDD-48AF-800E-26E65068CADC} = {C6C93973-1CD8-454F-AA3D-41E0052E8E26} + {010A3387-74B8-467C-93B5-E07564F11C26} = {C6C93973-1CD8-454F-AA3D-41E0052E8E26} + EndGlobalSection +EndGlobal diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Class1.cs b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Class1.cs new file mode 100644 index 000000000000..b056a1e2fbd5 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Class1.cs @@ -0,0 +1,8 @@ +using System; + +namespace Test +{ + public class Class1 + { + } +} diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Class2.cs b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Class2.cs new file mode 100644 index 000000000000..4952448135ce --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Class2.cs @@ -0,0 +1,8 @@ +using System; + +namespace TestCollision +{ + public class Class1 + { + } +} diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class1.cs b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class1.cs new file mode 100644 index 000000000000..b056a1e2fbd5 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class1.cs @@ -0,0 +1,8 @@ +using System; + +namespace Test +{ + public class Class1 + { + } +} diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class2.cs b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class2.cs new file mode 100644 index 000000000000..4952448135ce --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class2.cs @@ -0,0 +1,8 @@ +using System; + +namespace TestCollision +{ + public class Class1 + { + } +} diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class3.cs b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class3.cs new file mode 100644 index 000000000000..a39ee63c8095 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Class3.cs @@ -0,0 +1,8 @@ +using System; + +namespace Second +{ + public class Class1 + { + } +} diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Second.csproj b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Second.csproj new file mode 100644 index 000000000000..9f5c4f4abb61 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Second.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Test.csproj b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Test.csproj new file mode 100644 index 000000000000..9f5c4f4abb61 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Test.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/TestCollision.csproj b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/TestCollision.csproj new file mode 100644 index 000000000000..9f5c4f4abb61 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/TestCollision.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Class1.cs b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Class1.cs new file mode 100644 index 000000000000..04f9690c4db8 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Class1.cs @@ -0,0 +1,8 @@ +using System; + +namespace bar +{ + public class Class1 + { + } +} diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Class2.cs b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Class2.cs new file mode 100644 index 000000000000..a39ee63c8095 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Class2.cs @@ -0,0 +1,8 @@ +using System; + +namespace Second +{ + public class Class1 + { + } +} diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Second.csproj b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Second.csproj new file mode 100644 index 000000000000..9f5c4f4abb61 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/Second.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/TestCollision.csproj b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/TestCollision.csproj new file mode 100644 index 000000000000..9f5c4f4abb61 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Second/Third/TestCollision.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Test.csproj b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Test.csproj new file mode 100644 index 000000000000..9f5c4f4abb61 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/Test.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/TestCollision.csproj b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/TestCollision.csproj new file mode 100644 index 000000000000..9f5c4f4abb61 --- /dev/null +++ b/src/Assets/TestProjects/TestAppWithSlnAndCsprojInSubDirVSErrors/Base/TestCollision.csproj @@ -0,0 +1,7 @@ + + + + netstandard2.0 + + + diff --git a/src/Cli/dotnet/SlnFileExtensions.cs b/src/Cli/dotnet/SlnFileExtensions.cs index 985da6f73a95..555623dd302d 100644 --- a/src/Cli/dotnet/SlnFileExtensions.cs +++ b/src/Cli/dotnet/SlnFileExtensions.cs @@ -6,6 +6,7 @@ using Microsoft.Build.Execution; using Microsoft.DotNet.Cli.Sln.Internal; using Microsoft.DotNet.Cli.Utils; +using System.Collections.Generic; namespace Microsoft.DotNet.Tools.Common { @@ -115,7 +116,7 @@ private static void SetupSolutionFolders(SlnFile slnFile, IList solution && p.TypeGuid == ProjectTypeGuids.SolutionFolderGuid).FirstOrDefault(); if (duplicateProject != null) { - // Try making a new folder for the project to put it under so we can still add it despite there being one with the same name already in the parent folder + // Try making a new folder for the project to put it under so we can still add it despite there being one with the same name already in the parent folder slnFile.AddSolutionFolders(slnProject, new List() { Path.GetDirectoryName(relativeProjectPath) }); } } @@ -258,12 +259,6 @@ private static void AddSolutionFolders(this SlnFile slnFile, SlnProject slnProje return; } - string solutionFoldersWithDuplicateProjects = GetSolutionFolderWithDuplicateProject(slnFile, slnProject, solutionFolders, nestedProjectsSection); - if (!string.IsNullOrEmpty(solutionFoldersWithDuplicateProjects)) - { - throw new GracefulException(CommonLocalizableStrings.SolutionFolderAlreadyContainsProject, slnFile.FullPath, slnProject.Name, solutionFoldersWithDuplicateProjects); - } - string parentDirGuid = null; var solutionFolderHierarchy = string.Empty; foreach (var dir in solutionFolders) @@ -275,6 +270,12 @@ private static void AddSolutionFolders(this SlnFile slnFile, SlnProject slnProje } else { + + if(HasDuplicateNameForSameValueOfNestedProjects(nestedProjectsSection, dir, parentDirGuid, slnFile.Projects)) + { + throw new GracefulException(CommonLocalizableStrings.SolutionFolderAlreadyContainsProject, slnFile.FullPath, slnProject.Name, slnFile.Projects.FirstOrDefault(p => p.Id == parentDirGuid).Name); + } + var solutionFolder = new SlnProject { Id = Guid.NewGuid().ToString("B").ToUpper(), @@ -292,22 +293,29 @@ private static void AddSolutionFolders(this SlnFile slnFile, SlnProject slnProje parentDirGuid = solutionFolder.Id; } } - + if (HasDuplicateNameForSameValueOfNestedProjects(nestedProjectsSection, slnProject.Name, parentDirGuid, slnFile.Projects)) + { + throw new GracefulException(CommonLocalizableStrings.SolutionFolderAlreadyContainsProject, slnFile.FullPath, slnProject.Name, slnFile.Projects.FirstOrDefault(p => p.Id == parentDirGuid).Name); + } nestedProjectsSection.Properties[slnProject.Id] = parentDirGuid; } } - private static string GetSolutionFolderWithDuplicateProject(SlnFile slnFile, SlnProject slnProject, IList solutionFolders, SlnSection nestedProjectsSection) + private static bool HasDuplicateNameForSameValueOfNestedProjects(SlnSection nestedProjectsSection, string name, string value, IList projects) { - var duplicateProjects = slnFile.Projects.Where(p => string.Equals(p.Name, slnProject.Name, StringComparison.OrdinalIgnoreCase) - && p.TypeGuid != ProjectTypeGuids.SolutionFolderGuid).ToList(); - - var existingSolutionFoldersIds = slnFile.GetSolutionFoldersThatContainProjectsInItsHierarchy(nestedProjectsSection.Properties, duplicateProjects); - - var existingSolutionFolders = slnFile.Projects.Where(f => existingSolutionFoldersIds.Contains(f.Id) - && f.TypeGuid == ProjectTypeGuids.SolutionFolderGuid).Select(f => f.Name).ToList(); + foreach (var property in nestedProjectsSection.Properties) + { + if (property.Value == value) + { + var existingProject = projects.FirstOrDefault(p => p.Id == property.Key); - return existingSolutionFolders.Intersect(solutionFolders).FirstOrDefault(); + if (existingProject != null && existingProject.Name == name) + { + return true; + } + } + } + return false; } private static IDictionary GetSolutionFolderPaths( @@ -325,7 +333,7 @@ private static IDictionary GetSolutionFolderPaths( { id = nestedProjects[id]; var parentSlnProject = solutionFolderProjects.Where(p => p.Id == id).SingleOrDefault(); - if(parentSlnProject == null) // see: https://github.com/dotnet/sdk/pull/28811 + if (parentSlnProject == null) // see: https://github.com/dotnet/sdk/pull/28811 throw new GracefulException(CommonLocalizableStrings.CorruptSolutionProjectFolderStructure, slnFile.FullPath, id); path = Path.Combine(parentSlnProject.FilePath, path); } @@ -479,7 +487,8 @@ public static void RemoveEmptySolutionFolders(this SlnFile slnFile) private static HashSet GetSolutionFoldersThatContainProjectsInItsHierarchy( this SlnFile slnFile, SlnPropertySet nestedProjects, - IEnumerable projectsToSearchFor = null) + IEnumerable projectsToSearchFor = null, + bool stopAtOne = false) { var solutionFoldersInUse = new HashSet(); @@ -488,7 +497,8 @@ private static HashSet GetSolutionFoldersThatContainProjectsInItsHierarc { nonSolutionFolderProjects = slnFile.Projects.GetProjectsNotOfType( ProjectTypeGuids.SolutionFolderGuid); - } else + } + else { nonSolutionFolderProjects = projectsToSearchFor; } @@ -500,6 +510,10 @@ private static HashSet GetSolutionFoldersThatContainProjectsInItsHierarc { id = nestedProjects[id]; solutionFoldersInUse.Add(id); + if (stopAtOne) + { + break; + } } } diff --git a/src/Tests/dotnet-sln.Tests/GivenDotnetSlnAdd.cs b/src/Tests/dotnet-sln.Tests/GivenDotnetSlnAdd.cs index 8a6d6eaef133..dad56fe8e431 100644 --- a/src/Tests/dotnet-sln.Tests/GivenDotnetSlnAdd.cs +++ b/src/Tests/dotnet-sln.Tests/GivenDotnetSlnAdd.cs @@ -609,6 +609,33 @@ public void WhenNestedProjectIsAddedSolutionFoldersAreCreatedBuild(bool fooFirst } + [Fact] + public void WhenNestedDuplicateProjectIsAddedToASolutionFolder() + { + var projectDirectory = _testAssetsManager + .CopyTestAsset("TestAppWithSlnAndCsprojInSubDirVSErrors") + .WithSource() + .Path; + string projectToAdd; + CommandResult cmd; + + projectToAdd = Path.Combine("Base", "Second", "TestCollision.csproj"); + cmd = new DotnetCommand(Log) + .WithWorkingDirectory(projectDirectory) + .Execute($"sln", "App.sln", "add", projectToAdd); + cmd.Should().Fail() + .And.HaveStdErrContaining("TestCollision") + .And.HaveStdErrContaining("Base"); + + projectToAdd = Path.Combine("Base", "Second", "Third", "Second.csproj"); + cmd = new DotnetCommand(Log) + .WithWorkingDirectory(projectDirectory) + .Execute($"sln", "App.sln", "add", projectToAdd); + cmd.Should().Fail() + .And.HaveStdErrContaining("Second") + .And.HaveStdErrContaining("Base"); + } + [Theory] [InlineData("TestAppWithSlnAndCsprojFiles")] [InlineData("TestAppWithSlnAnd472CsprojFiles")] From 4db299f391267a902aab6527dcf6f642f513a745 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 13:58:28 +0000 Subject: [PATCH 421/550] Update dependencies from https://github.com/dotnet/roslyn build 20231213.8 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23612.11 -> To Version 4.9.0-3.23613.8 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31e76b8955dc..061cd27eae63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6dd42310c0fe..47c2158d37ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23612.11 - 4.9.0-3.23612.11 - 4.9.0-3.23612.11 - 4.9.0-3.23612.11 - 4.9.0-3.23612.11 - 4.9.0-3.23612.11 - 4.9.0-3.23612.11 + 4.9.0-3.23613.8 + 4.9.0-3.23613.8 + 4.9.0-3.23613.8 + 4.9.0-3.23613.8 + 4.9.0-3.23613.8 + 4.9.0-3.23613.8 + 4.9.0-3.23613.8 $(MicrosoftNetCompilersToolsetPackageVersion) From 35f77362d0100515bb1df3dc831df962a664d918 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:21:49 +0000 Subject: [PATCH 422/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#37511) [release/8.0.2xx] Update dependencies from dotnet/razor --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31e76b8955dc..f3015aa0f5f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 1b4fa3d2af3a46188ed2a3311b0c4dac4009ede5 + e425b46683a42003de979bed6c6cd14a47787824 - + https://github.com/dotnet/razor - 1b4fa3d2af3a46188ed2a3311b0c4dac4009ede5 + e425b46683a42003de979bed6c6cd14a47787824 - + https://github.com/dotnet/razor - 1b4fa3d2af3a46188ed2a3311b0c4dac4009ede5 + e425b46683a42003de979bed6c6cd14a47787824 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6dd42310c0fe..0d9f58e4d469 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23612.2 - 7.0.0-preview.23612.2 - 7.0.0-preview.23612.2 + 7.0.0-preview.23613.3 + 7.0.0-preview.23613.3 + 7.0.0-preview.23613.3 From 7769ec0496ebddaca26b63767732fba85b214bce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:25:08 +0000 Subject: [PATCH 423/550] [release/8.0.2xx] Update dependencies from nuget/nuget.client (#37507) [release/8.0.2xx] Update dependencies from nuget/nuget.client --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3015aa0f5f2..8d5675046e08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 0d9f58e4d469..47620de61d39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.52 - 6.9.0-preview.1.52 + 6.9.0-preview.1.54 + 6.9.0-preview.1.54 6.0.0-rc.278 - 6.9.0-preview.1.52 - 6.9.0-preview.1.52 - 6.9.0-preview.1.52 - 6.9.0-preview.1.52 - 6.9.0-preview.1.52 - 6.9.0-preview.1.52 - 6.9.0-preview.1.52 - 6.9.0-preview.1.52 - 6.9.0-preview.1.52 + 6.9.0-preview.1.54 + 6.9.0-preview.1.54 + 6.9.0-preview.1.54 + 6.9.0-preview.1.54 + 6.9.0-preview.1.54 + 6.9.0-preview.1.54 + 6.9.0-preview.1.54 + 6.9.0-preview.1.54 + 6.9.0-preview.1.54 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 4cc8f158c803fa0fe97d74c8042000789c5bfa48 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 14 Dec 2023 09:25:40 -0800 Subject: [PATCH 424/550] Clean up existing method that's used less --- src/Cli/dotnet/SlnFileExtensions.cs | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/Cli/dotnet/SlnFileExtensions.cs b/src/Cli/dotnet/SlnFileExtensions.cs index 555623dd302d..bafd408553d4 100644 --- a/src/Cli/dotnet/SlnFileExtensions.cs +++ b/src/Cli/dotnet/SlnFileExtensions.cs @@ -486,22 +486,13 @@ public static void RemoveEmptySolutionFolders(this SlnFile slnFile) private static HashSet GetSolutionFoldersThatContainProjectsInItsHierarchy( this SlnFile slnFile, - SlnPropertySet nestedProjects, - IEnumerable projectsToSearchFor = null, - bool stopAtOne = false) + SlnPropertySet nestedProjects) { var solutionFoldersInUse = new HashSet(); IEnumerable nonSolutionFolderProjects; - if (projectsToSearchFor == null) - { - nonSolutionFolderProjects = slnFile.Projects.GetProjectsNotOfType( - ProjectTypeGuids.SolutionFolderGuid); - } - else - { - nonSolutionFolderProjects = projectsToSearchFor; - } + nonSolutionFolderProjects = slnFile.Projects.GetProjectsNotOfType( + ProjectTypeGuids.SolutionFolderGuid); foreach (var nonSolutionFolderProject in nonSolutionFolderProjects) { @@ -510,10 +501,6 @@ private static HashSet GetSolutionFoldersThatContainProjectsInItsHierarc { id = nestedProjects[id]; solutionFoldersInUse.Add(id); - if (stopAtOne) - { - break; - } } } From 94d71ce73c9b5bab34cba2d312127ec324e83f8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:25:43 +0000 Subject: [PATCH 425/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#37508) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d5675046e08..255175b9a96c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - eea84ad7cf250b9dbf80f0981c594155d55de0b7 + fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa - + https://github.com/dotnet/msbuild - eea84ad7cf250b9dbf80f0981c594155d55de0b7 + fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa - + https://github.com/dotnet/msbuild - eea84ad7cf250b9dbf80f0981c594155d55de0b7 + fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 47620de61d39..9cc680e999ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23613-03 + 17.9.0-preview-23613-14 $(MicrosoftBuildPackageVersion) - net7.0 + net8.0 $(SdkTargetFramework) diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj index 509c6a286d88..fffc7b1b34bf 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj @@ -25,7 +25,7 @@ for Mac and other VS scenarios. During source-build, we only have access to the latest version, which targets NetCurrent. --> - $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll + $(PkgMicrosoft_Build_Runtime)\contentFiles\any\net8.0\MSBuild.dll $(PkgMicrosoft_Build_Runtime)\contentFiles\any\$(NetCurrent)\MSBuild.dll From 08056b1bb57e3f445355346f8dc60bdfd745293f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 07:07:44 +0000 Subject: [PATCH 429/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#37509) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4cb1b041960..11b772f12b3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa - + https://github.com/dotnet/fsharp - e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 - + https://github.com/dotnet/fsharp - e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 diff --git a/eng/Versions.props b/eng/Versions.props index 8c1f4bdc9a7d..9227e99f08a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,7 +134,7 @@ - 12.8.200-beta.23613.1 + 12.8.200-beta.23613.4 From 55bf627154064acb008f3320020caa8917bd0900 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 15 Dec 2023 11:19:45 -0800 Subject: [PATCH 430/550] Use DotNetHome instead of null --- .../commands/dotnet-workload/install/MsiInstallerBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs index 7a58b9646a43..9ea3f1ca107e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs @@ -499,7 +499,7 @@ protected void UpdateDependent(InstallRequestType requestType, string providerKe /// The feature band of the install state file. protected void RemoveInstallStateFile(SdkFeatureBand sdkFeatureBand) { - string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, null), "default.json"); + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json"); if (!File.Exists(path)) { @@ -527,7 +527,7 @@ protected void RemoveInstallStateFile(SdkFeatureBand sdkFeatureBand) /// The contents of the JSON file, formatted as a single line. protected void WriteInstallStateFile(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) { - string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, null), "default.json"); + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json"); Elevate(); if (IsElevated) From 5f84dbf08cb61de4ce4e4ea0e6618297eae2f342 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:24:02 +0000 Subject: [PATCH 431/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#37531) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11b772f12b3a..33706499f25a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa + b0e2b79230019c8f28ad7bedd82ecaa85a114761 - + https://github.com/dotnet/msbuild - fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa + b0e2b79230019c8f28ad7bedd82ecaa85a114761 - + https://github.com/dotnet/msbuild - fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa + b0e2b79230019c8f28ad7bedd82ecaa85a114761 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9227e99f08a1..2d8dba21c45d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23613-14 + 17.9.0-preview-23614-01 $(MicrosoftBuildPackageVersion) - 8.0.0-preview.23608.1 - 3.11.0-beta1.23608.1 + 8.0.0-preview.23614.1 + 3.11.0-beta1.23614.1 From c24ee8de6c0f140f574a4cb4fa369cbab7576c6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:24:58 +0000 Subject: [PATCH 433/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#37533) [release/8.0.2xx] Update dependencies from dotnet/fsharp --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41c6100ad46d..fbdfe2a63885 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild b0e2b79230019c8f28ad7bedd82ecaa85a114761 - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a diff --git a/eng/Versions.props b/eng/Versions.props index 63b3bea376b2..284f4eaa5206 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,7 +134,7 @@ - 12.8.200-beta.23613.4 + 12.8.200-beta.23614.3 From 85c168fbebc0a1cb3f33ac702630a57e433e32c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:25:22 +0000 Subject: [PATCH 434/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#37534) [release/8.0.2xx] Update dependencies from dotnet/roslyn --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbdfe2a63885..0c7e38ea73c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 284f4eaa5206..983bfcd0dec8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23613.8 - 4.9.0-3.23613.8 - 4.9.0-3.23613.8 - 4.9.0-3.23613.8 - 4.9.0-3.23613.8 - 4.9.0-3.23613.8 - 4.9.0-3.23613.8 + 4.9.0-3.23614.9 + 4.9.0-3.23614.9 + 4.9.0-3.23614.9 + 4.9.0-3.23614.9 + 4.9.0-3.23614.9 + 4.9.0-3.23614.9 + 4.9.0-3.23614.9 $(MicrosoftNetCompilersToolsetPackageVersion) From 3cbddf887d26a240968c6ec50a71988eb5a2969a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:25:37 +0000 Subject: [PATCH 435/550] [release/8.0.2xx] Update dependencies from microsoft/vstest (#37535) [release/8.0.2xx] Update dependencies from microsoft/vstest --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c7e38ea73c6..7af54b08ed39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client e8b43e6602749844de42f9f37e07fa9aa1fb108c - + https://github.com/microsoft/vstest - dc8fe3865011cef3a0891f5f55c1fc5c7f401066 + 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/microsoft/vstest - dc8fe3865011cef3a0891f5f55c1fc5c7f401066 + 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 - + https://github.com/microsoft/vstest - dc8fe3865011cef3a0891f5f55c1fc5c7f401066 + 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 983bfcd0dec8..0583b6364c66 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23612-01 - 17.9.0-preview-23612-01 - 17.9.0-preview-23612-01 + 17.9.0-preview-23614-02 + 17.9.0-preview-23614-02 + 17.9.0-preview-23614-02 From 1007d95210af6af5606c14fa13f4233b5e889240 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 22:25:52 +0000 Subject: [PATCH 436/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#37536) [release/8.0.2xx] Update dependencies from dotnet/razor --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7af54b08ed39..ee424c5ce633 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - e425b46683a42003de979bed6c6cd14a47787824 + 8510297b8a018b5660cd8c8487b1c87dc657a8cc - + https://github.com/dotnet/razor - e425b46683a42003de979bed6c6cd14a47787824 + 8510297b8a018b5660cd8c8487b1c87dc657a8cc - + https://github.com/dotnet/razor - e425b46683a42003de979bed6c6cd14a47787824 + 8510297b8a018b5660cd8c8487b1c87dc657a8cc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0583b6364c66..003fc3e72a39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23613.3 - 7.0.0-preview.23613.3 - 7.0.0-preview.23613.3 + 7.0.0-preview.23614.2 + 7.0.0-preview.23614.2 + 7.0.0-preview.23614.2 From 9e312103f12d48bcfd957109ab00f05eb88e1e05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Dec 2023 13:45:11 +0000 Subject: [PATCH 437/550] Update dependencies from https://github.com/dotnet/sourcelink build 20231215.1 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23605.1 -> To Version 8.0.0-beta.23615.1 --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee424c5ce633..f90f28165dcd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -347,30 +347,30 @@ https://github.com/dotnet/deployment-tools 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/sourcelink - 61bad8d452942eba97afabd479a58a0b1c288ee0 + 94eaac3385cafff41094454966e1af1d1cf60f00 - + https://github.com/dotnet/sourcelink - 61bad8d452942eba97afabd479a58a0b1c288ee0 + 94eaac3385cafff41094454966e1af1d1cf60f00 - + https://github.com/dotnet/sourcelink - 61bad8d452942eba97afabd479a58a0b1c288ee0 + 94eaac3385cafff41094454966e1af1d1cf60f00 - + https://github.com/dotnet/sourcelink - 61bad8d452942eba97afabd479a58a0b1c288ee0 + 94eaac3385cafff41094454966e1af1d1cf60f00 - + https://github.com/dotnet/sourcelink - 61bad8d452942eba97afabd479a58a0b1c288ee0 + 94eaac3385cafff41094454966e1af1d1cf60f00 - + https://github.com/dotnet/sourcelink - 61bad8d452942eba97afabd479a58a0b1c288ee0 + 94eaac3385cafff41094454966e1af1d1cf60f00 diff --git a/eng/Versions.props b/eng/Versions.props index 003fc3e72a39..eb5ff2c60055 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,12 +178,12 @@ - 8.0.0-beta.23605.1 - 8.0.0-beta.23605.1 - 8.0.0-beta.23605.1 - 8.0.0-beta.23605.1 - 8.0.0-beta.23605.1 - 8.0.0-beta.23605.1 + 8.0.0-beta.23615.1 + 8.0.0-beta.23615.1 + 8.0.0-beta.23615.1 + 8.0.0-beta.23615.1 + 8.0.0-beta.23615.1 + 8.0.0-beta.23615.1 From 1fd28556b96588ce681bdfa47eecf23859d4002f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Dec 2023 13:45:33 +0000 Subject: [PATCH 438/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.63 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.54 -> To Version 6.9.0-preview.1.63 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee424c5ce633..fd8ca78cd741 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 003fc3e72a39..f8c82a8bc564 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.54 - 6.9.0-preview.1.54 + 6.9.0-preview.1.63 + 6.9.0-preview.1.63 6.0.0-rc.278 - 6.9.0-preview.1.54 - 6.9.0-preview.1.54 - 6.9.0-preview.1.54 - 6.9.0-preview.1.54 - 6.9.0-preview.1.54 - 6.9.0-preview.1.54 - 6.9.0-preview.1.54 - 6.9.0-preview.1.54 - 6.9.0-preview.1.54 + 6.9.0-preview.1.63 + 6.9.0-preview.1.63 + 6.9.0-preview.1.63 + 6.9.0-preview.1.63 + 6.9.0-preview.1.63 + 6.9.0-preview.1.63 + 6.9.0-preview.1.63 + 6.9.0-preview.1.63 + 6.9.0-preview.1.63 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From eef43bd25858fc92622b64378b9c50b7c31faa60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Dec 2023 13:46:14 +0000 Subject: [PATCH 439/550] Update dependencies from https://github.com/dotnet/fsharp build 20231215.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23614.3 -> To Version 8.0.200-beta.23615.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee424c5ce633..cfa97585c38e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ https://github.com/dotnet/msbuild b0e2b79230019c8f28ad7bedd82ecaa85a114761 - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 diff --git a/eng/Versions.props b/eng/Versions.props index 003fc3e72a39..f92fd768f50e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,7 +134,7 @@ - 12.8.200-beta.23614.3 + 12.8.200-beta.23615.3 From e979ce16285b8ed1fc7d38b4b887707f1dc9a5c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Dec 2023 13:46:35 +0000 Subject: [PATCH 440/550] Update dependencies from https://github.com/dotnet/roslyn build 20231215.7 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23614.9 -> To Version 4.9.0-3.23615.7 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee424c5ce633..ad067f45c169 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 003fc3e72a39..864ad000b4ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23614.9 - 4.9.0-3.23614.9 - 4.9.0-3.23614.9 - 4.9.0-3.23614.9 - 4.9.0-3.23614.9 - 4.9.0-3.23614.9 - 4.9.0-3.23614.9 + 4.9.0-3.23615.7 + 4.9.0-3.23615.7 + 4.9.0-3.23615.7 + 4.9.0-3.23615.7 + 4.9.0-3.23615.7 + 4.9.0-3.23615.7 + 4.9.0-3.23615.7 $(MicrosoftNetCompilersToolsetPackageVersion) From e6d91fc69ad8e7eba894ae8f794e70080b41a183 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Dec 2023 13:46:55 +0000 Subject: [PATCH 441/550] Update dependencies from https://github.com/dotnet/razor build 20231215.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23614.2 -> To Version 7.0.0-preview.23615.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee424c5ce633..e8138c3a2aa0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 8510297b8a018b5660cd8c8487b1c87dc657a8cc + fb1f5f2625120e9e830fb8b3b091e6062b30828d - + https://github.com/dotnet/razor - 8510297b8a018b5660cd8c8487b1c87dc657a8cc + fb1f5f2625120e9e830fb8b3b091e6062b30828d - + https://github.com/dotnet/razor - 8510297b8a018b5660cd8c8487b1c87dc657a8cc + fb1f5f2625120e9e830fb8b3b091e6062b30828d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 003fc3e72a39..dbf52b147b23 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23614.2 - 7.0.0-preview.23614.2 - 7.0.0-preview.23614.2 + 7.0.0-preview.23615.1 + 7.0.0-preview.23615.1 + 7.0.0-preview.23615.1 From bd12adf784333d692887a10ed91e84b442882e2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Dec 2023 13:50:56 +0000 Subject: [PATCH 442/550] Update dependencies from https://github.com/dotnet/sourcelink build 20231215.1 Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 8.0.0-beta.23605.1 -> To Version 8.0.0-beta.23615.1 From 98cff36079755cf5e21756081413a5eb1f16a95e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Dec 2023 13:51:21 +0000 Subject: [PATCH 443/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.64 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.54 -> To Version 6.9.0-preview.1.64 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd8ca78cd741..554e6b0da10e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/nuget/nuget.client - e9bc6f75fea5afd1313394d8b87db2d8ec757dd5 + 2a234707a663f731e4de93cba4014ed1a8259def https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index f8c82a8bc564..a3cf5e62ac35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.63 - 6.9.0-preview.1.63 + 6.9.0-preview.1.64 + 6.9.0-preview.1.64 6.0.0-rc.278 - 6.9.0-preview.1.63 - 6.9.0-preview.1.63 - 6.9.0-preview.1.63 - 6.9.0-preview.1.63 - 6.9.0-preview.1.63 - 6.9.0-preview.1.63 - 6.9.0-preview.1.63 - 6.9.0-preview.1.63 - 6.9.0-preview.1.63 + 6.9.0-preview.1.64 + 6.9.0-preview.1.64 + 6.9.0-preview.1.64 + 6.9.0-preview.1.64 + 6.9.0-preview.1.64 + 6.9.0-preview.1.64 + 6.9.0-preview.1.64 + 6.9.0-preview.1.64 + 6.9.0-preview.1.64 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 7f6548c8b3d1f0e1b56b5c700daf825eec682891 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Dec 2023 13:52:12 +0000 Subject: [PATCH 444/550] Update dependencies from https://github.com/dotnet/fsharp build 20231215.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23614.3 -> To Version 8.0.200-beta.23615.3 From 2c690412b2e183ee9147363e35c6e4c593581738 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Dec 2023 13:52:39 +0000 Subject: [PATCH 445/550] Update dependencies from https://github.com/dotnet/roslyn build 20231215.7 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23614.9 -> To Version 4.9.0-3.23615.7 From 80cf00e8a230c7282064a456eda347dfa6c49ba3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Dec 2023 13:53:05 +0000 Subject: [PATCH 446/550] Update dependencies from https://github.com/dotnet/razor build 20231216.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23614.2 -> To Version 7.0.0-preview.23616.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8138c3a2aa0..4e201d677d30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - fb1f5f2625120e9e830fb8b3b091e6062b30828d + f07a2d99c17d64415cabac359aec7466ebaeac90 - + https://github.com/dotnet/razor - fb1f5f2625120e9e830fb8b3b091e6062b30828d + f07a2d99c17d64415cabac359aec7466ebaeac90 - + https://github.com/dotnet/razor - fb1f5f2625120e9e830fb8b3b091e6062b30828d + f07a2d99c17d64415cabac359aec7466ebaeac90 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index dbf52b147b23..21f8a44c7ca2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23615.1 - 7.0.0-preview.23615.1 - 7.0.0-preview.23615.1 + 7.0.0-preview.23616.1 + 7.0.0-preview.23616.1 + 7.0.0-preview.23616.1 From 88c2876c291f47115339111c1bd41b0cb9c188db Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Mon, 18 Dec 2023 02:42:31 -0800 Subject: [PATCH 447/550] change strings; resolve the lazy option --- .../update/ToolUpdateGlobalOrToolPathCommand.cs | 10 +++++----- .../dotnet-tool/update/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.de.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.es.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.it.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../update/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../update/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../update/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs index 54ad0d036886..74c034b509c1 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateGlobalOrToolPathCommand.cs @@ -22,7 +22,7 @@ internal class ToolUpdateGlobalOrToolPathCommand : CommandBase { private readonly CreateShellShimRepository _createShellShimRepository; private readonly CreateToolPackageStoresAndDownloaderAndUninstaller _createToolPackageStoreDownloaderUninstaller; - private readonly Lazy _toolInstallGlobalOrToolPathCommand; + private readonly ToolInstallGlobalOrToolPathCommand _toolInstallGlobalOrToolPathCommand; public ToolUpdateGlobalOrToolPathCommand(ParseResult parseResult, CreateToolPackageStoresAndDownloaderAndUninstaller createToolPackageStoreDownloaderUninstaller = null, @@ -36,17 +36,17 @@ public ToolUpdateGlobalOrToolPathCommand(ParseResult parseResult, _createShellShimRepository = createShellShimRepository ?? ShellShimRepositoryFactory.CreateShellShimRepository; - _toolInstallGlobalOrToolPathCommand = new Lazy( - () => new ToolInstallGlobalOrToolPathCommand( + _toolInstallGlobalOrToolPathCommand = new ToolInstallGlobalOrToolPathCommand( + parseResult, _createToolPackageStoreDownloaderUninstaller, _createShellShimRepository, - reporter: reporter)); + reporter: reporter); } public override int Execute() { - _toolInstallGlobalOrToolPathCommand.Value.Execute(); + _toolInstallGlobalOrToolPathCommand.Execute(); return 0; } } diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf index b37e373dc13c..27f8eca981cc 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf index f1055f4f47ce..85619b7c495a 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf index dbcec7c79278..15797eb1f356 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf index b8e72a13aebc..87cddd096f06 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf index ab8a4fc96ac2..094c7fbfabea 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf index 505dff1ccb0e..110960d8e8f8 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf index 83a95ead3e8c..ef7312f654d9 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf index 60397d66f1f9..82f889d5ee6d 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf index c7aa8dbee058..d336f1c48f23 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf index 3268e26c1f4c..d60b074285cf 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf index d7099b0186b2..c6234f91da02 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf index 8474fa765996..f3d3da3d3b6d 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf index b9a45289c722..2f58cb1c2ae1 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. From c43203ea3233d0fad12de92a2a150458b178c5d5 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 18 Dec 2023 09:27:19 -0600 Subject: [PATCH 448/550] rename property for consistency --- .../Tasks/ComputeDotnetBaseImageAndTag.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs index 79f30b91e782..458c7b55195a 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs @@ -75,7 +75,7 @@ public sealed class ComputeDotnetBaseImageAndTag : Microsoft.Build.Utilities.Tas public string? ComputedContainerBaseImage { get; private set; } private bool IsAspNetCoreProject => FrameworkReferences.Length > 0 && FrameworkReferences.Any(x => x.ItemSpec.Equals("Microsoft.AspnetCore.App", StringComparison.Ordinal)); - private bool IsMuslRID => TargetRuntimeIdentifier.StartsWith("linux-musl", StringComparison.Ordinal); + private bool IsMuslRid => TargetRuntimeIdentifier.StartsWith("linux-musl", StringComparison.Ordinal); private bool IsBundledRuntime => IsSelfContained; private bool NeedsNightlyImages => IsAotPublished; private bool AllowsExperimentalTagInference => String.IsNullOrEmpty(ContainerFamily); @@ -133,7 +133,7 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository, { if (!versionAllowsUsingAOTAndExtrasImages) { - tag += IsMuslRID switch + tag += IsMuslRid switch { true => "-alpine", false => "" // TODO: should we default here to chiseled iamges for < 8 apps? @@ -144,7 +144,7 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository, else { // chose the base OS - tag += IsMuslRID switch + tag += IsMuslRid switch { true => "-alpine", // default to chiseled for AOT, non-musl Apps From b5d57d2785a0b83874fb65bddc68bdddebabdceb Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Mon, 18 Dec 2023 09:29:52 -0600 Subject: [PATCH 449/550] remove errant continuation --- .../Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs index 17895027d215..f3a15c05b4c8 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs @@ -33,7 +33,7 @@ public override bool Execute() { try { - Task.Run(() => ExecuteAsync(_cancellationTokenSource.Token)).ContinueWith(t => t).GetAwaiter().GetResult(); + Task.Run(() => ExecuteAsync(_cancellationTokenSource.Token)).GetAwaiter().GetResult(); } catch (TaskCanceledException ex) { From cf3eb98581652cd0e299a3d3217ca659ed9b206c Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Mon, 18 Dec 2023 22:17:42 -0800 Subject: [PATCH 450/550] update LocalizableStrings --- .../dotnet/commands/dotnet-tool/update/LocalizableStrings.resx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx index a6d39289fd5b..2c54fc8ece1e 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx @@ -219,7 +219,7 @@ and the corresponding package Ids for installed tools using the command Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). - The requested version {0} is lower than existing version {1} (manifest file {2}). + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. Tool '{0}' is up to date (version '{1}' manifest file {2}) . From fc68b55c3007944d143991fa7e80aaf1b02141e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Dec 2023 13:59:00 +0000 Subject: [PATCH 451/550] Update dependencies from https://github.com/dotnet/msbuild build 20231218.8 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.9.0-preview-23614-01 -> To Version 17.9.0-preview-23618-08 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 507ad805faef..75e79082fdf9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - b0e2b79230019c8f28ad7bedd82ecaa85a114761 + 82d381eb23290d50936683719bda333461af9528 - + https://github.com/dotnet/msbuild - b0e2b79230019c8f28ad7bedd82ecaa85a114761 + 82d381eb23290d50936683719bda333461af9528 - + https://github.com/dotnet/msbuild - b0e2b79230019c8f28ad7bedd82ecaa85a114761 + 82d381eb23290d50936683719bda333461af9528 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 971c122e8d3a..4c3aac5101a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23614-01 + 17.9.0-preview-23618-08 $(MicrosoftBuildPackageVersion) - 12.8.200-beta.23615.3 + 12.8.200-beta.23618.1 From 00ec1e17f0a2e15dd3114945c73de81120418061 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Dec 2023 14:00:02 +0000 Subject: [PATCH 453/550] Update dependencies from https://github.com/dotnet/roslyn build 20231218.7 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23615.7 -> To Version 4.9.0-3.23618.7 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 507ad805faef..4ad3438168e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 971c122e8d3a..32b0da4ff2cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23615.7 - 4.9.0-3.23615.7 - 4.9.0-3.23615.7 - 4.9.0-3.23615.7 - 4.9.0-3.23615.7 - 4.9.0-3.23615.7 - 4.9.0-3.23615.7 + 4.9.0-3.23618.7 + 4.9.0-3.23618.7 + 4.9.0-3.23618.7 + 4.9.0-3.23618.7 + 4.9.0-3.23618.7 + 4.9.0-3.23618.7 + 4.9.0-3.23618.7 $(MicrosoftNetCompilersToolsetPackageVersion) From 96655d78af1b2af240663e3d4ba89e9bfb895fb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Dec 2023 14:00:23 +0000 Subject: [PATCH 454/550] Update dependencies from https://github.com/dotnet/razor build 20231218.3 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23616.1 -> To Version 7.0.0-preview.23618.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 507ad805faef..84f68d8d8cb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - f07a2d99c17d64415cabac359aec7466ebaeac90 + d7b803092d76cb734b6ce23781137a227de9fe11 - + https://github.com/dotnet/razor - f07a2d99c17d64415cabac359aec7466ebaeac90 + d7b803092d76cb734b6ce23781137a227de9fe11 - + https://github.com/dotnet/razor - f07a2d99c17d64415cabac359aec7466ebaeac90 + d7b803092d76cb734b6ce23781137a227de9fe11 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 971c122e8d3a..6aa58a4471d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23616.1 - 7.0.0-preview.23616.1 - 7.0.0-preview.23616.1 + 7.0.0-preview.23618.3 + 7.0.0-preview.23618.3 + 7.0.0-preview.23618.3 From 6d62dc12f7bd8cb7946a7e9ca94d3e8052cc021a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Dec 2023 13:58:43 +0000 Subject: [PATCH 455/550] Update dependencies from https://github.com/dotnet/roslyn build 20231219.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23618.7 -> To Version 4.9.0-3.23619.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8da45d10a997..7af39709e6e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 + 0caa9d162683c44645ccc6e1645ce4a01acfd8dc - + https://github.com/dotnet/roslyn - 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 + 0caa9d162683c44645ccc6e1645ce4a01acfd8dc - + https://github.com/dotnet/roslyn - 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 + 0caa9d162683c44645ccc6e1645ce4a01acfd8dc - + https://github.com/dotnet/roslyn - 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 + 0caa9d162683c44645ccc6e1645ce4a01acfd8dc - + https://github.com/dotnet/roslyn - 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 + 0caa9d162683c44645ccc6e1645ce4a01acfd8dc - + https://github.com/dotnet/roslyn - 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 + 0caa9d162683c44645ccc6e1645ce4a01acfd8dc - + https://github.com/dotnet/roslyn - 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 + 0caa9d162683c44645ccc6e1645ce4a01acfd8dc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b368d3a55f7f..8a33087ad537 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23618.7 - 4.9.0-3.23618.7 - 4.9.0-3.23618.7 - 4.9.0-3.23618.7 - 4.9.0-3.23618.7 - 4.9.0-3.23618.7 - 4.9.0-3.23618.7 + 4.9.0-3.23619.3 + 4.9.0-3.23619.3 + 4.9.0-3.23619.3 + 4.9.0-3.23619.3 + 4.9.0-3.23619.3 + 4.9.0-3.23619.3 + 4.9.0-3.23619.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 17a1057a0dc16e4ae25130fca5628802255b3cd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Dec 2023 13:59:02 +0000 Subject: [PATCH 456/550] Update dependencies from https://github.com/dotnet/razor build 20231219.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23618.3 -> To Version 7.0.0-preview.23619.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8da45d10a997..e903d8cbfa7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - d7b803092d76cb734b6ce23781137a227de9fe11 + a54193ca64ed6972e7acf3b323921d15e1744299 - + https://github.com/dotnet/razor - d7b803092d76cb734b6ce23781137a227de9fe11 + a54193ca64ed6972e7acf3b323921d15e1744299 - + https://github.com/dotnet/razor - d7b803092d76cb734b6ce23781137a227de9fe11 + a54193ca64ed6972e7acf3b323921d15e1744299 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b368d3a55f7f..dffb38ff53a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23618.3 - 7.0.0-preview.23618.3 - 7.0.0-preview.23618.3 + 7.0.0-preview.23619.1 + 7.0.0-preview.23619.1 + 7.0.0-preview.23619.1 From af2ee1774a7843344142c4d223ad0dcd5176ce69 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Wed, 20 Dec 2023 11:28:01 -0800 Subject: [PATCH 457/550] Permit setting whether to use workload sets or loose manifests Fixes #34561 (#37346) Fixes #34561 Adds a new subcommand (dotnet workload update --mode) taking one of three arguments: workloadset, loosemanifest, or auto. This will set the relevant bool in the install state according to that value. That bool is not yet used. --- .../Windows/InstallMessageDispatcher.cs | 26 ++++++-- .../Windows/InstallRequestMessage.cs | 10 +++- .../Installer/Windows/InstallRequestType.cs | 9 ++- .../commands/InstallingWorkloadCommand.cs | 28 ++++----- .../dotnet-workload/InstallStateContents.cs | 30 ++++++++++ .../install/FileBasedInstaller.cs | 21 +++++-- .../dotnet-workload/install/IInstaller.cs | 8 ++- .../install/LocalizableStrings.resx | 3 + .../install/MsiInstallerBase.cs | 60 ++++++++++++++++--- .../install/NetSdkMsiInstallerClient.cs | 10 ++-- .../install/NetSdkMsiInstallerServer.cs | 14 +++-- .../install/WorkloadInstallCommand.cs | 2 +- .../install/xlf/LocalizableStrings.cs.xlf | 5 ++ .../install/xlf/LocalizableStrings.de.xlf | 5 ++ .../install/xlf/LocalizableStrings.es.xlf | 5 ++ .../install/xlf/LocalizableStrings.fr.xlf | 5 ++ .../install/xlf/LocalizableStrings.it.xlf | 5 ++ .../install/xlf/LocalizableStrings.ja.xlf | 5 ++ .../install/xlf/LocalizableStrings.ko.xlf | 5 ++ .../install/xlf/LocalizableStrings.pl.xlf | 5 ++ .../install/xlf/LocalizableStrings.pt-BR.xlf | 5 ++ .../install/xlf/LocalizableStrings.ru.xlf | 5 ++ .../install/xlf/LocalizableStrings.tr.xlf | 5 ++ .../xlf/LocalizableStrings.zh-Hans.xlf | 5 ++ .../xlf/LocalizableStrings.zh-Hant.xlf | 5 ++ .../update/LocalizableStrings.resx | 3 + .../update/WorkloadUpdateCommand.cs | 22 ++++++- .../update/WorkloadUpdateCommandParser.cs | 1 + .../update/xlf/LocalizableStrings.cs.xlf | 5 ++ .../update/xlf/LocalizableStrings.de.xlf | 5 ++ .../update/xlf/LocalizableStrings.es.xlf | 5 ++ .../update/xlf/LocalizableStrings.fr.xlf | 5 ++ .../update/xlf/LocalizableStrings.it.xlf | 5 ++ .../update/xlf/LocalizableStrings.ja.xlf | 5 ++ .../update/xlf/LocalizableStrings.ko.xlf | 5 ++ .../update/xlf/LocalizableStrings.pl.xlf | 5 ++ .../update/xlf/LocalizableStrings.pt-BR.xlf | 5 ++ .../update/xlf/LocalizableStrings.ru.xlf | 5 ++ .../update/xlf/LocalizableStrings.tr.xlf | 5 ++ .../update/xlf/LocalizableStrings.zh-Hans.xlf | 5 ++ .../update/xlf/LocalizableStrings.zh-Hant.xlf | 5 ++ .../GivenFileBasedWorkloadInstall.cs | 37 ++++++++++++ .../MockPackWorkloadInstaller.cs | 18 ++++-- 43 files changed, 378 insertions(+), 54 deletions(-) create mode 100644 src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs diff --git a/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs b/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs index 0d1270daeac8..7d446db4944d 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallMessageDispatcher.cs @@ -152,11 +152,11 @@ public InstallResponseMessage SendWorkloadRecordRequest(InstallRequestType reque /// /// The SDK feature band of the install state file to delete. /// - public InstallResponseMessage SendRemoveInstallStateFileRequest(SdkFeatureBand sdkFeatureBand) + public InstallResponseMessage SendRemoveManifestsFromInstallStateFileRequest(SdkFeatureBand sdkFeatureBand) { return Send(new InstallRequestMessage { - RequestType = InstallRequestType.RemoveInstallStateFile, + RequestType = InstallRequestType.RemoveManifestsFromInstallStateFile, SdkFeatureBand = sdkFeatureBand.ToString(), }); } @@ -167,13 +167,29 @@ public InstallResponseMessage SendRemoveInstallStateFileRequest(SdkFeatureBand s /// The SDK feature band of the install state file to write /// A multi-line string containing the formatted JSON data to write. /// - public InstallResponseMessage SendWriteInstallStateFileRequest(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) + public InstallResponseMessage SendSaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary manifestContents) { return Send(new InstallRequestMessage { - RequestType = InstallRequestType.WriteInstallStateFile, + RequestType = InstallRequestType.SaveInstallStateManifestVersions, SdkFeatureBand = sdkFeatureBand.ToString(), - InstallStateContents = jsonLines.ToArray() + InstallStateManifestVersions = manifestContents + }); + } + + /// + /// Send an to adjust the mode used for installing and updating workloads + /// + /// The SDK feature band of the install state file to write + /// Whether to use workload sets or not + /// + public InstallResponseMessage SendUpdateWorkloadModeRequest(SdkFeatureBand sdkFeatureBand, bool newMode) + { + return Send(new InstallRequestMessage + { + RequestType = InstallRequestType.AdjustWorkloadMode, + SdkFeatureBand = sdkFeatureBand.ToString(), + UseWorkloadSets = newMode, }); } } diff --git a/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs b/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs index 002f7e22ae1f..5ab6430bcbf4 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallRequestMessage.cs @@ -33,7 +33,7 @@ public string ManifestPath /// The contents of the install state file. Each element corresponds to a single line of /// the JSON file to be written. /// - public string[] InstallStateContents + public Dictionary InstallStateManifestVersions { get; set; @@ -120,6 +120,14 @@ public string WorkloadId set; } + /// + /// The new mode to use: workloadset or loosemanifests + /// + public bool UseWorkloadSets + { + get; set; + } + /// /// Converts a deserialized array of bytes into an . /// diff --git a/src/Cli/dotnet/Installer/Windows/InstallRequestType.cs b/src/Cli/dotnet/Installer/Windows/InstallRequestType.cs index b2847abb8479..2d90d3f2f68f 100644 --- a/src/Cli/dotnet/Installer/Windows/InstallRequestType.cs +++ b/src/Cli/dotnet/Installer/Windows/InstallRequestType.cs @@ -58,11 +58,16 @@ public enum InstallRequestType /// /// Creates an install state file. /// - WriteInstallStateFile, + SaveInstallStateManifestVersions, /// /// Removes an install state file. /// - RemoveInstallStateFile, + RemoveManifestsFromInstallStateFile, + + /// + /// Changes the workload mode + /// + AdjustWorkloadMode, } } diff --git a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs index 3bcf9061e005..9e010dfb3632 100644 --- a/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs +++ b/src/Cli/dotnet/commands/InstallingWorkloadCommand.cs @@ -3,8 +3,11 @@ using System.CommandLine; using System.IO; +using System.Linq; using System.Net.Http.Json; using System.Runtime.CompilerServices; +using System.Text.Json; +using System.Text.Json.Nodes; using Microsoft.Deployment.DotNet.Releases; using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.NuGetPackageDownloader; @@ -88,23 +91,10 @@ public InstallingWorkloadCommand( _workloadManifestUpdaterFromConstructor = workloadManifestUpdater; } - protected IEnumerable GetInstallStateContents(IEnumerable manifestVersionUpdates) => - ToJsonEnumerable(WorkloadSet.FromManifests( + protected static Dictionary GetInstallStateContents(IEnumerable manifestVersionUpdates) => + WorkloadSet.FromManifests( manifestVersionUpdates.Select(update => new WorkloadManifestInfo(update.ManifestId.ToString(), update.NewVersion.ToString(), /* We don't actually use the directory here */ string.Empty, update.NewFeatureBand)) - ).ToDictionaryForJson()); - - private IEnumerable ToJsonEnumerable(Dictionary dict) - { - yield return "{"; - yield return "\"manifests\": {"; - foreach (KeyValuePair line in dict) - { - yield return $"\"{line.Key}\": \"{line.Value}\","; - } - yield return "}"; - yield return "}"; - yield break; - } + ).ToDictionaryForJson(); protected async Task> GetDownloads(IEnumerable workloadIds, bool skipManifestUpdate, bool includePreview, string downloadFolder = null) { @@ -206,6 +196,12 @@ protected IEnumerable GetInstalledWorkloads(bool fromPreviousSdk) internal static class InstallingWorkloadCommandParser { + public static readonly CliOption WorkloadSetMode = new("--mode") + { + Description = Strings.WorkloadSetMode, + Hidden = true + }; + public static readonly CliOption PrintDownloadLinkOnlyOption = new("--print-download-link-only") { Description = Strings.PrintDownloadLinkOnlyDescription, diff --git a/src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs b/src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs new file mode 100644 index 000000000000..f8afd9fa3943 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-workload/InstallStateContents.cs @@ -0,0 +1,30 @@ +using System.Text.Json; +using System.Text.Json.Serialization; + +namespace Microsoft.DotNet.Workloads.Workload +{ + internal class InstallStateContents + { + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + public bool? UseWorkloadSets { get; set; } + + [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] + public Dictionary Manifests { get; set; } + + private static readonly JsonSerializerOptions s_options = new() + { + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + WriteIndented = true, + }; + + public static InstallStateContents FromString(string contents) + { + return JsonSerializer.Deserialize(contents, s_options); + } + + public override string ToString() + { + return JsonSerializer.Serialize(this, s_options); + } + } +} \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs index c72572e6eec5..b84a75ebee82 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs @@ -452,21 +452,34 @@ public void GarbageCollect(Func getResolverForWorkloa } - public void DeleteInstallState(SdkFeatureBand sdkFeatureBand) + public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand) { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetDir), "default.json"); if (File.Exists(path)) { - File.Delete(path); + var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents(); + installStateContents.Manifests = null; + File.WriteAllText(path, installStateContents.ToString()); } } - public void WriteInstallState(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) + public void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary manifestContents) { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetDir), "default.json"); Directory.CreateDirectory(Path.GetDirectoryName(path)); - File.WriteAllLines(path, jsonLines); + var installStateContents = InstallStateContents.FromString(File.Exists(path) ? File.ReadAllText(path) : "{}"); + installStateContents.Manifests = manifestContents; + File.WriteAllText(path, installStateContents.ToString()); + } + + public void UpdateInstallMode(SdkFeatureBand sdkFeatureBand, bool newMode) + { + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json"); + Directory.CreateDirectory(Path.GetDirectoryName(path)); + var installStateContents = InstallStateContents.FromString(File.Exists(path) ? File.ReadAllText(path) : "{}"); + installStateContents.UseWorkloadSets = newMode; + File.WriteAllText(path, installStateContents.ToString()); } /// diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs index 6a75c395f2e3..5d388ef8bd21 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/IInstaller.cs @@ -38,14 +38,16 @@ internal interface IInstaller : IWorkloadManifestInstaller /// Delete the install state file at the specified path. /// /// The SDK feature band of the install state file. - void DeleteInstallState(SdkFeatureBand sdkFeatureBand); + void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand); /// /// Writes the specified JSON contents to the install state file. /// /// The SDK feature band of the install state file. - /// The JSON contents describing the install state. - void WriteInstallState(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines); + /// The JSON contents describing the install state. + void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary manifestContents); + + void UpdateInstallMode(SdkFeatureBand sdkFeatureBand, bool newMode); } // Interface to pass to workload manifest updater diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-workload/install/LocalizableStrings.resx index 08f453f48894..b9cd5af6b5dd 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-workload/install/LocalizableStrings.resx @@ -183,6 +183,9 @@ Only print the list of links to download without downloading. + + Control whether future workload operations should use workload sets or loose manifests. + Download packages needed to install a workload to a folder that can be used for offline installation. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs index 9ea3f1ca107e..653773b7c437 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs @@ -1,9 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System; using System.Diagnostics; using System.Runtime.Versioning; using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Workloads.Workload; +using Microsoft.DotNet.Workloads.Workload.Install; using Microsoft.DotNet.Workloads.Workload.Install.InstallRecord; using Microsoft.NET.Sdk.WorkloadManifestReader; using Microsoft.Win32; @@ -272,6 +275,40 @@ protected uint RepairMsi(string productCode, string logFile) throw new InvalidOperationException($"Invalid configuration: elevated: {IsElevated}, client: {IsClient}"); } + /// + /// Instructs future workload operations to use workload sets or loose manifests, per newMode. + /// + /// The feature band to update + /// Where to use loose manifests or workload sets + /// Full path of the log file + /// Error code indicating the result of the operation + /// + protected void UpdateInstallMode(SdkFeatureBand sdkFeatureBand, bool newMode) + { + Elevate(); + + if (IsElevated) + { + string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json"); + // Create the parent folder for the state file and set up all required ACLs + SecurityUtils.CreateSecureDirectory(Path.GetDirectoryName(path)); + var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents(); + installStateContents.UseWorkloadSets = newMode; + File.WriteAllText(path, installStateContents.ToString()); + + SecurityUtils.SecureFile(path); + } + else if (IsClient) + { + InstallResponseMessage response = Dispatcher.SendUpdateWorkloadModeRequest(sdkFeatureBand, newMode); + ExitOnFailure(response, "Failed to update install mode."); + } + else + { + throw new InvalidOperationException($"Invalid configuration: elevated: {IsElevated}, client: {IsClient}"); + } + } + /// /// Installs the specified MSI. /// @@ -494,10 +531,10 @@ protected void UpdateDependent(InstallRequestType requestType, string providerKe } /// - /// Deletes install state file for the specified feature band. + /// Deletes manifests from the install state file for the specified feature band. /// /// The feature band of the install state file. - protected void RemoveInstallStateFile(SdkFeatureBand sdkFeatureBand) + protected void RemoveManifestsFromInstallStateFile(SdkFeatureBand sdkFeatureBand) { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json"); @@ -511,11 +548,16 @@ protected void RemoveInstallStateFile(SdkFeatureBand sdkFeatureBand) if (IsElevated) { - File.Delete(path); + if (File.Exists(path)) + { + var installStateContents = InstallStateContents.FromString(File.ReadAllText(path)); + installStateContents.Manifests = null; + File.WriteAllText(path, installStateContents.ToString()); + } } else if (IsClient) { - InstallResponseMessage response = Dispatcher.SendRemoveInstallStateFileRequest(sdkFeatureBand); + InstallResponseMessage response = Dispatcher.SendRemoveManifestsFromInstallStateFileRequest(sdkFeatureBand); ExitOnFailure(response, $"Failed to remove install state file: {path}"); } } @@ -524,8 +566,8 @@ protected void RemoveInstallStateFile(SdkFeatureBand sdkFeatureBand) /// Writes the contents of the install state JSON file. /// /// The path of the isntall state file to write. - /// The contents of the JSON file, formatted as a single line. - protected void WriteInstallStateFile(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) + /// The contents of the JSON file, formatted as a single line. + protected void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary manifestContents) { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json"); Elevate(); @@ -535,13 +577,15 @@ protected void WriteInstallStateFile(SdkFeatureBand sdkFeatureBand, IEnumerable< // Create the parent folder for the state file and set up all required ACLs SecurityUtils.CreateSecureDirectory(Path.GetDirectoryName(path)); - File.WriteAllLines(path, jsonLines); + var installStateContents = InstallStateContents.FromString(File.Exists(path) ? File.ReadAllText(path) : "{}"); + installStateContents.Manifests = manifestContents; + File.WriteAllText(path, installStateContents.ToString()); SecurityUtils.SecureFile(path); } else if (IsClient) { - InstallResponseMessage respone = Dispatcher.SendWriteInstallStateFileRequest(sdkFeatureBand, jsonLines); + InstallResponseMessage respone = Dispatcher.SendSaveInstallStateManifestVersions(sdkFeatureBand, manifestContents); ExitOnFailure(respone, $"Failed to write install state file: {path}"); } } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs index b59e1fe9d1e5..8aa2d08fefc5 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs @@ -182,11 +182,11 @@ public void GarbageCollect(Func getResolverForWorkloa } } - public void DeleteInstallState(SdkFeatureBand sdkFeatureBand) => - RemoveInstallStateFile(sdkFeatureBand); + public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand) => + RemoveManifestsFromInstallStateFile(sdkFeatureBand); - public void WriteInstallState(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) => - WriteInstallStateFile(sdkFeatureBand, jsonLines); + public new void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary manifestContents) => + SaveInstallStateManifestVersions(sdkFeatureBand, manifestContents); /// /// Find all the dependents that look like they belong to SDKs. We only care @@ -1080,5 +1080,7 @@ private void OnProcessExit(object sender, EventArgs e) } } } + + void IInstaller.UpdateInstallMode(SdkFeatureBand sdkFeatureBand, bool newMode) => UpdateInstallMode(sdkFeatureBand, newMode); } } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs index 543266aa9c2c..aa6fa43b8fec 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs @@ -93,16 +93,22 @@ public void Run() Dispatcher.ReplySuccess($"Updated dependent '{request.Dependent}' for provider key '{request.ProviderKeyName}'"); break; - case InstallRequestType.WriteInstallStateFile: - WriteInstallStateFile(new SdkFeatureBand(request.SdkFeatureBand), request.InstallStateContents); + case InstallRequestType.SaveInstallStateManifestVersions: + SaveInstallStateManifestVersions(new SdkFeatureBand(request.SdkFeatureBand), request.InstallStateManifestVersions); Dispatcher.ReplySuccess($"Created install state file for {request.SdkFeatureBand}."); break; - case InstallRequestType.RemoveInstallStateFile: - RemoveInstallStateFile(new SdkFeatureBand(request.SdkFeatureBand)); + case InstallRequestType.RemoveManifestsFromInstallStateFile: + RemoveManifestsFromInstallStateFile(new SdkFeatureBand(request.SdkFeatureBand)); Dispatcher.ReplySuccess($"Deleted install state file for {request.SdkFeatureBand}."); break; + case InstallRequestType.AdjustWorkloadMode: + UpdateInstallMode(new SdkFeatureBand(request.SdkFeatureBand), request.UseWorkloadSets); + string newMode = request.ProductCode.Equals("true", StringComparison.OrdinalIgnoreCase) ? "workload sets" : "loose manifests"; + Dispatcher.ReplySuccess($"Updated install mode to use {newMode}."); + break; + default: throw new InvalidOperationException($"Unknown message request: {(int)request.RequestType}"); } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index f85f57981ab3..586c8b87fd74 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -229,7 +229,7 @@ private void InstallWorkloadsWithInstallRecord( if (usingRollback) { - installer.WriteInstallState(sdkFeatureBand, GetInstallStateContents(manifestsToUpdate)); + installer.SaveInstallStateManifestVersions(sdkFeatureBand, GetInstallStateContents(manifestsToUpdate)); } }, rollback: () => diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf index 9f8d6f8e2699..c3ed03c91b61 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf @@ -362,6 +362,11 @@ CESTA + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. Jsou k dispozici aktualizace úloh. Pokud chcete získat další informace, spusťte `dotnet workload list`. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf index 23d61efe36f7..c66390331854 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf @@ -362,6 +362,11 @@ PFAD + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. Es sind Workloadupdates verfügbar. Um weitere Informationen zu erhalten, führen Sie `dotnet workload list` aus. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf index 056fb8cbeeaf..d07cda3f718b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf @@ -362,6 +362,11 @@ RUTA DE ACCESO + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. Hay actualizaciones de carga de trabajo disponibles. Ejecute "dotnet workload list" para obtener más información. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf index 879b2659c9fd..51bcf45d03b5 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf @@ -362,6 +362,11 @@ PATH + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. Des mises à jour de la charge de travail sont disponibles. Exécutez `dotnet workload list` pour plus d’informations. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf index b7ba22c5001c..a4b0ff121dd0 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf @@ -362,6 +362,11 @@ PERCORSO + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. Sono disponibili aggiornamenti del carico di lavoro. Per altre informazioni, eseguire `dotnet workload list`. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf index ed50daa56103..f632b868bbda 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf @@ -362,6 +362,11 @@ パス + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. ワークロードの更新が利用可能です。詳細については、`dotnet workload list` を実行してください。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf index a46019514be2..48403e51a2e2 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf @@ -362,6 +362,11 @@ 경로 + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. 워크로드 업데이트를 사용할 수 있습니다. 자세한 내용을 보려면 `dotnet workload list`을 실행하세요. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf index 94697cd0040d..f6cf0ea9fb59 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf @@ -362,6 +362,11 @@ ŚCIEŻKA + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. Dostępne są aktualizacje obciążenia. Uruchom polecenie `dotnet workload list`, aby uzyskać więcej informacji. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf index a3f860528e7e..6872f27c9a8a 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf @@ -362,6 +362,11 @@ CAMINHO + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. As atualizações de carga de trabalho estão disponíveis. Execute `dotnet workload list` para obter mais informações. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf index bc3ec05f6d96..ae04b48008d0 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf @@ -362,6 +362,11 @@ PATH + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. Доступны обновления рабочей нагрузки. Для получения дополнительных сведений запустите `dotnet workload list`. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf index c2cd403c021b..3cb3f2740f3b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf @@ -362,6 +362,11 @@ YOL + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. İş yükü güncelleştirmeleri var. Daha fazla bilgi için `dotnet workload list` çalıştırın. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf index 58ce764a255c..6f2d6117431a 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -362,6 +362,11 @@ 路径 + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. 有可用的工作负载更新。有关详细信息,请运行 `dotnet workload list`。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf index d1e4bc9f6655..83bd85b45ab2 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -362,6 +362,11 @@ 路徑 + + Control whether future workload operations should use workload sets or loose manifests. + Control whether future workload operations should use workload sets or loose manifests. + + Workload updates are available. Run `dotnet workload list` for more information. 有可用的工作負載更新。如需詳細資訊,請執行 `dotnet workload list`。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx index 41d8c0db27ee..77709f82d798 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-workload/update/LocalizableStrings.resx @@ -138,6 +138,9 @@ Workload update failed: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Include workloads installed with earlier SDK versions in update. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index 17d98ea380de..80161f3491d9 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -19,6 +19,7 @@ internal class WorkloadUpdateCommand : InstallingWorkloadCommand private readonly bool _adManifestOnlyOption; private readonly bool _printRollbackDefinitionOnly; private readonly bool _fromPreviousSdk; + private readonly string _workloadSetMode; public WorkloadUpdateCommand( ParseResult parseResult, @@ -36,6 +37,7 @@ public WorkloadUpdateCommand( _fromPreviousSdk = parseResult.GetValue(WorkloadUpdateCommandParser.FromPreviousSdkOption); _adManifestOnlyOption = parseResult.GetValue(WorkloadUpdateCommandParser.AdManifestOnlyOption); _printRollbackDefinitionOnly = parseResult.GetValue(WorkloadUpdateCommandParser.PrintRollbackOption); + _workloadSetMode = parseResult.GetValue(InstallingWorkloadCommandParser.WorkloadSetMode); _workloadInstaller = _workloadInstallerFromConstructor ?? WorkloadInstallerFactory.GetWorkloadInstaller(Reporter, _sdkFeatureBand, _workloadResolver, Verbosity, _userProfileDir, VerifySignatures, PackageDownloader, @@ -80,6 +82,22 @@ public override int Execute() Reporter.WriteLine(workloadSet.ToJson()); Reporter.WriteLine("==workloadRollbackDefinitionJsonOutputEnd=="); } + else if (!string.IsNullOrWhiteSpace(_workloadSetMode)) + { + if (_workloadSetMode.Equals("workloadset", StringComparison.OrdinalIgnoreCase)) + { + _workloadInstaller.UpdateInstallMode(_sdkFeatureBand, true); + } + else if (_workloadSetMode.Equals("loosemanifest", StringComparison.OrdinalIgnoreCase) || + _workloadSetMode.Equals("auto", StringComparison.OrdinalIgnoreCase)) + { + _workloadInstaller.UpdateInstallMode(_sdkFeatureBand, false); + } + else + { + throw new GracefulException(string.Format(LocalizableStrings.WorkloadSetModeTakesWorkloadSetLooseManifestOrAuto, _workloadSetMode), isUserError: true); + } + } else { try @@ -158,11 +176,11 @@ private void UpdateWorkloadsWithInstallRecord( if (useRollback) { - _workloadInstaller.WriteInstallState(sdkFeatureBand, GetInstallStateContents(manifestsToUpdate)); + _workloadInstaller.SaveInstallStateManifestVersions(sdkFeatureBand, GetInstallStateContents(manifestsToUpdate)); } else { - _workloadInstaller.DeleteInstallState(sdkFeatureBand); + _workloadInstaller.RemoveManifestsFromInstallState(sdkFeatureBand); } }, rollback: () => diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommandParser.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommandParser.cs index 496c49697e59..fe068fc74b70 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommandParser.cs @@ -47,6 +47,7 @@ private static CliCommand ConstructCommand() command.Options.Add(CommonOptions.VerbosityOption); command.Options.Add(PrintRollbackOption); command.Options.Add(WorkloadInstallCommandParser.SkipSignCheckOption); + command.Options.Add(InstallingWorkloadCommandParser.WorkloadSetMode); command.SetAction((parseResult) => new WorkloadUpdateCommand(parseResult).Execute()); diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf index 11b89e60bc76..9549325a870b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf @@ -52,6 +52,11 @@ Nepovedlo se stáhnout balíčky aktualizace úlohy do mezipaměti: {0}. + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. Manifesty reklamy se úspěšně aktualizovaly. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf index d2a0c6c462bf..445327c132d1 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf @@ -52,6 +52,11 @@ Fehler beim Herunterladen von Paketen zur Workloadaktualisierung in den Cache: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. Werbemanifeste wurden erfolgreich aktualisiert. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf index 8662a5c2a22b..3fe74568083c 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf @@ -52,6 +52,11 @@ No se pudieron descargar los paquetes de actualización de la carga de trabajo en caché: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. Los manifiestos de publicidad se han actualizado correctamente. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf index b5a33d8a6244..617881842505 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf @@ -52,6 +52,11 @@ Échec du téléchargement des packages de mise à jour de charge de travail dans le cache : {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. Les manifestes de publicité ont été mis à jour. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf index 72fc4b08f96d..3e242f66ba13 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf @@ -52,6 +52,11 @@ Non è stato possibile scaricare i pacchetti di aggiornamento del carico di lavoro nella cache: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. I manifesti pubblicitari sono stati aggiornati. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf index 0fd3558e55b9..68ebf5f605de 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf @@ -52,6 +52,11 @@ ワークロード更新パッケージをキャッシュにダウンロードできませんでした: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. 広告マニフェストを正常に更新しました。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf index 5496e044b69e..fd89962eaeda 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf @@ -52,6 +52,11 @@ 캐시할 워크로드 업데이트 패키지를 다운로드하지 못했습니다. {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. 알림 매니페스트를 업데이트했습니다. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf index b1248dedd4f5..320a5f3a240d 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf @@ -52,6 +52,11 @@ Nie można pobrać pakietów aktualizacji pakietów roboczych do pamięci podręcznej: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. Pomyślnie zaktualizowano manifesty reklam. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf index 5b743a470c8e..25b91db94770 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf @@ -52,6 +52,11 @@ Falha ao baixar pacotes de atualização de carga de trabalho para o cache: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. Manifestos de anúncio atualizados com êxito. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf index 6049ae860032..2ff37fb49329 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf @@ -52,6 +52,11 @@ Не удалось скачать пакеты обновления рабочей нагрузки в кэш: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. Манифесты рекламы успешно обновлены. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf index fe08c6c5f1b8..c754adca5448 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf @@ -52,6 +52,11 @@ İş yükü güncelleştirme paketleri önbelleğe yüklenemedi: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. Reklam bildirimleri başarıyla güncelleştirildi. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf index 844cad9451c3..1ed9fad51e06 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -52,6 +52,11 @@ 未能将工作负载更新程序包下载到缓存: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. 成功更新广告清单。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf index cbde1607649d..802d8abf1c35 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -52,6 +52,11 @@ 無法將工作負載更新套件下載到快取: {0} + + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + + Successfully updated advertising manifests. 已成功更新廣告資訊清單。 diff --git a/src/Tests/dotnet-workload-install.Tests/GivenFileBasedWorkloadInstall.cs b/src/Tests/dotnet-workload-install.Tests/GivenFileBasedWorkloadInstall.cs index 3a98644e69ee..d352cf05da03 100644 --- a/src/Tests/dotnet-workload-install.Tests/GivenFileBasedWorkloadInstall.cs +++ b/src/Tests/dotnet-workload-install.Tests/GivenFileBasedWorkloadInstall.cs @@ -12,6 +12,7 @@ using Microsoft.Extensions.EnvironmentAbstractions; using System.Text.Json; using Microsoft.TemplateEngine.Edge.Constraints; +using Microsoft.DotNet.Workloads.Workload; namespace Microsoft.DotNet.Cli.Workload.Install.Tests { @@ -26,6 +27,42 @@ public GivenFileBasedWorkloadInstall(ITestOutputHelper log) : base(log) _manifestPath = Path.Combine(_testAssetsManager.GetAndValidateTestProjectDirectory("SampleManifest"), "Sample2.json"); } + [Fact] + public void InstallStateUpdatesWorkProperly() + { + (string dotnetRoot, FileBasedInstaller installer, _, _) = GetTestInstaller(); + var stringFeatureBand = "6.0.300"; // This is hard-coded in the test installer, so if that changes, update this, too. + var sdkFeatureBand = new SdkFeatureBand(stringFeatureBand); + var path = Path.Combine(dotnetRoot, "metadata", "workloads", stringFeatureBand, "InstallState", "default.json"); + + installer.UpdateInstallMode(sdkFeatureBand, true); + var installState = InstallStateContents.FromString(File.ReadAllText(path)); + installState.Manifests.Should().BeNull(); + installState.UseWorkloadSets.Should().BeTrue(); + + installer.SaveInstallStateManifestVersions(sdkFeatureBand, new Dictionary() + { + { "first", "second" }, + { "third", "fourth" }, + }); + + installState = InstallStateContents.FromString(File.ReadAllText(path)); + installState.Manifests.Count.Should().Be(2); + installState.Manifests["first"].Should().Be("second"); + installState.Manifests["third"].Should().Be("fourth"); + installState.UseWorkloadSets.Should().BeTrue(); + + installer.UpdateInstallMode(sdkFeatureBand, false); + installState = InstallStateContents.FromString(File.ReadAllText(path)); + installState.UseWorkloadSets.Should().BeFalse(); + installState.Manifests.Count.Should().Be(2); + + installer.RemoveManifestsFromInstallState(sdkFeatureBand); + installState = InstallStateContents.FromString(File.ReadAllText(path)); + installState.Manifests.Should().BeNull(); + installState.UseWorkloadSets.Should().BeFalse(); + } + [Fact] public void GivenManagedInstallItCanGetFeatureBandsWhenFilesArePresent() { diff --git a/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs b/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs index 5b8cff4f21e7..88a31ea8f414 100644 --- a/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs +++ b/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs @@ -7,6 +7,7 @@ using Microsoft.Extensions.EnvironmentAbstractions; using Microsoft.NET.Sdk.WorkloadManifestReader; using Microsoft.DotNet.ToolPackage; +using Microsoft.DotNet.Workloads.Workload; namespace Microsoft.DotNet.Cli.Workload.Install.Tests { @@ -55,6 +56,11 @@ IEnumerable GetPacksForWorkloads(IEnumerable workloadIds) } } + public void UpdateInstallMode(SdkFeatureBand sdkFeatureBand, bool newMode) + { + throw new NotImplementedException(); + } + public void InstallWorkloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, ITransactionContext transactionContext, DirectoryPath? offlineCache = null) { List packs = new List(); @@ -159,20 +165,24 @@ public void ReplaceWorkloadResolver(IWorkloadResolver workloadResolver) WorkloadResolver = workloadResolver; } - public void DeleteInstallState(SdkFeatureBand sdkFeatureBand) + public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand) { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json"); if (File.Exists(path)) { - File.Delete(path); + var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents(); + installStateContents.Manifests = null; + File.WriteAllText(path, installStateContents.ToString()); } } - public void WriteInstallState(SdkFeatureBand sdkFeatureBand, IEnumerable jsonLines) + public void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary manifestContents) { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json"); Directory.CreateDirectory(Path.GetDirectoryName(path)); - File.WriteAllLines(path, jsonLines); + var installStateContents = InstallStateContents.FromString(File.Exists(path) ? File.ReadAllText(path) : "{}"); + installStateContents.Manifests = manifestContents; + File.WriteAllText(path, installStateContents.ToString()); } } From e21e3cbbc8ba0130ce785c7c3288126086c94e8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 14:12:43 +0000 Subject: [PATCH 458/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.65 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.64 -> To Version 6.9.0-preview.1.65 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66e70f5d0e4d..d7a0f12d19e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index ca1665bb3100..dcea7c944e96 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.64 - 6.9.0-preview.1.64 + 6.9.0-preview.1.65 + 6.9.0-preview.1.65 6.0.0-rc.278 - 6.9.0-preview.1.64 - 6.9.0-preview.1.64 - 6.9.0-preview.1.64 - 6.9.0-preview.1.64 - 6.9.0-preview.1.64 - 6.9.0-preview.1.64 - 6.9.0-preview.1.64 - 6.9.0-preview.1.64 - 6.9.0-preview.1.64 + 6.9.0-preview.1.65 + 6.9.0-preview.1.65 + 6.9.0-preview.1.65 + 6.9.0-preview.1.65 + 6.9.0-preview.1.65 + 6.9.0-preview.1.65 + 6.9.0-preview.1.65 + 6.9.0-preview.1.65 + 6.9.0-preview.1.65 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 1debbd83809e529329c008123f1abd7af3ed2986 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 14:13:24 +0000 Subject: [PATCH 459/550] Update dependencies from https://github.com/dotnet/roslyn build 20231220.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23619.3 -> To Version 4.9.0-3.23620.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66e70f5d0e4d..6db0e04c816a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 0caa9d162683c44645ccc6e1645ce4a01acfd8dc + 67ef2fb7409e0ab54ac627d6ac525069172ed494 - + https://github.com/dotnet/roslyn - 0caa9d162683c44645ccc6e1645ce4a01acfd8dc + 67ef2fb7409e0ab54ac627d6ac525069172ed494 - + https://github.com/dotnet/roslyn - 0caa9d162683c44645ccc6e1645ce4a01acfd8dc + 67ef2fb7409e0ab54ac627d6ac525069172ed494 - + https://github.com/dotnet/roslyn - 0caa9d162683c44645ccc6e1645ce4a01acfd8dc + 67ef2fb7409e0ab54ac627d6ac525069172ed494 - + https://github.com/dotnet/roslyn - 0caa9d162683c44645ccc6e1645ce4a01acfd8dc + 67ef2fb7409e0ab54ac627d6ac525069172ed494 - + https://github.com/dotnet/roslyn - 0caa9d162683c44645ccc6e1645ce4a01acfd8dc + 67ef2fb7409e0ab54ac627d6ac525069172ed494 - + https://github.com/dotnet/roslyn - 0caa9d162683c44645ccc6e1645ce4a01acfd8dc + 67ef2fb7409e0ab54ac627d6ac525069172ed494 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ca1665bb3100..69c3da78fdd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23619.3 - 4.9.0-3.23619.3 - 4.9.0-3.23619.3 - 4.9.0-3.23619.3 - 4.9.0-3.23619.3 - 4.9.0-3.23619.3 - 4.9.0-3.23619.3 + 4.9.0-3.23620.1 + 4.9.0-3.23620.1 + 4.9.0-3.23620.1 + 4.9.0-3.23620.1 + 4.9.0-3.23620.1 + 4.9.0-3.23620.1 + 4.9.0-3.23620.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 8c4aa57bbc569ba611597ad019ce27373066e4fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 14:13:45 +0000 Subject: [PATCH 460/550] Update dependencies from https://github.com/microsoft/vstest build 20231219.1 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-preview-23614-02 -> To Version 17.9.0-release-23619-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66e70f5d0e4d..6b8b1a19e18c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client 2a234707a663f731e4de93cba4014ed1a8259def - + https://github.com/microsoft/vstest - 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 + f33b3e4ec550c48607057bf051574c048d3ef7b6 - + https://github.com/microsoft/vstest - 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 + f33b3e4ec550c48607057bf051574c048d3ef7b6 - + https://github.com/microsoft/vstest - 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 + f33b3e4ec550c48607057bf051574c048d3ef7b6 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ca1665bb3100..d4b4d6b328be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-preview-23614-02 - 17.9.0-preview-23614-02 - 17.9.0-preview-23614-02 + 17.9.0-release-23619-01 + 17.9.0-release-23619-01 + 17.9.0-release-23619-01 From c8fe82a3d6816be64329ce84bba65bc2a76aef15 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 14:14:04 +0000 Subject: [PATCH 461/550] Update dependencies from https://github.com/dotnet/razor build 20231220.4 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23619.1 -> To Version 7.0.0-preview.23620.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66e70f5d0e4d..b132feafb855 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - a54193ca64ed6972e7acf3b323921d15e1744299 + ef10c5b951bf5fd957278e05e1618d770667f62d - + https://github.com/dotnet/razor - a54193ca64ed6972e7acf3b323921d15e1744299 + ef10c5b951bf5fd957278e05e1618d770667f62d - + https://github.com/dotnet/razor - a54193ca64ed6972e7acf3b323921d15e1744299 + ef10c5b951bf5fd957278e05e1618d770667f62d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ca1665bb3100..c333efd42d53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23619.1 - 7.0.0-preview.23619.1 - 7.0.0-preview.23619.1 + 7.0.0-preview.23620.4 + 7.0.0-preview.23620.4 + 7.0.0-preview.23620.4 From 79f803797964e4e9d04707038d97ce497bb568d0 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Thu, 21 Dec 2023 11:25:44 -0800 Subject: [PATCH 462/550] Base version (#37625) The version of SaveInstallStateManifestVersions in src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs inadvertently just called itself with the same arguments, leading to a StackOverflowException every time it's called. This resolves that issue by making the base version public and just going straight to that. It also includes some cleanup for creating InstallStateContents. --- .../commands/dotnet-workload/install/FileBasedInstaller.cs | 4 ++-- .../commands/dotnet-workload/install/MsiInstallerBase.cs | 6 +++--- .../dotnet-workload/install/NetSdkMsiInstallerClient.cs | 6 ------ .../dotnet-workload/install/NetSdkMsiInstallerServer.cs | 2 +- .../dotnet-workload/update/WorkloadUpdateCommand.cs | 4 +--- .../MockPackWorkloadInstaller.cs | 2 +- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs index b84a75ebee82..08cd93199320 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs @@ -468,7 +468,7 @@ public void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dict { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetDir), "default.json"); Directory.CreateDirectory(Path.GetDirectoryName(path)); - var installStateContents = InstallStateContents.FromString(File.Exists(path) ? File.ReadAllText(path) : "{}"); + var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents(); installStateContents.Manifests = manifestContents; File.WriteAllText(path, installStateContents.ToString()); } @@ -477,7 +477,7 @@ public void UpdateInstallMode(SdkFeatureBand sdkFeatureBand, bool newMode) { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json"); Directory.CreateDirectory(Path.GetDirectoryName(path)); - var installStateContents = InstallStateContents.FromString(File.Exists(path) ? File.ReadAllText(path) : "{}"); + var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents(); installStateContents.UseWorkloadSets = newMode; File.WriteAllText(path, installStateContents.ToString()); } diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs index 653773b7c437..5cf0b2ab0eb5 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/MsiInstallerBase.cs @@ -534,7 +534,7 @@ protected void UpdateDependent(InstallRequestType requestType, string providerKe /// Deletes manifests from the install state file for the specified feature band. /// /// The feature band of the install state file. - protected void RemoveManifestsFromInstallStateFile(SdkFeatureBand sdkFeatureBand) + public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand) { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json"); @@ -567,7 +567,7 @@ protected void RemoveManifestsFromInstallStateFile(SdkFeatureBand sdkFeatureBand /// /// The path of the isntall state file to write. /// The contents of the JSON file, formatted as a single line. - protected void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary manifestContents) + public void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary manifestContents) { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, DotNetHome), "default.json"); Elevate(); @@ -577,7 +577,7 @@ protected void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, D // Create the parent folder for the state file and set up all required ACLs SecurityUtils.CreateSecureDirectory(Path.GetDirectoryName(path)); - var installStateContents = InstallStateContents.FromString(File.Exists(path) ? File.ReadAllText(path) : "{}"); + var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents(); installStateContents.Manifests = manifestContents; File.WriteAllText(path, installStateContents.ToString()); diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs index 8aa2d08fefc5..566beb0cedfc 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerClient.cs @@ -182,12 +182,6 @@ public void GarbageCollect(Func getResolverForWorkloa } } - public void RemoveManifestsFromInstallState(SdkFeatureBand sdkFeatureBand) => - RemoveManifestsFromInstallStateFile(sdkFeatureBand); - - public new void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dictionary manifestContents) => - SaveInstallStateManifestVersions(sdkFeatureBand, manifestContents); - /// /// Find all the dependents that look like they belong to SDKs. We only care /// about dependents that match the SDK host we're running under. For example, an x86 SDK should not be diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs index aa6fa43b8fec..c62dd4b36096 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/NetSdkMsiInstallerServer.cs @@ -99,7 +99,7 @@ public void Run() break; case InstallRequestType.RemoveManifestsFromInstallStateFile: - RemoveManifestsFromInstallStateFile(new SdkFeatureBand(request.SdkFeatureBand)); + RemoveManifestsFromInstallState(new SdkFeatureBand(request.SdkFeatureBand)); Dispatcher.ReplySuccess($"Deleted install state file for {request.SdkFeatureBand}."); break; diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs index 80161f3491d9..a14ad7e4d00b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/update/WorkloadUpdateCommand.cs @@ -161,11 +161,9 @@ private void UpdateWorkloadsWithInstallRecord( transaction.Run( action: context => { - bool rollback = !string.IsNullOrWhiteSpace(_fromRollbackDefinition); - foreach (var manifestUpdate in manifestsToUpdate) { - _workloadInstaller.InstallWorkloadManifest(manifestUpdate, context, offlineCache, rollback); + _workloadInstaller.InstallWorkloadManifest(manifestUpdate, context, offlineCache, useRollback); } _workloadResolver.RefreshWorkloadManifests(); diff --git a/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs b/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs index 88a31ea8f414..61d6dc6f24d8 100644 --- a/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs +++ b/src/Tests/dotnet-workload-install.Tests/MockPackWorkloadInstaller.cs @@ -180,7 +180,7 @@ public void SaveInstallStateManifestVersions(SdkFeatureBand sdkFeatureBand, Dict { string path = Path.Combine(WorkloadInstallType.GetInstallStateFolder(sdkFeatureBand, _dotnetDir), "default.json"); Directory.CreateDirectory(Path.GetDirectoryName(path)); - var installStateContents = InstallStateContents.FromString(File.Exists(path) ? File.ReadAllText(path) : "{}"); + var installStateContents = File.Exists(path) ? InstallStateContents.FromString(File.ReadAllText(path)) : new InstallStateContents(); installStateContents.Manifests = manifestContents; File.WriteAllText(path, installStateContents.ToString()); } From b203e80a4464c949e0e0fb1ea11ee80ba742b986 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 14:05:11 +0000 Subject: [PATCH 463/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.67 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.65 -> To Version 6.9.0-preview.1.67 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e109a7b962c4..2c20fb31e71d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 64a72d53ae44..0f64f3c494e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.65 - 6.9.0-preview.1.65 + 6.9.0-preview.1.67 + 6.9.0-preview.1.67 6.0.0-rc.278 - 6.9.0-preview.1.65 - 6.9.0-preview.1.65 - 6.9.0-preview.1.65 - 6.9.0-preview.1.65 - 6.9.0-preview.1.65 - 6.9.0-preview.1.65 - 6.9.0-preview.1.65 - 6.9.0-preview.1.65 - 6.9.0-preview.1.65 + 6.9.0-preview.1.67 + 6.9.0-preview.1.67 + 6.9.0-preview.1.67 + 6.9.0-preview.1.67 + 6.9.0-preview.1.67 + 6.9.0-preview.1.67 + 6.9.0-preview.1.67 + 6.9.0-preview.1.67 + 6.9.0-preview.1.67 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From dfe53a771dc1c3e09dc49e5f3071e84325db0fc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 14:06:13 +0000 Subject: [PATCH 464/550] Update dependencies from https://github.com/dotnet/roslyn build 20231221.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23620.1 -> To Version 4.9.0-3.23621.4 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e109a7b962c4..fbdd57d4df35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 67ef2fb7409e0ab54ac627d6ac525069172ed494 + 182e829faf57b84150a2b28036f20918f368fc9d - + https://github.com/dotnet/roslyn - 67ef2fb7409e0ab54ac627d6ac525069172ed494 + 182e829faf57b84150a2b28036f20918f368fc9d - + https://github.com/dotnet/roslyn - 67ef2fb7409e0ab54ac627d6ac525069172ed494 + 182e829faf57b84150a2b28036f20918f368fc9d - + https://github.com/dotnet/roslyn - 67ef2fb7409e0ab54ac627d6ac525069172ed494 + 182e829faf57b84150a2b28036f20918f368fc9d - + https://github.com/dotnet/roslyn - 67ef2fb7409e0ab54ac627d6ac525069172ed494 + 182e829faf57b84150a2b28036f20918f368fc9d - + https://github.com/dotnet/roslyn - 67ef2fb7409e0ab54ac627d6ac525069172ed494 + 182e829faf57b84150a2b28036f20918f368fc9d - + https://github.com/dotnet/roslyn - 67ef2fb7409e0ab54ac627d6ac525069172ed494 + 182e829faf57b84150a2b28036f20918f368fc9d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 64a72d53ae44..4a66b9d38828 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23620.1 - 4.9.0-3.23620.1 - 4.9.0-3.23620.1 - 4.9.0-3.23620.1 - 4.9.0-3.23620.1 - 4.9.0-3.23620.1 - 4.9.0-3.23620.1 + 4.9.0-3.23621.4 + 4.9.0-3.23621.4 + 4.9.0-3.23621.4 + 4.9.0-3.23621.4 + 4.9.0-3.23621.4 + 4.9.0-3.23621.4 + 4.9.0-3.23621.4 $(MicrosoftNetCompilersToolsetPackageVersion) From d7e8674dce48fae1c8ae7317babb63c4e315d8f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 14:06:33 +0000 Subject: [PATCH 465/550] Update dependencies from https://github.com/dotnet/razor build 20231221.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23620.4 -> To Version 7.0.0-preview.23621.6 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e109a7b962c4..c795f89b84f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - ef10c5b951bf5fd957278e05e1618d770667f62d + 8936658e03082f5530c0461467151072e8151c39 - + https://github.com/dotnet/razor - ef10c5b951bf5fd957278e05e1618d770667f62d + 8936658e03082f5530c0461467151072e8151c39 - + https://github.com/dotnet/razor - ef10c5b951bf5fd957278e05e1618d770667f62d + 8936658e03082f5530c0461467151072e8151c39 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 64a72d53ae44..4b471fff6ddf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23620.4 - 7.0.0-preview.23620.4 - 7.0.0-preview.23620.4 + 7.0.0-preview.23621.6 + 7.0.0-preview.23621.6 + 7.0.0-preview.23621.6 From ac05f61cd2c57bef1f1c854389bf438c5129dd7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Dec 2023 13:56:20 +0000 Subject: [PATCH 466/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.67 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.65 -> To Version 6.9.0-preview.1.67 From 27058fd7a057819c3e2ff4023fa2c65ce37d5045 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Dec 2023 13:57:29 +0000 Subject: [PATCH 467/550] Update dependencies from https://github.com/dotnet/roslyn build 20231221.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23620.1 -> To Version 4.9.0-3.23621.4 From 1efed43bba7111440a1b443287cffa795d3c9c58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Dec 2023 13:57:52 +0000 Subject: [PATCH 468/550] Update dependencies from https://github.com/dotnet/razor build 20231221.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23620.4 -> To Version 7.0.0-preview.23621.6 From 2bc393d2db9b95dd8405c7351e4d6bf925c4be7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Dec 2023 13:53:43 +0000 Subject: [PATCH 469/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.67 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.65 -> To Version 6.9.0-preview.1.67 From 71ded06e437687d60be4fbfb8825b6e900e2b5d0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Dec 2023 13:54:48 +0000 Subject: [PATCH 470/550] Update dependencies from https://github.com/dotnet/roslyn build 20231221.4 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23620.1 -> To Version 4.9.0-3.23621.4 From b6af428462ad1ad58312bf599369a714b0f43590 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Dec 2023 13:55:11 +0000 Subject: [PATCH 471/550] Update dependencies from https://github.com/dotnet/razor build 20231221.6 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23620.4 -> To Version 7.0.0-preview.23621.6 From 48783a6e953c9cdebf2eed220b4c408fe24c896a Mon Sep 17 00:00:00 2001 From: Lucas Trzesniewski Date: Tue, 26 Dec 2023 13:21:59 +0100 Subject: [PATCH 472/550] Handle HTTP 403 Forbidden status code --- .../Registry/DefaultBlobOperations.cs | 4 ++-- .../Registry/DefaultManifestOperations.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultBlobOperations.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultBlobOperations.cs index fd5898fedd59..d258ebfc0886 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultBlobOperations.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultBlobOperations.cs @@ -36,7 +36,7 @@ public async Task ExistsAsync(string repositoryName, string digest, Cancel { HttpStatusCode.OK => true, HttpStatusCode.NotFound => false, - HttpStatusCode.Unauthorized => throw new UnableToAccessRepositoryException(_registryName, repositoryName), + HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden => throw new UnableToAccessRepositoryException(_registryName, repositoryName), _ => await LogAndThrowContainerHttpException(response, cancellationToken).ConfigureAwait(false) }; } @@ -68,7 +68,7 @@ private async Task GetAsync(string repositoryName, string d return response.StatusCode switch { HttpStatusCode.OK => response, - HttpStatusCode.Unauthorized => throw new UnableToAccessRepositoryException(_registryName, repositoryName), + HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden => throw new UnableToAccessRepositoryException(_registryName, repositoryName), _ => await LogAndThrowContainerHttpException(response, cancellationToken).ConfigureAwait(false) }; } diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultManifestOperations.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultManifestOperations.cs index 55cf8bf93b6f..c34426d10af3 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultManifestOperations.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultManifestOperations.cs @@ -33,7 +33,7 @@ public async Task GetAsync(string repositoryName, string re { HttpStatusCode.OK => response, HttpStatusCode.NotFound => throw new RepositoryNotFoundException(_registryName, repositoryName, reference), - HttpStatusCode.Unauthorized => throw new UnableToAccessRepositoryException(_registryName, repositoryName), + HttpStatusCode.Unauthorized or HttpStatusCode.Forbidden => throw new UnableToAccessRepositoryException(_registryName, repositoryName), _ => await LogAndThrowContainerHttpException(response, cancellationToken).ConfigureAwait(false) }; } From 2e3c5c7e21f0ebf190a012f75b3315e7bbf1f518 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Dec 2023 13:50:38 +0000 Subject: [PATCH 473/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.69 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.67 -> To Version 6.9.0-preview.1.69 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4942812a2b78..218ab21aef52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index c51d457b294e..edcbcdc632c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.67 - 6.9.0-preview.1.67 + 6.9.0-preview.1.69 + 6.9.0-preview.1.69 6.0.0-rc.278 - 6.9.0-preview.1.67 - 6.9.0-preview.1.67 - 6.9.0-preview.1.67 - 6.9.0-preview.1.67 - 6.9.0-preview.1.67 - 6.9.0-preview.1.67 - 6.9.0-preview.1.67 - 6.9.0-preview.1.67 - 6.9.0-preview.1.67 + 6.9.0-preview.1.69 + 6.9.0-preview.1.69 + 6.9.0-preview.1.69 + 6.9.0-preview.1.69 + 6.9.0-preview.1.69 + 6.9.0-preview.1.69 + 6.9.0-preview.1.69 + 6.9.0-preview.1.69 + 6.9.0-preview.1.69 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 1624c263eb684675105845e96bca05b168d2c718 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Dec 2023 13:49:56 +0000 Subject: [PATCH 474/550] Update dependencies from https://github.com/dotnet/roslyn build 20231227.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23621.4 -> To Version 4.9.0-3.23627.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 218ab21aef52..841b172205ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 182e829faf57b84150a2b28036f20918f368fc9d + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 - + https://github.com/dotnet/roslyn - 182e829faf57b84150a2b28036f20918f368fc9d + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 - + https://github.com/dotnet/roslyn - 182e829faf57b84150a2b28036f20918f368fc9d + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 - + https://github.com/dotnet/roslyn - 182e829faf57b84150a2b28036f20918f368fc9d + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 - + https://github.com/dotnet/roslyn - 182e829faf57b84150a2b28036f20918f368fc9d + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 - + https://github.com/dotnet/roslyn - 182e829faf57b84150a2b28036f20918f368fc9d + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 - + https://github.com/dotnet/roslyn - 182e829faf57b84150a2b28036f20918f368fc9d + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index edcbcdc632c2..ae88ccf748a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23621.4 - 4.9.0-3.23621.4 - 4.9.0-3.23621.4 - 4.9.0-3.23621.4 - 4.9.0-3.23621.4 - 4.9.0-3.23621.4 - 4.9.0-3.23621.4 + 4.9.0-3.23627.3 + 4.9.0-3.23627.3 + 4.9.0-3.23627.3 + 4.9.0-3.23627.3 + 4.9.0-3.23627.3 + 4.9.0-3.23627.3 + 4.9.0-3.23627.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 9fb3a17e074bed2137addfdd64e9adbf4cc2cd25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Dec 2023 13:50:17 +0000 Subject: [PATCH 475/550] Update dependencies from https://github.com/microsoft/vstest build 20231227.1 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.9.0-release-23619-01 -> To Version 17.9.0-release-23627-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 218ab21aef52..c11f9db2bcdc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -179,18 +179,18 @@ https://github.com/nuget/nuget.client 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 - + https://github.com/microsoft/vstest - f33b3e4ec550c48607057bf051574c048d3ef7b6 + 053d7114a72aac12d1382ecc2a23b2dfdd5b084b - + https://github.com/microsoft/vstest - f33b3e4ec550c48607057bf051574c048d3ef7b6 + 053d7114a72aac12d1382ecc2a23b2dfdd5b084b - + https://github.com/microsoft/vstest - f33b3e4ec550c48607057bf051574c048d3ef7b6 + 053d7114a72aac12d1382ecc2a23b2dfdd5b084b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index edcbcdc632c2..0cf8f6889bab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,9 +83,9 @@ - 17.9.0-release-23619-01 - 17.9.0-release-23619-01 - 17.9.0-release-23619-01 + 17.9.0-release-23627-01 + 17.9.0-release-23627-01 + 17.9.0-release-23627-01 From 65deefc71bd7d0977062fffb782c5459b6b29e66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 28 Dec 2023 10:41:49 -0800 Subject: [PATCH 476/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#37678) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 218ab21aef52..98929f94afaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 8936658e03082f5530c0461467151072e8151c39 + cfc40c79345dcab3de63928212b6e5694697d74f - + https://github.com/dotnet/razor - 8936658e03082f5530c0461467151072e8151c39 + cfc40c79345dcab3de63928212b6e5694697d74f - + https://github.com/dotnet/razor - 8936658e03082f5530c0461467151072e8151c39 + cfc40c79345dcab3de63928212b6e5694697d74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index edcbcdc632c2..4ad3386717a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23621.6 - 7.0.0-preview.23621.6 - 7.0.0-preview.23621.6 + 7.0.0-preview.23627.2 + 7.0.0-preview.23627.2 + 7.0.0-preview.23627.2 From 2d2f01d25fd11ae228df60a00812631a6df47a2b Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 28 Dec 2023 19:50:01 +0100 Subject: [PATCH 477/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2342091 (#37654) --- .../dotnet-workload/install/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf index c66390331854..f412e4e21584 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + Hiermit wird gesteuert, ob zukünftige Workloadvorgänge Workloadsätze oder lose Manifeste verwenden sollen. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf index d07cda3f718b..661379832a29 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + Controle si las operaciones de carga de trabajo futuras deben usar conjuntos de cargas de trabajo o manifiestos flexibles. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf index f632b868bbda..93aa4172e61b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + 将来のワークロード操作でワークロード セットを使用するか、ルーズ マニフェストを使用するかを制御します。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf index 48403e51a2e2..dcfa49035630 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + 향후 워크로드 작업에서 워크로드 집합을 사용할지, 매니페스트를 완화할지를 제어합니다. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf index f6cf0ea9fb59..6325acdc4b93 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + Określ, czy przyszłe operacje związane z obciążeniami powinny wykorzystywać zestawy obciążeń, czy luźne manifesty. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf index 6872f27c9a8a..8c03cca867d1 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + Controle se as operações de carga de trabalho futuras devem usar conjuntos de carga de trabalho ou manifestos flexíveis. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf index 3cb3f2740f3b..3691d8eb871c 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + Gelecekteki iş yükü işlemlerinin iş yükü kümelerini mi yoksa gevşek bildirimleri mi kullanması gerektiğini kontrol edin. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf index 6f2d6117431a..60dce47d2925 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + 控制未来的工作负载操作应该使用工作负载集还是松散清单。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf index 83bd85b45ab2..4921d99e1aab 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + 控制未來的工作負載作業應該使用工作負載集合還是鬆散資訊清單。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf index 445327c132d1..7fe3755912f5 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Ungültiges Argument "{0}" zum Argument --mode für das Dotnet Workload-Update. Es werden nur die Modi "workloadset", "loosemanifest" und "auto" unterstützt. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf index 3fe74568083c..61eacfcb2be0 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Argumento "{0}" no válido para el argumento --mode para la actualización de la carga de trabajo de dotnet. Solo los modos admitidos son "workloadset", "loosemanifest" y "auto". diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf index 68ebf5f605de..a3555167d604 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + .NET ワークロード更新の --mode 引数に対する引数 "{0}" が無効です。サポートされているモードは、"workloadset"、"loosemanifest"、および "auto" のみです。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf index fd89962eaeda..1f9d499812c4 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + dotnet 워크로드 업데이트의 --mode 인수에 대한 "{0}" 인수가 잘못되었습니다. "workloadset", "loosemanifest", "auto" 모드만 지원됩니다. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf index 320a5f3a240d..222d233a4c10 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Nieprawidłowy argument „{0}” argumentu --mode dla aktualizacji obciążenia dotnet. Obsługiwane tryby to „workloadset”, „loosemanifest” i „auto”. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf index 25b91db94770..c5db7d56ba3e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Argumento "{0}" inválido para o argumento --mode para atualização de carga de trabalho dotnet. Os únicos modos com suporte são "workloadset", "loosemanifest" e "auto". diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf index c754adca5448..6c7f77da9566 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Dotnet iş yükü güncelleştirmesi için --mod bağımsız değişkeninde geçersiz "{0}" bağımsız değişkeni. Yalnızca "workloadset", "loosemanifest" ve "auto" modları desteklenir. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf index 1ed9fad51e06..3c981c1c23c4 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + dotnet 工作负载更新的 --mode 参数的参数“{0}”无效。仅支持“workloadset”、“loosemanifest”和“auto”模式。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf index 802d8abf1c35..20dab178f25e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + dotnet 工作負載更新的 --mode 引數之引數 "{0}" 無效。僅支援 "workloadset"、"loosemanifest" 和 "auto" 模式。 From fafee3964c2959e60fa5399fc2b26383f7be264b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 09:08:00 -0800 Subject: [PATCH 478/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#37691) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 361d7896c6dc..27d1e187fa4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - cfc40c79345dcab3de63928212b6e5694697d74f + 54c01127489f024c525984ed4cafacf2d9a152f7 - + https://github.com/dotnet/razor - cfc40c79345dcab3de63928212b6e5694697d74f + 54c01127489f024c525984ed4cafacf2d9a152f7 - + https://github.com/dotnet/razor - cfc40c79345dcab3de63928212b6e5694697d74f + 54c01127489f024c525984ed4cafacf2d9a152f7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d615943d85f3..80e4c36133ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23627.2 - 7.0.0-preview.23627.2 - 7.0.0-preview.23627.2 + 7.0.0-preview.23628.2 + 7.0.0-preview.23628.2 + 7.0.0-preview.23628.2 From 318b4f3296223f50ddd87452c57c60ddf654c69b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 09:08:17 -0800 Subject: [PATCH 479/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#37690) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27d1e187fa4a..6331e33ed182 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 + bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 - + https://github.com/dotnet/roslyn - 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 + bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 - + https://github.com/dotnet/roslyn - 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 + bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 - + https://github.com/dotnet/roslyn - 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 + bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 - + https://github.com/dotnet/roslyn - 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 + bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 - + https://github.com/dotnet/roslyn - 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 + bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 - + https://github.com/dotnet/roslyn - 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 + bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 80e4c36133ef..9bdf87d50c9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23627.3 - 4.9.0-3.23627.3 - 4.9.0-3.23627.3 - 4.9.0-3.23627.3 - 4.9.0-3.23627.3 - 4.9.0-3.23627.3 - 4.9.0-3.23627.3 + 4.9.0-3.23628.2 + 4.9.0-3.23628.2 + 4.9.0-3.23628.2 + 4.9.0-3.23628.2 + 4.9.0-3.23628.2 + 4.9.0-3.23628.2 + 4.9.0-3.23628.2 $(MicrosoftNetCompilersToolsetPackageVersion) From f77bea64a103af5f6a04456be4a593685f524956 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Dec 2023 13:57:22 +0000 Subject: [PATCH 480/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.70 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.69 -> To Version 6.9.0-preview.1.70 --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6331e33ed182..38b22095e201 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 9bdf87d50c9a..65d5273698ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.69 - 6.9.0-preview.1.69 + 6.9.0-preview.1.70 + 6.9.0-preview.1.70 6.0.0-rc.278 - 6.9.0-preview.1.69 - 6.9.0-preview.1.69 - 6.9.0-preview.1.69 - 6.9.0-preview.1.69 - 6.9.0-preview.1.69 - 6.9.0-preview.1.69 - 6.9.0-preview.1.69 - 6.9.0-preview.1.69 - 6.9.0-preview.1.69 + 6.9.0-preview.1.70 + 6.9.0-preview.1.70 + 6.9.0-preview.1.70 + 6.9.0-preview.1.70 + 6.9.0-preview.1.70 + 6.9.0-preview.1.70 + 6.9.0-preview.1.70 + 6.9.0-preview.1.70 + 6.9.0-preview.1.70 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From dc58bf091dc8f6c2901745bed315b46551cc667d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Dec 2023 13:58:23 +0000 Subject: [PATCH 481/550] Update dependencies from https://github.com/dotnet/roslyn build 20231229.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23628.2 -> To Version 4.9.0-3.23629.3 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6331e33ed182..2ac3d7fc7c0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 + ebb588725e707db23d8723b633258e7eb918277b - + https://github.com/dotnet/roslyn - bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 + ebb588725e707db23d8723b633258e7eb918277b - + https://github.com/dotnet/roslyn - bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 + ebb588725e707db23d8723b633258e7eb918277b - + https://github.com/dotnet/roslyn - bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 + ebb588725e707db23d8723b633258e7eb918277b - + https://github.com/dotnet/roslyn - bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 + ebb588725e707db23d8723b633258e7eb918277b - + https://github.com/dotnet/roslyn - bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 + ebb588725e707db23d8723b633258e7eb918277b - + https://github.com/dotnet/roslyn - bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 + ebb588725e707db23d8723b633258e7eb918277b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9bdf87d50c9a..386aa21db857 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.23628.2 - 4.9.0-3.23628.2 - 4.9.0-3.23628.2 - 4.9.0-3.23628.2 - 4.9.0-3.23628.2 - 4.9.0-3.23628.2 - 4.9.0-3.23628.2 + 4.9.0-3.23629.3 + 4.9.0-3.23629.3 + 4.9.0-3.23629.3 + 4.9.0-3.23629.3 + 4.9.0-3.23629.3 + 4.9.0-3.23629.3 + 4.9.0-3.23629.3 $(MicrosoftNetCompilersToolsetPackageVersion) From d2f475e9c5553cc041c271c593d822f00aafd90e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Dec 2023 13:58:42 +0000 Subject: [PATCH 482/550] Update dependencies from https://github.com/dotnet/razor build 20231229.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23628.2 -> To Version 7.0.0-preview.23629.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6331e33ed182..7d0c93d317c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 54c01127489f024c525984ed4cafacf2d9a152f7 + 82aa94010f3858b3b903483945a7c4e0ff0d599a - + https://github.com/dotnet/razor - 54c01127489f024c525984ed4cafacf2d9a152f7 + 82aa94010f3858b3b903483945a7c4e0ff0d599a - + https://github.com/dotnet/razor - 54c01127489f024c525984ed4cafacf2d9a152f7 + 82aa94010f3858b3b903483945a7c4e0ff0d599a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9bdf87d50c9a..f10befa240a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23628.2 - 7.0.0-preview.23628.2 - 7.0.0-preview.23628.2 + 7.0.0-preview.23629.1 + 7.0.0-preview.23629.1 + 7.0.0-preview.23629.1 From c4c7082f31e3f8224f6c7ceadbfe0ca755db81b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 31 Dec 2023 13:51:23 +0000 Subject: [PATCH 483/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.70 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.69 -> To Version 6.9.0-preview.1.70 From ce5be70b5bb03aba824e20acc0aa031c5ce0c2e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 31 Dec 2023 13:52:26 +0000 Subject: [PATCH 484/550] Update dependencies from https://github.com/dotnet/roslyn build 20231229.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23628.2 -> To Version 4.9.0-3.23629.3 From 521232d0c2118f6cc3e9da8f67e3d35863b741bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 31 Dec 2023 13:52:49 +0000 Subject: [PATCH 485/550] Update dependencies from https://github.com/dotnet/razor build 20231229.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23628.2 -> To Version 7.0.0-preview.23629.1 From 77d7c1ecdedb0681f2200d85421735f39ee8f0aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jan 2024 13:52:49 +0000 Subject: [PATCH 486/550] Update dependencies from https://github.com/nuget/nuget.client build 6.9.0.70 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.9.0-preview.1.69 -> To Version 6.9.0-preview.1.70 From 57a498314f110fb41e8efd506c7402502b51c95b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jan 2024 13:53:35 +0000 Subject: [PATCH 487/550] Update dependencies from https://github.com/dotnet/roslyn build 20231229.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23628.2 -> To Version 4.9.0-3.23629.3 From 3e8c47500cf4e2757ab5377d25012ed369523e9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Jan 2024 13:53:59 +0000 Subject: [PATCH 488/550] Update dependencies from https://github.com/dotnet/razor build 20231229.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23628.2 -> To Version 7.0.0-preview.23629.1 From e5873cc8538e079f5ac52f0998b4cb763a62ccf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 10:22:11 -0800 Subject: [PATCH 489/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#37709) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a806d9ad9778..36070d72553e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - 82aa94010f3858b3b903483945a7c4e0ff0d599a + fb16802214374c6e61c089d3be688d749a35a600 - + https://github.com/dotnet/razor - 82aa94010f3858b3b903483945a7c4e0ff0d599a + fb16802214374c6e61c089d3be688d749a35a600 - + https://github.com/dotnet/razor - 82aa94010f3858b3b903483945a7c4e0ff0d599a + fb16802214374c6e61c089d3be688d749a35a600 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8d06f02393b3..91d361af0c29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.23629.1 - 7.0.0-preview.23629.1 - 7.0.0-preview.23629.1 + 7.0.0-preview.24051.1 + 7.0.0-preview.24051.1 + 7.0.0-preview.24051.1 From 849642427ca48e346fcbfcbfc802211066c03303 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 2 Jan 2024 19:23:39 +0100 Subject: [PATCH 490/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2343499 (#37680) --- .../dotnet-workload/install/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-workload/install/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.ru.xlf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf index c3ed03c91b61..720a2aefe836 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + Určete, jestli by budoucí operace úloh měly používat sady úloh nebo volné manifesty. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf index 51bcf45d03b5..1462fa793077 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + Contrôlez si les futures opérations de charge de travail doivent utiliser des ensembles de charges de travail ou des manifestes lâches. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf index a4b0ff121dd0..2f9f807b9fa6 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + Controllare se le operazioni future del carico di lavoro devono usare set di carichi di lavoro o manifesti separati. diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf index ae04b48008d0..b4940992ccc1 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf @@ -364,7 +364,7 @@ Control whether future workload operations should use workload sets or loose manifests. - Control whether future workload operations should use workload sets or loose manifests. + Укажите, должны ли будущие операции рабочей нагрузки использовать наборы рабочей нагрузки или свободные манифесты. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf index 9549325a870b..0d57937d6b65 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Neplatný argument „{0}“ argumentu --mode pro aktualizaci úlohy dotnet. Jediné podporované režimy jsou workloadset, loosemanifest a auto. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf index 617881842505..ffa504cef235 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Argument «{0}» non valide à l’argument --mode pour la mise à jour de charge de travail dotnet. Seuls les modes pris en charge sont « workloadset », « loosemanifest » et « auto ». diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf index 3e242f66ba13..0d9403d54fe4 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Argomento non valido "{0}" per l'argomento --mode per l'aggiornamento del carico di lavoro dotnet. Le uniche modalità supportate sono "workloadset", "loosemanifest" e "auto". diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf index 2ff37fb49329..f65de634659b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf @@ -54,7 +54,7 @@ Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". - Invalid argument "{0}" to the --mode argument for dotnet workload update. Only supported modes are "workloadset", "loosemanifest", and "auto". + Недопустимый аргумент "{0}" для аргумента --mode для обновления рабочей нагрузки dotnet. Поддерживаются только режимы "workloadset", "loosemanifest" и "auto". From fb54c0577f9d587658608cfe0aac60ac5f3de191 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Jan 2024 10:28:25 -0800 Subject: [PATCH 491/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#37649) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jason Zhai --- NuGet.config | 1 + eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index bade25373cf4..195233ae6dbd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36070d72553e..11ce2a233c78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,18 +51,18 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - 82d381eb23290d50936683719bda333461af9528 - + e514b5973d09e1b8fe4e2cb154e4b680efc135ec - + https://github.com/dotnet/msbuild - 82d381eb23290d50936683719bda333461af9528 + e514b5973d09e1b8fe4e2cb154e4b680efc135ec - + https://github.com/dotnet/msbuild - 82d381eb23290d50936683719bda333461af9528 + e514b5973d09e1b8fe4e2cb154e4b680efc135ec + https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 91d361af0c29..4e5cc0848b7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0-preview-23618-08 + 17.9.0 $(MicrosoftBuildPackageVersion) - 4.9.0-3.23629.3 - 4.9.0-3.23629.3 - 4.9.0-3.23629.3 - 4.9.0-3.23629.3 - 4.9.0-3.23629.3 - 4.9.0-3.23629.3 - 4.9.0-3.23629.3 + 4.9.0-3.24052.3 + 4.9.0-3.24052.3 + 4.9.0-3.24052.3 + 4.9.0-3.24052.3 + 4.9.0-3.24052.3 + 4.9.0-3.24052.3 + 4.9.0-3.24052.3 $(MicrosoftNetCompilersToolsetPackageVersion) From ddbc1be77335f6dc4cf76bc597151eebe7f7c2b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 11:31:09 -0800 Subject: [PATCH 495/550] [release/8.0.2xx] Update dependencies from dotnet/razor (#37770) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 50f61d1211db..957637f23a72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -277,18 +277,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/razor - fb16802214374c6e61c089d3be688d749a35a600 + df383360c34ada8889fdf18dc36d245f2938db66 - + https://github.com/dotnet/razor - fb16802214374c6e61c089d3be688d749a35a600 + df383360c34ada8889fdf18dc36d245f2938db66 - + https://github.com/dotnet/razor - fb16802214374c6e61c089d3be688d749a35a600 + df383360c34ada8889fdf18dc36d245f2938db66 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e31401668328..5d09617b363d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -159,9 +159,9 @@ - 7.0.0-preview.24051.1 - 7.0.0-preview.24051.1 - 7.0.0-preview.24051.1 + 7.0.0-preview.24053.4 + 7.0.0-preview.24053.4 + 7.0.0-preview.24053.4 From 1edd268c8b77f8b8751a74006adbdfc0339ecad6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 11:31:48 -0800 Subject: [PATCH 496/550] [release/8.0.2xx] Update dependencies from nuget/nuget.client (#37767) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++++------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 957637f23a72..f3694de69606 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 5d09617b363d..2254e2720e05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -66,18 +66,18 @@ - 6.9.0-preview.1.70 - 6.9.0-preview.1.70 + 6.9.0-rc.74 + 6.9.0-rc.74 6.0.0-rc.278 - 6.9.0-preview.1.70 - 6.9.0-preview.1.70 - 6.9.0-preview.1.70 - 6.9.0-preview.1.70 - 6.9.0-preview.1.70 - 6.9.0-preview.1.70 - 6.9.0-preview.1.70 - 6.9.0-preview.1.70 - 6.9.0-preview.1.70 + 6.9.0-rc.74 + 6.9.0-rc.74 + 6.9.0-rc.74 + 6.9.0-rc.74 + 6.9.0-rc.74 + 6.9.0-rc.74 + 6.9.0-rc.74 + 6.9.0-rc.74 + 6.9.0-rc.74 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From 8cf291c5add437f1ac5c7d3a890b445b339f6412 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 12:10:03 -0800 Subject: [PATCH 497/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#37769) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3694de69606..b6be4e7dacdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 45421ad7dfcb8e1563e172eda81d9d892a0fe73c + 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/roslyn - 45421ad7dfcb8e1563e172eda81d9d892a0fe73c + 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/roslyn - 45421ad7dfcb8e1563e172eda81d9d892a0fe73c + 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/roslyn - 45421ad7dfcb8e1563e172eda81d9d892a0fe73c + 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/roslyn - 45421ad7dfcb8e1563e172eda81d9d892a0fe73c + 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/roslyn - 45421ad7dfcb8e1563e172eda81d9d892a0fe73c + 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/roslyn - 45421ad7dfcb8e1563e172eda81d9d892a0fe73c + 237fb52c683601ed639f1fdeaf38ceef0c768fbc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2254e2720e05..6858f42881f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,13 +138,13 @@ - 4.9.0-3.24052.3 - 4.9.0-3.24052.3 - 4.9.0-3.24052.3 - 4.9.0-3.24052.3 - 4.9.0-3.24052.3 - 4.9.0-3.24052.3 - 4.9.0-3.24052.3 + 4.9.0-3.24053.1 + 4.9.0-3.24053.1 + 4.9.0-3.24053.1 + 4.9.0-3.24053.1 + 4.9.0-3.24053.1 + 4.9.0-3.24053.1 + 4.9.0-3.24053.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 74b892ac17dfad6c02dbd30f7cfb194138fb0943 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 21:14:39 +0000 Subject: [PATCH 498/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#37768) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 195233ae6dbd..40509a4037af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6be4e7dacdf..8d85e675511f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,17 +51,17 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - e514b5973d09e1b8fe4e2cb154e4b680efc135ec + 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 - + https://github.com/dotnet/msbuild - e514b5973d09e1b8fe4e2cb154e4b680efc135ec + 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 - + https://github.com/dotnet/msbuild - e514b5973d09e1b8fe4e2cb154e4b680efc135ec + 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 diff --git a/eng/Versions.props b/eng/Versions.props index 6858f42881f5..26237a767809 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.0 + 17.9.1 $(MicrosoftBuildPackageVersion) - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c3cee457b56..a1871c4873e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,17 +51,17 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 + bb6fadf23225f5097f4e05ed507d93683a21ae56 - + https://github.com/dotnet/msbuild - 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 + bb6fadf23225f5097f4e05ed507d93683a21ae56 - + https://github.com/dotnet/msbuild - 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 + bb6fadf23225f5097f4e05ed507d93683a21ae56 diff --git a/eng/Versions.props b/eng/Versions.props index 36de806c1b14..f4c86c9e4e86 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -104,7 +104,7 @@ - 17.9.1 + 17.9.2 $(MicrosoftBuildPackageVersion) - 12.8.200-beta.23618.1 + 12.8.200-beta.24055.2 From d60568ca4ba861ea6b109e5957ea8e1cb21f84aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Jan 2024 13:44:58 +0000 Subject: [PATCH 509/550] Update dependencies from https://github.com/dotnet/source-build-externals build 20240104.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23570.1 -> To Version 8.0.0-alpha.1.24054.1 From 78d7f69f038dbe287ca5e9f39ad3d47df9e5fe59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Jan 2024 13:45:23 +0000 Subject: [PATCH 510/550] Update dependencies from https://github.com/dotnet/fsharp build 20240105.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.23618.1 -> To Version 8.0.200-beta.24055.2 From 7515cf0bdd30c64776723e658db78382fb6eb09b Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:13:38 -0800 Subject: [PATCH 511/550] resolve comments --- .../ToolInstallGlobalOrToolPathCommand.cs | 109 ++++++++---------- .../update/LocalizableStrings.resx | 2 +- .../update/xlf/LocalizableStrings.cs.xlf | 4 +- .../update/xlf/LocalizableStrings.de.xlf | 4 +- .../update/xlf/LocalizableStrings.es.xlf | 4 +- .../update/xlf/LocalizableStrings.fr.xlf | 4 +- .../update/xlf/LocalizableStrings.it.xlf | 4 +- .../update/xlf/LocalizableStrings.ja.xlf | 4 +- .../update/xlf/LocalizableStrings.ko.xlf | 4 +- .../update/xlf/LocalizableStrings.pl.xlf | 4 +- .../update/xlf/LocalizableStrings.pt-BR.xlf | 4 +- .../update/xlf/LocalizableStrings.ru.xlf | 4 +- .../update/xlf/LocalizableStrings.tr.xlf | 4 +- .../update/xlf/LocalizableStrings.zh-Hans.xlf | 4 +- .../update/xlf/LocalizableStrings.zh-Hant.xlf | 4 +- 15 files changed, 77 insertions(+), 86 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs index 1d4201542b56..e722b6af6c5e 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/install/ToolInstallGlobalOrToolPathCommand.cs @@ -115,75 +115,66 @@ public override int Execute() TransactionScopeOption.Required, TimeSpan.Zero)) { - try + if (oldPackageNullable != null) { - if (oldPackageNullable != null) + RunWithHandlingUninstallError(() => { - RunWithHandlingUninstallError(() => + foreach (RestoredCommand command in oldPackageNullable.Commands) { - foreach (RestoredCommand command in oldPackageNullable.Commands) - { - shellShimRepository.RemoveShim(command.Name); - } + shellShimRepository.RemoveShim(command.Name); + } - toolPackageUninstaller.Uninstall(oldPackageNullable.PackageDirectory); - }); - } + toolPackageUninstaller.Uninstall(oldPackageNullable.PackageDirectory); + }); + } - RunWithHandlingInstallError(() => + RunWithHandlingInstallError(() => + { + IToolPackage newInstalledPackage = toolPackageDownloader.InstallPackage( + new PackageLocation(nugetConfig: GetConfigFile(), additionalFeeds: _source), + packageId: _packageId, + versionRange: versionRange, + targetFramework: _framework, + verbosity: _verbosity, + isGlobalTool: true + ); + + EnsureVersionIsHigher(oldPackageNullable, newInstalledPackage, _allowPackageDowngrade); + + NuGetFramework framework; + if (string.IsNullOrEmpty(_framework) && newInstalledPackage.Frameworks.Count() > 0) { - IToolPackage newInstalledPackage = toolPackageDownloader.InstallPackage( - new PackageLocation(nugetConfig: GetConfigFile(), additionalFeeds: _source), - packageId: _packageId, - versionRange: versionRange, - targetFramework: _framework, - verbosity: _verbosity, - isGlobalTool: true - ); - - EnsureVersionIsHigher(oldPackageNullable, newInstalledPackage, _allowPackageDowngrade); - - NuGetFramework framework; - if (string.IsNullOrEmpty(_framework) && newInstalledPackage.Frameworks.Count() > 0) - { - framework = newInstalledPackage.Frameworks - .Where(f => f.Version < (new NuGetVersion(Product.Version)).Version) - .MaxBy(f => f.Version); - } - else - { - framework = string.IsNullOrEmpty(_framework) ? - null : - NuGetFramework.Parse(_framework); - } - string appHostSourceDirectory = _shellShimTemplateFinder.ResolveAppHostSourceDirectoryAsync(_architectureOption, framework, RuntimeInformation.ProcessArchitecture).Result; + framework = newInstalledPackage.Frameworks + .Where(f => f.Version < (new NuGetVersion(Product.Version)).Version) + .MaxBy(f => f.Version); + } + else + { + framework = string.IsNullOrEmpty(_framework) ? + null : + NuGetFramework.Parse(_framework); + } + string appHostSourceDirectory = _shellShimTemplateFinder.ResolveAppHostSourceDirectoryAsync(_architectureOption, framework, RuntimeInformation.ProcessArchitecture).Result; - foreach (RestoredCommand command in newInstalledPackage.Commands) - { - shellShimRepository.CreateShim(command.Executable, command.Name, newInstalledPackage.PackagedShims); - } + foreach (RestoredCommand command in newInstalledPackage.Commands) + { + shellShimRepository.CreateShim(command.Executable, command.Name, newInstalledPackage.PackagedShims); + } - foreach (string w in newInstalledPackage.Warnings) - { - _reporter.WriteLine(w.Yellow()); - } - if (_global) - { - _environmentPathInstruction.PrintAddPathInstructionIfPathDoesNotExist(); - } + foreach (string w in newInstalledPackage.Warnings) + { + _reporter.WriteLine(w.Yellow()); + } + if (_global) + { + _environmentPathInstruction.PrintAddPathInstructionIfPathDoesNotExist(); + } - PrintSuccessMessage(oldPackageNullable, newInstalledPackage); - }); + PrintSuccessMessage(oldPackageNullable, newInstalledPackage); + }); - scope.Complete(); - } - catch (Exception) - { - // Log the exception or perform other error handling if needed. - // Rollback the transaction to ensure consistency. - scope.Dispose(); - throw; - } + scope.Complete(); + } return 0; } diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx index 2c54fc8ece1e..52cbe1ac3ad2 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx +++ b/src/Cli/dotnet/commands/dotnet-tool/update/LocalizableStrings.resx @@ -219,7 +219,7 @@ and the corresponding package Ids for installed tools using the command Tool '{0}' was successfully updated from version '{1}' to version '{2}' (manifest file {3}). - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. Tool '{0}' is up to date (version '{1}' manifest file {2}) . diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf index 27f8eca981cc..407c7b564d55 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf index 85619b7c495a..aee059e0337c 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf index 15797eb1f356..40f3cee936b5 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf index 87cddd096f06..ed0e8f760ade 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf index 094c7fbfabea..31721eb6bf67 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf index 110960d8e8f8..3c5ab1f8d850 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf index ef7312f654d9..f1fe6c1cd6d5 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf index 82f889d5ee6d..93f32ddd7043 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf index d336f1c48f23..0abada07aaf9 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf index d60b074285cf..138d622d3bf6 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf index c6234f91da02..e26ce64cf4bd 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf index f3d3da3d3b6d..71b905a2d90b 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf index 2f58cb1c2ae1..4f263a3a7545 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -48,8 +48,8 @@ - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this updated. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. From 5b36b028f5aa106e9e393e2eb908017cbac17191 Mon Sep 17 00:00:00 2001 From: annie <59816815+JL03-Yue@users.noreply.github.com> Date: Mon, 8 Jan 2024 16:24:13 -0800 Subject: [PATCH 512/550] update tests --- .../dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs index 8ae1a73c85c4..d6742c26f443 100644 --- a/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/ToolUpdateLocalCommandTests.cs @@ -318,7 +318,7 @@ public void GivenFeedVersionIsLowerWithDowngradeFlagRunPackageIdItShouldSucceeds ParseResult parseResult = Parser.Instance.Parse( - $"dotnet tool update {_packageIdA.ToString()} --allow-downgrade"); + $"dotnet tool update {_packageIdA.ToString()} --version 0.9.0 --allow-downgrade"); _toolRestoreCommand.Execute(); _mockFeed.Packages.Single().Version = "0.9.0"; From e37d4c9cb49668615a8920ec17083321615bef17 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 8 Jan 2024 22:55:34 -0800 Subject: [PATCH 513/550] Update the framework for It_publishes_with_or_without_apphost test --- ...venThatWeWantToPublishAFrameworkDependentApp.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs index ff31fa3e626b..7020fc30aac8 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs @@ -15,12 +15,12 @@ public GivenThatWeWantToPublishAFrameworkDependentApp(ITestOutputHelper log) : b } [Theory] - [InlineData(null, "netcoreapp2.1")] - [InlineData("true", "netcoreapp2.1")] - [InlineData("false", "netcoreapp2.1")] - [InlineData(null, "netcoreapp2.2")] - [InlineData("true", "netcoreapp2.2")] - [InlineData("false", "netcoreapp2.2")] + [InlineData(null, "net6.0")] + [InlineData("true", "net6.0")] + [InlineData("false", "net6.0")] + [InlineData(null, "net7.0")] + [InlineData("true", "net7.0")] + [InlineData("false", "net7.0")] [InlineData(null, ToolsetInfo.CurrentTargetFramework)] [InlineData("true", ToolsetInfo.CurrentTargetFramework)] [InlineData("false", ToolsetInfo.CurrentTargetFramework)] @@ -112,7 +112,7 @@ public void It_errors_when_using_app_host_with_older_target_framework() .Should() .Fail() .And - .HaveStdOutContaining(Strings.FrameworkDependentAppHostRequiresVersion21.Replace("", "\"").Replace("", "\"")); + .HaveStdOutContaining(Strings.FrameworkDependentAppHostRequiresVersion21.Replace("�", "\"").Replace("�", "\"")); } } } From 9e445f9dd7e071f8c978f0539a792501ea18d550 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 8 Jan 2024 23:01:57 -0800 Subject: [PATCH 514/550] Remove useless code --- .../GivenThatWeWantToPublishAFrameworkDependentApp.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs index 7020fc30aac8..c85eef8641f2 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAFrameworkDependentApp.cs @@ -46,14 +46,6 @@ public void It_publishes_with_or_without_apphost(string useAppHost, string targe msbuildArgs.Add($"/p:UseAppHost={useAppHost}"); } - if (System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(System.Runtime.InteropServices.OSPlatform.OSX) && - targetFramework == "netcoreapp2.1") - { - // .NET Core 2.1.0 packages don't support latest versions of OS X, so roll forward to the - // latest patch which does - msbuildArgs.Add("/p:TargetLatestRuntimePatch=true"); - } - var publishCommand = new PublishCommand(testAsset); publishCommand .Execute(msbuildArgs.ToArray()) From 6367ed89eb074f666ac99b6d1340d52f2ac75730 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 9 Jan 2024 21:06:44 +0100 Subject: [PATCH 515/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2348785 --- .../commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf | 4 ++-- .../commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf | 4 ++-- .../commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf | 4 ++-- .../commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf | 4 ++-- .../commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf | 4 ++-- .../commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf | 4 ++-- .../commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf | 4 ++-- .../commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf | 4 ++-- .../commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf | 4 ++-- .../commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf | 4 ++-- .../dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf | 4 ++-- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf index 407c7b564d55..62eec3070d4c 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Nástroj{0}byl znovu nainstalován s nejnovější předběžnou verzí (verze{1}). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Nástroj {0} byl přeinstalován nejnovější stabilní verzí (verze {1}). + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf index aee059e0337c..b5ad26889ea3 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Das Tool „{0}“ wurde in der neuesten Vorabversion neu installiert (Version „{1}“). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Das Tool "{0}" wurde in der neuesten stabilen Version neu installiert (Version {1}). + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf index 40f3cee936b5..3e89686429e3 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - La herramienta "{0}" se ha reinstalado con la versión preliminar más reciente (versión "{1}"). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - La herramienta "{0}" se reinstaló con la versión estable más reciente (versión "{1}"). + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf index ed0e8f760ade..af315123267e 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - L'outil '{0}' a été réinstallé avec la dernière version préliminaire (version '{1}'). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - L'outil '{0}' a été réinstallé avec la dernière version stable (version '{1}'). + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf index 31721eb6bf67..650025a24b44 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Lo strumento '{0}' è stato reinstallato con l'ultima versione preliminare (versione '{1}'). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Lo strumento '{0}' è stato reinstallato con l'ultima versione stabile (versione '{1}'). + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf index 3c5ab1f8d850..eb6d9b2054b7 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - ツール '{0}' は、最新のプレリリース バージョン (バージョン '{1}') で再インストールされました。 + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - ツール '{0}' が安定した最新バージョン (バージョン '{1}') で再インストールされました。 + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf index f1fe6c1cd6d5..ffc8e977787b 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - 도구 '{0}'이(가) 최신 시험판 버전(버전 '{1}')으로 다시 설치되었습니다. + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - '{0}' 도구가 안정적인 최신 버전('{1}' 버전)으로 다시 설치되었습니다. + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf index 93f32ddd7043..0fb1581b477a 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Narzędzie „{0}” zostało ponownie zainstalowane przy użyciu najnowszej stabilnej wersji (wersja „{1}”). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Narzędzie „{0}” zostało ponownie zainstalowane przy użyciu najnowszej stabilnej wersji (wersja „{1}”). + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf index 0abada07aaf9..f0f32e1f5a0a 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - A ferramenta '{0}' foi reinstalada com a versão de pré-lançamento mais recente (versão '{1}'). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - A ferramenta '{0}' foi reinstalada com a versão estável mais recente (versão '{1}'). + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf index 138d622d3bf6..4bc4c939eb6c 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Инструмент "{0}" был переустановлен с последней предварительной версией (версией "{1}"). + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Инструмент "{0}" был переустановлен с последней стабильной версией (версией "{1}"). + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf index e26ce64cf4bd..2af93f504e3b 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - '{0}' aracı, en yeni ön sürüm (sürüm '{1}') ile yeniden yüklendi. + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - '{0}' aracı, en son kararlı sürüm (sürüm '{1}') ile yeniden yüklendi. + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf index 71b905a2d90b..8325b2703492 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - 工具“{0}”已重新安装最新预发行版本(版本“{1}”)。 + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - 工具“{0}”已重新安装最新稳定版本(版本“{1}”)。 + Tool '{0}' was reinstalled with the stable version (version '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf index 4f263a3a7545..7518993b6404 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -54,12 +54,12 @@ Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - 已使用最新搶鮮版 ('{0}' 版) 來重新安裝工具 '{1}'。 + Tool '{0}' was reinstalled with the prerelease version (version '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - 已使用最新穩定版本 ('{1}' 版) 來重新安裝工具 '{0}'。 + Tool '{0}' was reinstalled with the stable version (version '{1}'). From c818578f66ae3ba3c5aa50381d6f5b8e94cf51e2 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 9 Jan 2024 23:42:19 -0800 Subject: [PATCH 516/550] Update missing changes --- eng/Versions.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index b56cc7c18541..bde0b68bda09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,6 +46,7 @@ 2.0.0-beta4.23307.1 2.0.0-preview.1.23463.1 3.2.2146 + 0.3.49-beta @@ -196,7 +197,7 @@ 8.0.0-beta.23564.4 4.18.4 1.3.2 - 6.0.0-beta.22262.1 + 8.0.0-beta.23607.1 .exe From 0ac6759640128b10c74b5dfa01426e37e2d6ce4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:42:15 -0800 Subject: [PATCH 517/550] [release/8.0.2xx] Update dependencies from dotnet/fsharp (#37894) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f149b0126754..09372e88b2fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ bb6fadf23225f5097f4e05ed507d93683a21ae56 - + https://github.com/dotnet/fsharp - cc741852156e5f048e4e046061fa36477f8b92fb + 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 - + https://github.com/dotnet/fsharp - cc741852156e5f048e4e046061fa36477f8b92fb + 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 diff --git a/eng/Versions.props b/eng/Versions.props index b56cc7c18541..9d8056cb231c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,7 +134,7 @@ - 12.8.200-beta.24055.2 + 12.8.200-beta.24059.2 From 4b48aa54acdfd51bdaca21b1c7426844783c6569 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:42:32 -0800 Subject: [PATCH 518/550] [release/8.0.2xx] Update dependencies from dotnet/source-build-externals (#37893) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09372e88b2fa..4b39020516f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -333,9 +333,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 6c9557fbf18398d6f226bfd16ce3876f1fe2e940 + 7134e53b6b1210a1ce8838b12b8f6071e0a3433b From 5b9ec74d6241c3bc261fb0c82788f4c2a59313c0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 11:45:24 -0800 Subject: [PATCH 519/550] [release/8.0.2xx] Update dependencies from dotnet/arcade (#37902) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates/job/job.yml | 2 +- .../templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- eng/common/tools.ps1 | 10 +++++++++- eng/common/tools.sh | 7 ++++++- global.json | 6 +++--- 8 files changed, 32 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b39020516f2..a1d2efbee1c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -411,22 +411,22 @@ - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d7d4e5bb1a40..8ab3a50c5d65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.23564.4 + 8.0.0-beta.24059.4 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -194,7 +194,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.23564.4 + 8.0.0-beta.24059.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e20ee3a983cb..e24ca2f46f98 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -136,7 +136,7 @@ jobs: 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 + - task: NuGetAuthenticate@1 - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index bb0d9f8b0f12..fa5446c093dd 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Build Assets diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ef720f9d7819..3f74abf7ce0f 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' # Signing validation will optionally work with the buildmanifest file which is downloaded from @@ -266,7 +266,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91f85..eb188cfda415 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -601,7 +601,15 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' } + + # Use override if it exists - commonly set by source-build + if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { + $initializeBuildToolFramework="net8.0" + } else { + $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework + } + + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943341..3392e3a99921 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -341,7 +341,12 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net8.0" + # use override if it exists - commonly set by source-build + if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then + _InitializeBuildToolFramework="net8.0" + else + _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" + fi } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index de02323e748e..4450e03ee33d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100", + "dotnet": "8.0.101", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23564.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24059.4" } } From ac27e3c4c01f3192a65dc768d452b633cb461558 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 10 Jan 2024 21:05:04 +0100 Subject: [PATCH 520/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2350310 --- .../Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf index 7c393562ad06..c4a282ffbb99 100644 --- a/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf @@ -39,7 +39,7 @@ Use 'dotnet --help' to see available commands or visit: https://aka.ms/dotnet-cl Escribir su primera aplicación: https://aka.ms/dotnet-hello-world Descubra las novedades: https://aka.ms/dotnet-whats-new Explore la documentación: https://aka.ms/dotnet-docs -Notificar problemas y encontrar el origen en GitHub: https://github.com/dotnet/core +Notificar problemas y encontrar el código fuente en GitHub: https://github.com/dotnet/core Use "dotnet --help" para ver los comandos disponibles o visite: https://aka.ms/dotnet-cli -------------------------------------------------------------------------------------- From 22ed65d85a77799a369105e6c432a44b417cf7a6 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 10 Jan 2024 22:18:12 +0100 Subject: [PATCH 521/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2350475 --- .../dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf | 6 +++--- .../dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf | 6 +++--- .../dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf | 6 +++--- .../dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf | 6 +++--- .../dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf | 6 +++--- .../dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf | 6 +++--- .../dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf | 6 +++--- .../dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf | 6 +++--- .../Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf | 6 +++--- .../dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf | 6 +++--- .../dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf | 6 +++--- .../Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf | 6 +++--- .../Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf | 6 +++--- 13 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf index 100b70e341ea..c00aae5e30af 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - Podpis AuthentiCode pro {0} nepatří důvěryhodné organizaci. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf index a358d63a5369..108efca9275b 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - Die AuthentiCode-Signatur für {0} gehört nicht zu einer vertrauenswürdigen Organisation. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf index 49c6a6af789f..196614f4c45f 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - La firma AuthentiCode para {0} no pertenece a una organización de confianza. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf index 52c9042f7e63..d9453fce2c36 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - La signature AuthentiCode pour {0} n’appartient pas à une organisation approuvée. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf index 6caedf570426..5cdcdd9e9707 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - La firma AuthentiCode per {0} non appartiene a un'organizzazione attendibile. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf index 3d2140ab9b43..29bca91ae045 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - {0} の AuthentiCode 署名は、信頼されている組織に属していません。 + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf index 5504670c80dc..eff70df8d5b1 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - {0}에 대한 AuthentiCode 서명이 신뢰할 수 있는 조직에 속해 있지 않습니다. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf index a89b7b61b7f9..d47b4882d5bb 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - Podpis AuthentiCode dla {0} nie należy do zaufanej organizacji. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf index b9c9f365b741..457c0255912b 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - A assinatura AuthentiCode para {0} não pertence a uma organização confiável. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf index 4e7c7f1c3591..d952a0d46d26 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - Подпись AuthentiCode для {0} не принадлежит доверенной организации. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf index e61cd713ac68..341d602fc487 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - {0} için AuthentiCode imzası güvenilir bir kuruluşa ait değil. + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf index ba5dcba91dd5..3323173002c8 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - {0} 的 AuthentiCode 签名不属于受信任的组织。 + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf index e5793719fa5d..28ffbf5688f0 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf @@ -2,9 +2,9 @@ - - AuthentiCode signature for {0} does not belong to a trusted organization. - {0} 的 AuthentiCode 簽章不屬於信任的組織。 + + The requested certificate chain policy could not be checked: {0} + The requested certificate chain policy could not be checked: {0} From ce690a5a13a3412259e6b14b97ad96c24e84f942 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 10 Jan 2024 23:09:33 -0800 Subject: [PATCH 522/550] Update the more test frameworks --- .../GivenThatWeWantToBuildANetCoreApp.cs | 27 +++++++------------ 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs index 551f60fe656e..2701aa314dd1 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs @@ -254,8 +254,8 @@ public void It_restores_only_ridless_tfm() } [Theory] - [InlineData("netcoreapp2.0")] - [InlineData("netcoreapp2.1")] + [InlineData("net6.0")] + [InlineData("net7.0")] [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_runs_the_app_from_the_output_folder(string targetFramework) { @@ -263,41 +263,34 @@ public void It_runs_the_app_from_the_output_folder(string targetFramework) } [Theory] - [InlineData("netcoreapp2.1")] + [InlineData("net6.0")] + [InlineData("net7.0")] [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_runs_a_rid_specific_app_from_the_output_folder(string targetFramework) - { + { RunAppFromOutputFolder("RunFromOutputFolderWithRID_" + targetFramework, true, false, targetFramework); } [Theory] - [InlineData("netcoreapp2.0")] + [InlineData("net6.0")] + [InlineData("net7.0")] [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_runs_the_app_with_conflicts_from_the_output_folder(string targetFramework) { - if (!EnvironmentInfo.SupportsTargetFramework(targetFramework)) - { - return; - } - RunAppFromOutputFolder("RunFromOutputFolderConflicts_" + targetFramework, false, true, targetFramework); } [Theory] - [InlineData("netcoreapp2.0")] + [InlineData("net6.0")] + [InlineData("net7.0")] [InlineData(ToolsetInfo.CurrentTargetFramework)] public void It_runs_a_rid_specific_app_with_conflicts_from_the_output_folder(string targetFramework) { - if (!EnvironmentInfo.SupportsTargetFramework(targetFramework)) - { - return; - } - RunAppFromOutputFolder("RunFromOutputFolderWithRIDConflicts_" + targetFramework, true, true, targetFramework); } private void RunAppFromOutputFolder(string testName, bool useRid, bool includeConflicts, - string targetFramework = "netcoreapp2.0") + string targetFramework = ToolsetInfo.CurrentTargetFramework) { var runtimeIdentifier = useRid ? EnvironmentInfo.GetCompatibleRid(targetFramework) : null; From 6a1e435c69e70710d37f6ccb8bc29fd27f8d86c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Jan 2024 13:58:06 +0000 Subject: [PATCH 523/550] Update dependencies from https://github.com/dotnet/fsharp build 20240110.4 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.24059.2 -> To Version 8.0.200-beta.24060.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1d2efbee1c8..157f7f6d63ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ bb6fadf23225f5097f4e05ed507d93683a21ae56 - + https://github.com/dotnet/fsharp - 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 + 2e4dde8f8fd64aad0026cd03060698c30bf30a8d - + https://github.com/dotnet/fsharp - 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 + 2e4dde8f8fd64aad0026cd03060698c30bf30a8d diff --git a/eng/Versions.props b/eng/Versions.props index 8ab3a50c5d65..065060aacea6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ - 12.8.200-beta.24059.2 + 12.8.200-beta.24060.4 From c36194b2b406e055611adfb1347de1a01e212e22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 22:25:11 +0000 Subject: [PATCH 524/550] [release/8.0.2xx] Update dependencies from dotnet/roslyn (#37801) [release/8.0.2xx] Update dependencies from dotnet/roslyn - Hide refs to CodeAnalysis.CSharp from SDK Tasks Avoid a package downgrade warning on SCI and SRM from src\Tasks\Microsoft.NET.Build.Tasks\Microsoft.NET.Build.Tasks.csproj that was happening because the ApiCompat stuff referenced CA.C# and a 4.9 Roslyn update pushes the SCI/SRM references of that to 8.0.0. --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 14 +++++----- .../Microsoft.DotNet.ApiCompat.Task.csproj | 1 + .../Microsoft.DotNet.ApiCompatibility.csproj | 2 ++ ...icrosoft.DotNet.ApiSymbolExtensions.csproj | 2 +- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1d2efbee1c8..4de40346835e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -78,34 +78,34 @@ 2651752953c0d41c8c7b8d661cf2237151af33d0 - + https://github.com/dotnet/roslyn - 237fb52c683601ed639f1fdeaf38ceef0c768fbc + 28e49407a6e4744819bd471707259b99964e441c - + https://github.com/dotnet/roslyn - 237fb52c683601ed639f1fdeaf38ceef0c768fbc + 28e49407a6e4744819bd471707259b99964e441c - + https://github.com/dotnet/roslyn - 237fb52c683601ed639f1fdeaf38ceef0c768fbc + 28e49407a6e4744819bd471707259b99964e441c - + https://github.com/dotnet/roslyn - 237fb52c683601ed639f1fdeaf38ceef0c768fbc + 28e49407a6e4744819bd471707259b99964e441c - + https://github.com/dotnet/roslyn - 237fb52c683601ed639f1fdeaf38ceef0c768fbc + 28e49407a6e4744819bd471707259b99964e441c - + https://github.com/dotnet/roslyn - 237fb52c683601ed639f1fdeaf38ceef0c768fbc + 28e49407a6e4744819bd471707259b99964e441c - + https://github.com/dotnet/roslyn - 237fb52c683601ed639f1fdeaf38ceef0c768fbc + 28e49407a6e4744819bd471707259b99964e441c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8ab3a50c5d65..8c2c56989f6e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -139,13 +139,13 @@ - 4.9.0-3.24053.1 - 4.9.0-3.24053.1 - 4.9.0-3.24053.1 - 4.9.0-3.24053.1 - 4.9.0-3.24053.1 - 4.9.0-3.24053.1 - 4.9.0-3.24053.1 + 4.9.0-3.24054.13 + 4.9.0-3.24054.13 + 4.9.0-3.24054.13 + 4.9.0-3.24054.13 + 4.9.0-3.24054.13 + 4.9.0-3.24054.13 + 4.9.0-3.24054.13 $(MicrosoftNetCompilersToolsetPackageVersion) diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj index a7a964dbc99f..6e6311533f68 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj @@ -43,6 +43,7 @@ + diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj index 60dfe5a399f3..6f12ef4f6bd7 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj @@ -15,6 +15,8 @@ + + diff --git a/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj b/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj index a014b2499ad7..3f1c9f3ddfb8 100644 --- a/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj +++ b/src/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj @@ -14,7 +14,7 @@ - + From ad895052e9bfa2ef756ae3e4c1089f4c59c9789a Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 11 Jan 2024 23:53:34 +0100 Subject: [PATCH 525/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2351828 --- .../commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf index f9b349905330..43ef15efbca5 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + Při instalaci balíčku nástroje .NET povolte downgrade balíčku. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf index 16870572afa8..e3ca99a38cec 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + Paketdowngrade beim Installieren eines .NET-Toolpakets zulassen. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf index 2d3ceb437a0d..86a9057d5377 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + Permitir la degradación del paquete al instalar un paquete de herramientas de .NET. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf index e81725a330f8..b5a1cef3c5bf 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + Zezwalaj na obniżanie wersji pakietu podczas instalowania pakietu narzędzi .NET. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf index befd846b3d95..740148454acd 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + 安装 .NET 工具包时允许包降级。 From 7d1f1034a303de833486bee32fcc10a6a57009a3 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 11 Jan 2024 23:55:47 +0100 Subject: [PATCH 526/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2351828 --- .../dotnet-tool/update/xlf/LocalizableStrings.cs.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.de.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.es.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.pl.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf index 62eec3070d4c..60cc43f41a94 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.cs.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + Požadovaná verze {0} je nižší než stávající verze {1} (soubor manifestu {2}). Pokud chcete povolit tuto aktualizaci, použijte možnost --allow-downgrade. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Nástroj {0} se přeinstaloval na předběžnou verzi (verze {1}). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + Nástroj {0} se přeinstaloval na stabilní verzi (verze {1}). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf index b5ad26889ea3..b93c1827fbb7 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.de.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + Die angeforderte Version {0} ist niedriger als die vorhandene Version {1} (Manifestdatei {2}). Verwenden Sie die Option --Downgrade zulassen, um dieses Update zuzulassen. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Das Tool "{0}" wurde mit der Vorabversion (Version "{1}" ) neu installiert. Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + Das Tool "{0}" wurde mit der stabilen Version (Version "{1}" ) neu installiert. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf index 3e89686429e3..f8fe5b7b2cfb 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.es.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + La versión solicitada {0} es anterior a la versión existente {1} (archivo de manifiesto {2}). Use la opción --allow-downgrade para permitir esta actualización. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + La herramienta "{0}" se ha reinstalado con la versión preliminar más reciente (versión "{1}"). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + La herramienta "{0}" se reinstaló con la versión estable más reciente (versión "{1}"). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf index 0fb1581b477a..78b6bfddfbcb 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pl.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + Żądana wersja {0} jest niższa niż obecna wersja {1} (plik manifestu {2}). Użyj opcji --allow-downgrade (zezwól na zmianę na starszą lub mniej zaawansowaną wersję), aby zezwolić na tę aktualizację. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Narzędzie „{0}” zostało ponownie zainstalowane z wersją wstępną (wersja „{1}”). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + Narzędzie „{0}” zostało ponownie zainstalowane przy użyciu najnowszej stabilnej wersji (wersja „{1}”). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf index 8325b2703492..0580fb08f0b6 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + 请求的版本 {0} 低于现有版本 {1} (清单文件 {2})。使用 --allow-downgrade 选项允许此更新。 Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + 工具“{0}”已重新安装预发行版本(版本“{1}”)。 Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + 工具“{0}”已重新安装稳定版本(版本“{1}”)。 From 9614445cd20031368f890be63c34a1b9de23f2d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:07:37 -0800 Subject: [PATCH 527/550] [release/8.0.2xx] Update dependencies from dotnet/templating (#37936) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4de40346835e..6cd343d7e820 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,14 +1,14 @@ - + https://github.com/dotnet/templating - cb7b1558321784e4f2d9ca815836e7dc1b4c240c + 563930b1d9ad60c8d7dbd1975390f5870601defa - + https://github.com/dotnet/templating - cb7b1558321784e4f2d9ca815836e7dc1b4c240c + 563930b1d9ad60c8d7dbd1975390f5870601defa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8c2c56989f6e..ce890ac73033 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -122,13 +122,13 @@ - 8.0.200-preview.23565.3 + 8.0.200-preview.24060.12 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.200-preview.23565.3 + 8.0.200-preview.24060.12 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 6b8f2d4681f662b0a027acb87c581b2efa62a313 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 13:57:27 +0000 Subject: [PATCH 528/550] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23565.1 -> To Version 8.0.0-alpha.1.24061.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7eece21de24f..d61266f45ed9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -338,9 +338,9 @@ 7134e53b6b1210a1ce8838b12b8f6071e0a3433b - + https://github.com/dotnet/source-build-reference-packages - 95f83e27806330fec09edd96e06bba3acabe3f35 + 453a37ef7ae6c335cd49b3b9ab7713c87faeb265 From 04c2093596a419d81a7b5eeee705a8c0494aa0ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 13:57:48 +0000 Subject: [PATCH 529/550] Update dependencies from https://github.com/dotnet/fsharp build 20240111.1 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.24060.4 -> To Version 8.0.200-beta.24061.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7eece21de24f..4ef4d1e7c598 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ bb6fadf23225f5097f4e05ed507d93683a21ae56 - + https://github.com/dotnet/fsharp - 2e4dde8f8fd64aad0026cd03060698c30bf30a8d + 4db7b212f6ea3f43f77e698556c3ab554ed8ddd2 - + https://github.com/dotnet/fsharp - 2e4dde8f8fd64aad0026cd03060698c30bf30a8d + 4db7b212f6ea3f43f77e698556c3ab554ed8ddd2 diff --git a/eng/Versions.props b/eng/Versions.props index 591201baef45..0bf09f85e818 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ - 12.8.200-beta.24060.4 + 12.8.200-beta.24061.1 From 814ebe8c18fd97ca40fe857cb5221c55bda11bd2 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Fri, 12 Jan 2024 19:13:18 +0100 Subject: [PATCH 530/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2352531 --- .../commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf | 2 +- .../commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf index f0b26485df8b..cfdf3f4a5cfa 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + Autoriser le passage à une version antérieure du package lors de l’installation d’un package d’outils .NET. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf index 18a37a323a37..c5b0b0a52ee4 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + Consente il downgrade del pacchetto durante l'installazione di un pacchetto di strumenti .NET. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf index e4fb5d830160..f398d692956f 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + .NET ツール パッケージのインストール時にパッケージのダウングレードを許可します。 diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf index 312a81ff45ac..91df7322d886 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + .NET 도구 패키지를 설치할 때 패키지 다운그레이드를 허용합니다. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf index 231fd74d2cbb..21d7783b11d8 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + Permitir downgrade de pacote ao instalar um pacote de ferramentas do .NET. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf index 9e06971364c8..ad8741fc30a3 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + Разрешить переход на использование более ранней версии пакета при установке пакета инструментов .NET. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf index de68df203c29..233a159082b4 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + Bir .NET araç paketini yüklerken paketi eski sürüme düşürmeye izin verin. diff --git a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf index 3c5ad6c15e28..06cbc589d936 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -4,7 +4,7 @@ Allow package downgrade when installing a .NET tool package. - Allow package downgrade when installing a .NET tool package. + 安裝 .NET 工具套件時允許套件降級。 From 915527df796e33436f29a7898713dec0eca18c55 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Fri, 12 Jan 2024 19:15:38 +0100 Subject: [PATCH 531/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2352531 --- .../dotnet-tool/update/xlf/LocalizableStrings.fr.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.it.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.ja.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.ko.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.ru.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.tr.xlf | 6 +++--- .../dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf | 6 +++--- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf index af315123267e..9b4433a9f6fb 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.fr.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + La version demandée {0} est inférieure à la version existante{1} (fichier manifeste {2}). Utilisez l’option --allow-downgrade pour autoriser cette mise à jour. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + L'outil « {0} » a été réinstallé avec la version préliminaire (version « {1} »). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + L'outil « {0} » a été réinstallé avec la version stable (version « {1} »). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf index 650025a24b44..8f657409de82 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.it.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + La versione richiesta {0} è inferiore a quella esistente {1} (file manifesto {2}). Usare l'opzione --allow-downgrade per consentire questo aggiornamento. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Lo strumento '{0}' è stato reinstallato con la versione preliminare (versione '{1}'). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + Lo strumento '{0}' è stato reinstallato con la versione stabile (versione '{1}'). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf index eb6d9b2054b7..97851054ddaa 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ja.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + 要求されたバージョン {0} は、既存のバージョン {1} (マニフェスト ファイル {2}) よりも低くなっています。この更新を許可するには、--allow-downgrade オプションを使用します。 Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + ツール '{0}' がプレリリース バージョン (バージョン '{1}') で再インストールされました。 Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + ツール '{0}' が安定したバージョン (バージョン '{1}') で再インストールされました。 diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf index ffc8e977787b..54b7678313fd 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ko.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + 요청된 {0} 버전이 기존 {1} 버전(매니페스트 파일 {2})보다 낮습니다. --allow-downgrade 옵션을 사용하여 이 업데이트를 허용하세요. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + '{0}' 도구가 시험판 버전('{1}' 버전)으로 다시 설치되었습니다. Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + '{0}' 도구가 안정화 버전('{1}' 버전)으로 다시 설치되었습니다. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf index f0f32e1f5a0a..adc7d93e0036 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.pt-BR.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + A versão {0} solicitada é inferior à versão {1} existente (arquivo de manifesto {2}). Use a opção --allow-downgrade para permitir essa atualização. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + A ferramenta "{0}" foi reinstalada com a versão de pré-lançamento mais recente (versão "{1}"). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + A ferramenta "{0}" foi reinstalada com a versão estável mais recente (versão "{1}"). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf index 4bc4c939eb6c..3360bfae0ad8 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.ru.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + Запрошенная версия {0} ниже существующей версии {1} (файл манифеста {2}). Чтобы разрешить это обновление, используйте параметр --allow-downgrade. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + Инструмент "{0}" был переустановлен. Установлена предварительная версия (версия "{1}"). Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + Инструмент "{0}" был переустановлен. Установлена стабильная версия (версия "{1}"). diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf index 2af93f504e3b..75e7380a661b 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.tr.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + İstenen {0} sürümü mevcut {1} sürümünden ({2}bildirim dosyası) düşük. Bu güncelleştirmeye izin vermek için --allow-downgrade seçeneğini kullanın. Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + '{0}' aracı, ön sürüm (sürüm '{1}') ile yeniden yüklendi. Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + '{0}' aracı, kararlı sürüm (sürüm '{1}') ile yeniden yüklendi. diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf index 7518993b6404..8deb59eb6be0 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-tool/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -49,17 +49,17 @@ The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. - The requested version {0} is lower than existing version {1} (manifest file {2}). Use the --allow-downgrade option to allow this update. + 要求的版本 {0} 低於現有版本 {1} (資訊清單檔 {2})。使用 --allow-downgrade 選項以允許此更新。 Tool '{0}' was reinstalled with the prerelease version (version '{1}'). - Tool '{0}' was reinstalled with the prerelease version (version '{1}'). + 已使用搶鮮版本 (版本 '{1}') 來重新安裝工具 '{0}'。 Tool '{0}' was reinstalled with the stable version (version '{1}'). - Tool '{0}' was reinstalled with the stable version (version '{1}'). + 已使用穩定版本 (版本 '{1}') 來重新安裝工具 '{0}'。 From d1ced32ad0920e478dce4ed8456bd9223b5d7554 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Fri, 12 Jan 2024 19:19:09 +0100 Subject: [PATCH 532/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2352531 --- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf | 2 +- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf | 2 +- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf | 2 +- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf | 2 +- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf index 108efca9275b..c618130cbb2a 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.de.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + Die angeforderte Zertifikatkettenrichtlinie konnte nicht überprüft werden: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf index 5cdcdd9e9707..24789b558ec4 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.it.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + Non è stato possibile controllare il criterio della catena di certificati richiesto: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf index d47b4882d5bb..5db4a271b19c 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pl.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + Nie można sprawdzić żądanych zasad łańcucha certyfikatów: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf index d952a0d46d26..8f58abf58003 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ru.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + Не удалось проверить запрошенную политику цепочки сертификатов {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf index 341d602fc487..a22be57d131d 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.tr.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + İstenen sertifika zinciri ilkesi denetlenemedi: {0} From 7536eb257a70d6517bebc97042c79ce4a7d5b0e1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 12 Jan 2024 11:47:43 -0800 Subject: [PATCH 533/550] Stabilize Branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0bf09f85e818..4f29f9d6430f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,7 +14,7 @@ 8.0.200 8.0.200 - false + true release preview From ab5e36d76ec0fb0f44b45a029e2627b6f9a539c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 14:00:57 +0000 Subject: [PATCH 534/550] Update dependencies from https://github.com/dotnet/fsharp build 20240112.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.24061.1 -> To Version 8.0.200-beta.24062.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9afa9eaed9e..a1078c6bb71c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,13 +64,13 @@ bb6fadf23225f5097f4e05ed507d93683a21ae56 - + https://github.com/dotnet/fsharp - 4db7b212f6ea3f43f77e698556c3ab554ed8ddd2 + a7979111f86ab7332897ea617635bf3435c39bc3 - + https://github.com/dotnet/fsharp - 4db7b212f6ea3f43f77e698556c3ab554ed8ddd2 + a7979111f86ab7332897ea617635bf3435c39bc3 diff --git a/eng/Versions.props b/eng/Versions.props index 4f29f9d6430f..0c6ccc141ac4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -135,7 +135,7 @@ - 12.8.200-beta.24061.1 + 12.8.200-beta.24062.3 From 8ff6289f2bc503cbbf0c606020d47ac929581f23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 13:52:50 +0000 Subject: [PATCH 535/550] Update dependencies from https://github.com/dotnet/fsharp build 20240112.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.200-beta.24061.1 -> To Version 8.0.200-beta.24062.3 From 2d220293fc120d8c2bfb228f6c7ee2ee50c65171 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Mon, 15 Jan 2024 03:45:52 +0100 Subject: [PATCH 536/550] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2353448 --- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf | 2 +- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf | 2 +- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf | 2 +- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf | 2 +- src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf index c00aae5e30af..a99263b23eec 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.cs.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + Požadované zásady řetězu certifikátů nebylo možné zkontrolovat: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf index 196614f4c45f..71298e7b2d27 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.es.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + No se pudo comprobar la directiva de cadena de certificados solicitada: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf index d9453fce2c36..cd58f475fcde 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.fr.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + Impossible de vérifier la stratégie de chaîne de certificats demandée : {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf index 29bca91ae045..b8da6643583e 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ja.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + 要求された証明書チェーン ポリシーを確認できませんでした: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf index eff70df8d5b1..c5dcfc917c3d 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.ko.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + 요청한 인증서 체인 정책을 확인할 수 없습니다: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf index 457c0255912b..2f5e0a444dd3 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.pt-BR.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + Não foi possível verificar a política de cadeia de certificados solicitada: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf index 3323173002c8..0ad42e9a1659 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hans.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + 无法检查请求的证书链策略: {0} diff --git a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf index 28ffbf5688f0..314465d1da63 100644 --- a/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Installer/Windows/xlf/LocalizableStrings.zh-Hant.xlf @@ -4,7 +4,7 @@ The requested certificate chain policy could not be checked: {0} - The requested certificate chain policy could not be checked: {0} + 無法檢查要求的憑證鏈結原則: {0} From 323e11c46a041ef0d1a96613d90d0439f46dbaca Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Tue, 16 Jan 2024 09:20:58 -0600 Subject: [PATCH 537/550] Fix the parsing of ContainerImageTags to report invalid tags instead of silently swallowing them. (#37832) --- .../Tasks/ParseContainerProperties.cs | 14 ++-- .../ParseContainerPropertiesTests.cs | 69 ++++++++++++------- 2 files changed, 52 insertions(+), 31 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ParseContainerProperties.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ParseContainerProperties.cs index f7bc4c755ceb..91486be048f7 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ParseContainerProperties.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ParseContainerProperties.cs @@ -100,12 +100,12 @@ public override bool Execute() Log.LogErrorWithCodeFromResources(nameof(Strings.InvalidTag), nameof(ContainerImageTag), ContainerImageTag); } } - else if (ContainerImageTags.Length != 0 && TryValidateTags(ContainerImageTags, out var valids, out var invalids)) + else if (ContainerImageTags.Length != 0) { - validTags = valids; - if (invalids.Any()) + (validTags, var invalidTags) = TryValidateTags(ContainerImageTags); + if (invalidTags.Any()) { - Log.LogErrorWithCodeFromResources(nameof(Strings.InvalidTags), nameof(ContainerImageTags), String.Join(",", invalids)); + Log.LogErrorWithCodeFromResources(nameof(Strings.InvalidTags), nameof(ContainerImageTags), String.Join(",", invalidTags)); return !Log.HasLoggedErrors; } } @@ -200,7 +200,7 @@ private void ValidateEnvironmentVariables() } } - private static bool TryValidateTags(string[] inputTags, out string[] validTags, out string[] invalidTags) + private static (string[] validTags, string[] invalidTags) TryValidateTags(string[] inputTags) { var v = new List(); var i = new List(); @@ -215,8 +215,6 @@ private static bool TryValidateTags(string[] inputTags, out string[] validTags, i.Add(tag); } } - validTags = v.ToArray(); - invalidTags = i.ToArray(); - return invalidTags.Length == 0; + return (v.ToArray(), i.ToArray()); } } diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ParseContainerPropertiesTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ParseContainerPropertiesTests.cs index 0a3dbb179aa3..2259ba90ca14 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ParseContainerPropertiesTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ParseContainerPropertiesTests.cs @@ -8,13 +8,13 @@ namespace Microsoft.NET.Build.Containers.Tasks.IntegrationTests; -[Collection("Docker tests")] public class ParseContainerPropertiesTests { - [DockerAvailableFact] + [Fact] public void Baseline() { - var (project, logs, d) = ProjectInitializer.InitProject(new () { + var (project, logs, d) = ProjectInitializer.InitProject(new() + { [ContainerBaseImage] = "mcr.microsoft.com/dotnet/runtime:7.0", [ContainerRegistry] = "localhost:5010", [ContainerRepository] = "dotnet/testimage", @@ -22,7 +22,7 @@ public void Baseline() }); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - Assert.True(instance.Build(new[]{ComputeContainerConfig}, new [] { logs }, null, out var outputs)); + Assert.True(instance.Build(new[] { ComputeContainerConfig }, new[] { logs }, null, out var outputs)); Assert.Equal("mcr.microsoft.com", instance.GetPropertyValue(ContainerBaseRegistry)); Assert.Equal("dotnet/runtime", instance.GetPropertyValue(ContainerBaseName)); @@ -33,26 +33,28 @@ public void Baseline() instance.GetItems("ProjectCapability").Select(i => i.EvaluatedInclude).ToArray().Should().BeEquivalentTo(new[] { "NetSdkOCIImageBuild" }); } - [DockerAvailableFact] + [Fact] public void SpacesGetReplacedWithDashes() { - var (project, logs, d) = ProjectInitializer.InitProject(new () { + var (project, logs, d) = ProjectInitializer.InitProject(new() + { [ContainerBaseImage] = "mcr.microsoft.com/dotnet runtime:7.0", [ContainerRegistry] = "localhost:5010" }); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - Assert.True(instance.Build(new[]{ComputeContainerConfig}, new [] { logs }, null, out var outputs)); + Assert.True(instance.Build(new[] { ComputeContainerConfig }, new[] { logs }, null, out var outputs)); - Assert.Equal("mcr.microsoft.com",instance.GetPropertyValue(ContainerBaseRegistry)); + Assert.Equal("mcr.microsoft.com", instance.GetPropertyValue(ContainerBaseRegistry)); Assert.Equal("dotnet-runtime", instance.GetPropertyValue(ContainerBaseName)); Assert.Equal("7.0", instance.GetPropertyValue(ContainerBaseTag)); } - [DockerAvailableFact] + [Fact] public void RegexCatchesInvalidContainerNames() { - var (project, logs, d) = ProjectInitializer.InitProject(new () { + var (project, logs, d) = ProjectInitializer.InitProject(new() + { [ContainerBaseImage] = "mcr.microsoft.com/dotnet/runtime:7.0", [ContainerRegistry] = "localhost:5010", [ContainerRepository] = "dotnet testimage", @@ -60,14 +62,15 @@ public void RegexCatchesInvalidContainerNames() }); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - Assert.True(instance.Build(new[]{ComputeContainerConfig}, new [] { logs }, null, out var outputs)); + Assert.True(instance.Build(new[] { ComputeContainerConfig }, new[] { logs }, null, out var outputs)); Assert.Contains(logs.Messages, m => m.Message?.Contains("'dotnet testimage' was not a valid container image name, it was normalized to 'dotnet-testimage'") == true); } - [DockerAvailableFact] + [Fact] public void RegexCatchesInvalidContainerTags() { - var (project, logs, d) = ProjectInitializer.InitProject(new () { + var (project, logs, d) = ProjectInitializer.InitProject(new() + { [ContainerBaseImage] = "mcr.microsoft.com/dotnet/runtime:7.0", [ContainerRegistry] = "localhost:5010", [ContainerRepository] = "dotnet/testimage", @@ -75,16 +78,17 @@ public void RegexCatchesInvalidContainerTags() }); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - Assert.False(instance.Build(new[]{ComputeContainerConfig}, new [] { logs }, null, out var outputs)); + Assert.False(instance.Build(new[] { ComputeContainerConfig }, new[] { logs }, null, out var outputs)); Assert.True(logs.Errors.Count > 0); Assert.Equal(logs.Errors[0].Code, ErrorCodes.CONTAINER2007); } - [DockerAvailableFact] + [Fact] public void CanOnlySupplyOneOfTagAndTags() { - var (project, logs, d) = ProjectInitializer.InitProject(new () { + var (project, logs, d) = ProjectInitializer.InitProject(new() + { [ContainerBaseImage] = "mcr.microsoft.com/dotnet/runtime:7.0", [ContainerRegistry] = "localhost:5010", [ContainerRepository] = "dotnet/testimage", @@ -93,16 +97,34 @@ public void CanOnlySupplyOneOfTagAndTags() }); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - Assert.False(instance.Build(new[]{ComputeContainerConfig}, new [] { logs }, null, out var outputs)); + Assert.False(instance.Build(new[] { ComputeContainerConfig }, new[] { logs }, null, out var outputs)); Assert.True(logs.Errors.Count > 0); Assert.Equal(logs.Errors[0].Code, ErrorCodes.CONTAINER2008); } - [DockerAvailableFact] + [Fact] + public void InvalidTagsThrowError() + { + var (project, logs, d) = ProjectInitializer.InitProject(new() + { + [ContainerBaseImage] = "mcr.microsoft.com/dotnet/aspnet:8.0", + [ContainerRepository] = "dotnet/testimage", + [ContainerImageTags] = "'latest;oldest'" + }); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + Assert.False(instance.Build(new[] { ComputeContainerConfig }, new[] { logs }, null, out var outputs)); + + Assert.True(logs.Errors.Count > 0); + Assert.Equal(logs.Errors[0].Code, ErrorCodes.CONTAINER2010); + } + + [Fact] public void FailsOnCompletelyInvalidRepositoryNames() { - var (project, logs, d) = ProjectInitializer.InitProject(new () { + var (project, logs, d) = ProjectInitializer.InitProject(new() + { [ContainerBaseImage] = "mcr.microsoft.com/dotnet/runtime:7.0", [ContainerRegistry] = "localhost:5010", [ContainerImageName] = "㓳㓴㓵㓶㓷㓹㓺㓻", @@ -110,16 +132,17 @@ public void FailsOnCompletelyInvalidRepositoryNames() }); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - Assert.False(instance.Build(new[]{ComputeContainerConfig}, new [] { logs }, null, out var outputs)); + Assert.False(instance.Build(new[] { ComputeContainerConfig }, new[] { logs }, null, out var outputs)); Assert.True(logs.Errors.Count > 0); Assert.Equal(logs.Errors[0].Code, ErrorCodes.CONTAINER2005); } - [DockerAvailableFact] + [Fact] public void FailsWhenFirstCharIsAUnicodeLetterButNonLatin() { - var (project, logs, d) = ProjectInitializer.InitProject(new () { + var (project, logs, d) = ProjectInitializer.InitProject(new() + { [ContainerBaseImage] = "mcr.microsoft.com/dotnet/runtime:7.0", [ContainerRegistry] = "localhost:5010", [ContainerImageName] = "㓳but-otherwise-valid", @@ -127,7 +150,7 @@ public void FailsWhenFirstCharIsAUnicodeLetterButNonLatin() }); using var _ = d; var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); - Assert.False(instance.Build(new[]{ComputeContainerConfig}, new [] { logs }, null, out var outputs)); + Assert.False(instance.Build(new[] { ComputeContainerConfig }, new[] { logs }, null, out var outputs)); Assert.True(logs.Errors.Count > 0); Assert.Equal(logs.Errors[0].Code, ErrorCodes.CONTAINER2005); From b2e9b1fada8b96d1ee86984b609e6cd14183e7bc Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Tue, 16 Jan 2024 09:21:43 -0600 Subject: [PATCH 538/550] Ensure dotnet/aspnet base image can be inferred for ASP.Net applications (#37996) --- .../KnownStrings.cs | 5 ++++ .../Tasks/ComputeDotnetBaseImageAndTag.cs | 5 +++- .../ProjectInitializer.cs | 20 ++++++++------ .../TargetsTests.cs | 26 +++++++++++++++++++ 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs b/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs index eca93e561240..be334ac7d271 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs @@ -40,6 +40,11 @@ public static class Properties public static readonly string InvariantGlobalization = nameof(InvariantGlobalization); } + public static class Items + { + public static readonly string FrameworkReference = nameof(FrameworkReference); + } + public static class ErrorCodes { public static readonly string CONTAINER002 = nameof(CONTAINER002); diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs index 458c7b55195a..f4eab184e1e8 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs @@ -74,7 +74,10 @@ public sealed class ComputeDotnetBaseImageAndTag : Microsoft.Build.Utilities.Tas [Output] public string? ComputedContainerBaseImage { get; private set; } - private bool IsAspNetCoreProject => FrameworkReferences.Length > 0 && FrameworkReferences.Any(x => x.ItemSpec.Equals("Microsoft.AspnetCore.App", StringComparison.Ordinal)); + private bool IsAspNetCoreProject => + FrameworkReferences.Length > 0 + && FrameworkReferences.Any(x => x.ItemSpec.Equals("Microsoft.AspNetCore.App", StringComparison.OrdinalIgnoreCase)); + private bool IsMuslRid => TargetRuntimeIdentifier.StartsWith("linux-musl", StringComparison.Ordinal); private bool IsBundledRuntime => IsSelfContained; private bool NeedsNightlyImages => IsAotPublished; diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs index 52b9f741d323..1e19bbb4f7e0 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/ProjectInitializer.cs @@ -34,7 +34,7 @@ private static string CombineFiles(string propsFile, string targetsFile) return tempTargetLocation; } - public static (Project, CapturingLogger, IDisposable) InitProject(Dictionary bonusProps, Dictionary? bonusItems = null, [CallerMemberName]string projectName = "") + public static (Project, CapturingLogger, IDisposable) InitProject(Dictionary bonusProps, Dictionary? bonusItems = null, [CallerMemberName] string projectName = "") { var props = new Dictionary(); // required parameters @@ -51,7 +51,7 @@ public static (Project, CapturingLogger, IDisposable) InitProject(Dictionary @@ -76,16 +76,20 @@ public static (Project, CapturingLogger, IDisposable) InitProject(Dictionary ni, - [var ni, ..] => ni, - [] => null + var newItem = project.AddItem(itemType, item.ItemSpec) switch + { + [var ni] => ni, + [var ni, ..] => ni, + [] => null }; if (newItem is not null) { - foreach (var key in item.MetadataNames) + // we don't want to copy the MSBuild-reserved metadata, if any, + // so only use the custom metadata + var customMetadata = item.CloneCustomMetadata(); + foreach (var key in customMetadata) { - newItem.SetMetadataValue((string)key, item.GetMetadata((string)key)); + newItem.SetMetadataValue((string)key, customMetadata[key] as string); } } } diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs index b4cd2201d253..88aa4498356d 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs @@ -357,4 +357,30 @@ public void AOTAppsLessThan8WithCulturesDoNotGetExtraImages(string rid, string e var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; computedBaseImageTag.Should().BeEquivalentTo(expectedImage); } + + [Fact] + public void AspNetFDDAppsGetAspNetBaseImage() + { + var expectedImage = "mcr.microsoft.com/dotnet/aspnet:8.0"; + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = "8.0.200", + ["TargetFrameworkVersion"] = "v8.0", + [KnownStrings.Properties.ContainerRuntimeIdentifier] = "linux-x64", + }, bonusItems: new() + { + [KnownStrings.Items.FrameworkReference] = KnownFrameworkReferences.WebApp + }, projectName: $"{nameof(AspNetFDDAppsGetAspNetBaseImage)}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } + + private static class KnownFrameworkReferences + { + public static Microsoft.Build.Framework.ITaskItem[] ConsoleApp { get; } = [new Microsoft.Build.Utilities.TaskItem("Microsoft.NETCore.App")]; + public static Microsoft.Build.Framework.ITaskItem[] WebApp { get; } = [.. ConsoleApp, new Microsoft.Build.Utilities.TaskItem("Microsoft.AspNetCore.App")]; + } } From 6459b295264ee3a91c79c11e4840788825064ba5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 18:49:32 +0000 Subject: [PATCH 539/550] [release/8.0.2xx] Update dependencies from dotnet/source-build-externals (#38036) [release/8.0.2xx] Update dependencies from dotnet/source-build-externals --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1078c6bb71c..8c766d306b30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -333,9 +333,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 7134e53b6b1210a1ce8838b12b8f6071e0a3433b + 83274d94c7e2ff21081b0d75ecbec2da2241f831 From 64f87afd107fec00edfaeb54febf7f2bd3986617 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:34:34 -0800 Subject: [PATCH 540/550] Update manifests when rolling back for install after updating from rollback file (#37966) --- .../commands/dotnet-workload/install/WorkloadInstallCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs index 586c8b87fd74..97a63aea9d47 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/WorkloadInstallCommand.cs @@ -134,7 +134,7 @@ public void InstallWorkloads(IEnumerable workloadIds, bool skipManif if (!skipManifestUpdate) { var installStateFilePath = Path.Combine(WorkloadInstallType.GetInstallStateFolder(_sdkFeatureBand, _dotnetPath), "default.json"); - if (File.Exists(installStateFilePath)) + if (string.IsNullOrWhiteSpace(_fromRollbackDefinition) && File.Exists(installStateFilePath) && InstallStateContents.FromString(File.ReadAllText(installStateFilePath)).Manifests is not null) { // If there is a rollback state file, then we don't want to automatically update workloads when a workload is installed // To update to a new version, the user would need to run "dotnet workload update" From 958cc320c35135c70c49286a114170a6d04726da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jan 2024 18:48:06 +0000 Subject: [PATCH 541/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#38071) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 68766c29f33f..2086fe8b8c67 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c766d306b30..9c664837fe2f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,17 +51,17 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - bb6fadf23225f5097f4e05ed507d93683a21ae56 + c67ce32f27d2fe05ab017af0aad8023d236d41ff - + https://github.com/dotnet/msbuild - bb6fadf23225f5097f4e05ed507d93683a21ae56 + c67ce32f27d2fe05ab017af0aad8023d236d41ff - + https://github.com/dotnet/msbuild - bb6fadf23225f5097f4e05ed507d93683a21ae56 + c67ce32f27d2fe05ab017af0aad8023d236d41ff diff --git a/eng/Versions.props b/eng/Versions.props index 0c6ccc141ac4..38c1c2f83703 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,7 +105,7 @@ - 17.9.2 + 17.9.3 $(MicrosoftBuildPackageVersion) + @@ -18,10 +19,12 @@ + + @@ -46,6 +49,7 @@ + @@ -53,8 +57,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c664837fe2f..2b169eeb402d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,46 +10,46 @@ https://github.com/dotnet/templating 563930b1d9ad60c8d7dbd1975390f5870601defa - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 806d04b02e42254b0be9b0b85119f3e9133462bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 806d04b02e42254b0be9b0b85119f3e9133462bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 806d04b02e42254b0be9b0b85119f3e9133462bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 806d04b02e42254b0be9b0b85119f3e9133462bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 806d04b02e42254b0be9b0b85119f3e9133462bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 806d04b02e42254b0be9b0b85119f3e9133462bd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 806d04b02e42254b0be9b0b85119f3e9133462bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 806d04b02e42254b0be9b0b85119f3e9133462bd - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 https://github.com/dotnet/msbuild @@ -107,13 +107,13 @@ https://github.com/dotnet/roslyn 28e49407a6e4744819bd471707259b99964e441c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 https://github.com/nuget/nuget.client @@ -192,9 +192,9 @@ https://github.com/microsoft/vstest 053d7114a72aac12d1382ecc2a23b2dfdd5b084b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 806d04b02e42254b0be9b0b85119f3e9133462bd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -212,70 +212,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + d409ddaf7da38b20f30f260f5b84ffdadb5626c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + 4c5c25180f2937b7c0691483dc892169fc13ddb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 https://github.com/dotnet/razor @@ -290,21 +290,21 @@ https://github.com/dotnet/razor df383360c34ada8889fdf18dc36d245f2938db66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + a12499ebbebb4d37f1ce51e1dafac721e546ef42 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 38c1c2f83703..977c9c8489e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,19 +50,19 @@ - 8.0.0 - 8.0.0-rtm.23531.3 - 8.0.0 + 8.0.2 + 8.0.2-servicing.24065.5 + 8.0.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.3 + 8.0.2 + 8.0.2-servicing.24065.5 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.0 8.0.0 8.0.0 - 8.0.0 + 8.0.2 8.0.0 @@ -150,13 +150,13 @@ - 8.0.0 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0 + 8.0.2 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2 @@ -166,7 +166,7 @@ - 8.0.0-rtm.23531.4 + 8.0.2-servicing.24060.15 @@ -211,7 +211,7 @@ 8.0.0 - 8.0.0 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 9228647e1ed56f511ed95423df0cb324fc41080e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 06:52:26 +0000 Subject: [PATCH 543/550] Merged PR 36584: [internal/release/8.0.2xx] Update dependencies from dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.1 to 8.0.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:912f2f84-af0d-4135-5f68-08dc11e990e4) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 912f2f84-af0d-4135-5f68-08dc11e990e4 - **Build**: 20240116.27 - **Date Produced**: January 18, 2024 2:20:46 AM UTC - **Commit**: 441c91dab92ca259db1952ee64f5a7522b12f59b - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 8.0.2-servicing.24065.5 to 8.0.2-servicing.24066.27][1] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.2 to 8.0.2][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.2 to 8.0.2][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.2 to 8.0.2][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.2 to 8.0.2][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.2 to 8.0.2][1] - **Microsoft.NETCore.Platforms**: [from 8.0.2-servicing.24065.5 to 8.0.2-servicing.24066.27][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.2-servicing.24065.5 to 8.0.2-servicing.24066.27][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.2-servicing.24065.5 to 8.0.2-servicing.24066.27][1] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.1 to 8.0.2][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC806d04b02e42254b0be9b0b85119f3e9133462bd&targetVersion=GC441c91dab92ca259db1952ee64f5a7522b12f59b&_a=files [2]: https://github.com/dotnet/emsdk/compare/201f4dae9d...2fc2ffd960 [DependencyUpdate]: <> (End) [marker]: <> (End:912f2f84-af0d-4135-5f68-08dc11e990e4) [marker]: <> (Begin:aac3efab-694a-47f5-8bf0-08dc11e0a92e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: aac3efab-694a-47f5-8bf0-08dc11e0a92e - **Build**: 20240117.13 - **Date Produced**: January 18, 2024 2:59:42 AM UTC - **Commit**: a48fa2c65030b315c294bce6d94bb49aeb749b16 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.2-servicing.24067.11 to 8.0.2-servicing.24067.13][3] - **dotnet-user-jwts**: [from 8.0.2-servicing.24067.11 to 8.0.2-servicing.24067.13][3] - **dotnet-user-secrets**: [f... --- NuGet.config | 9 +++-- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++---- 3 files changed, 55 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index bc851e54f8a0..8524822db48a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -11,7 +12,7 @@ - + @@ -19,7 +20,7 @@ - + @@ -49,7 +50,7 @@ - + @@ -57,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b169eeb402d..83e21a80bea4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,32 +12,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 806d04b02e42254b0be9b0b85119f3e9133462bd + 441c91dab92ca259db1952ee64f5a7522b12f59b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 806d04b02e42254b0be9b0b85119f3e9133462bd + 441c91dab92ca259db1952ee64f5a7522b12f59b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 806d04b02e42254b0be9b0b85119f3e9133462bd + 441c91dab92ca259db1952ee64f5a7522b12f59b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 806d04b02e42254b0be9b0b85119f3e9133462bd + 441c91dab92ca259db1952ee64f5a7522b12f59b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 806d04b02e42254b0be9b0b85119f3e9133462bd + 441c91dab92ca259db1952ee64f5a7522b12f59b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 806d04b02e42254b0be9b0b85119f3e9133462bd + 441c91dab92ca259db1952ee64f5a7522b12f59b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 806d04b02e42254b0be9b0b85119f3e9133462bd + 441c91dab92ca259db1952ee64f5a7522b12f59b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -45,11 +45,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 806d04b02e42254b0be9b0b85119f3e9133462bd + 441c91dab92ca259db1952ee64f5a7522b12f59b - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d https://github.com/dotnet/msbuild @@ -107,13 +107,13 @@ https://github.com/dotnet/roslyn 28e49407a6e4744819bd471707259b99964e441c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 https://github.com/nuget/nuget.client @@ -194,7 +194,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 806d04b02e42254b0be9b0b85119f3e9133462bd + 441c91dab92ca259db1952ee64f5a7522b12f59b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -234,48 +234,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 https://github.com/dotnet/razor @@ -292,19 +292,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a12499ebbebb4d37f1ce51e1dafac721e546ef42 + a48fa2c65030b315c294bce6d94bb49aeb749b16 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 977c9c8489e0..6087ac29e851 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,12 +51,12 @@ 8.0.2 - 8.0.2-servicing.24065.5 + 8.0.2-servicing.24066.27 8.0.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.0 8.0.2 - 8.0.2-servicing.24065.5 + 8.0.2-servicing.24066.27 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.0 @@ -151,11 +151,11 @@ 8.0.2 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.13 + 8.0.2-servicing.24067.13 + 8.0.2-servicing.24067.13 + 8.0.2-servicing.24067.13 + 8.0.2-servicing.24067.13 8.0.2 @@ -211,7 +211,7 @@ 8.0.0 - 8.0.1 + 8.0.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 10268dea7b4e74ad25a8e20b7ff41ed06f90fdc2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 17:21:57 +0000 Subject: [PATCH 544/550] [release/8.0.2xx] Update dependencies from dotnet/msbuild (#38103) [release/8.0.2xx] Update dependencies from dotnet/msbuild --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2086fe8b8c67..e9f9f4343c64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c664837fe2f..1ad63d2b2c29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,17 +51,17 @@ https://github.com/dotnet/emsdk 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/msbuild - c67ce32f27d2fe05ab017af0aad8023d236d41ff + 90725d08d9825ad5897029b47f600345c29125b7 - + https://github.com/dotnet/msbuild - c67ce32f27d2fe05ab017af0aad8023d236d41ff + 90725d08d9825ad5897029b47f600345c29125b7 - + https://github.com/dotnet/msbuild - c67ce32f27d2fe05ab017af0aad8023d236d41ff + 90725d08d9825ad5897029b47f600345c29125b7 diff --git a/eng/Versions.props b/eng/Versions.props index 38c1c2f83703..dc0751103c60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -105,7 +105,7 @@ - 17.9.3 + 17.9.4 $(MicrosoftBuildPackageVersion) - 4.9.0-3.24054.13 - 4.9.0-3.24054.13 - 4.9.0-3.24054.13 - 4.9.0-3.24054.13 - 4.9.0-3.24054.13 - 4.9.0-3.24054.13 - 4.9.0-3.24054.13 + 4.9.0-3.24067.18 + 4.9.0-3.24067.18 + 4.9.0-3.24067.18 + 4.9.0-3.24067.18 + 4.9.0-3.24067.18 + 4.9.0-3.24067.18 + 4.9.0-3.24067.18 $(MicrosoftNetCompilersToolsetPackageVersion) From 5b4adb8e92433c5f3d984834a8a62f6fb0086b5c Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 18 Jan 2024 17:23:04 +0000 Subject: [PATCH 546/550] Merged PR 36592: [internal/release/8.0.2xx] Update dependencies from dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:aac3efab-694a-47f5-8bf0-08dc11e0a92e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: aac3efab-694a-47f5-8bf0-08dc11e0a92e - **Build**: 20240118.4 - **Date Produced**: January 18, 2024 4:34:51 PM UTC - **Commit**: da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] - **dotnet-user-jwts**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] - **dotnet-user-secrets**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.2 to 8.0.2][5] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.2 to 8.0.2][5] - **Microsoft.AspNetCore.Authorization**: [from 8.0.2 to 8.0.2][5] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.2 to 8.0.2][5] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] - **Microsoft.AspNetCore.TestHost**: [from 8.0.2 to 8.0.2][5] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.2 to 8.0.2][5] - **Microsoft.JSInterop**: [from 8.0.2 to 8.0.2][5] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.2-servicing.24067.13 to 8.0.2-servicing.24068.4][5] [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCa48fa2c65030b315c294bce6d94bb49aeb749b16&targetVersion=GCda7e9894ce22ef8cc02e5acc56e95a6f8cf8f644&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:aac3efab-694a-47f5-8bf0-08dc11e0a92e) [marker]: <> (Begin:912f2f84-af0d-4135-5f68-08dc11e990e4) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 912f2f84-af0d-4135-5f68-08dc11e990e4 - **Build**: 20240117.11 - **Date Produced**: January 18, 2024 9:24:13 AM UTC - **Commit**: 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 8.0.2-servicing.24066.27 to 8.0.2-servicing.24067.11][3] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.2 to 8.0.2][3] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.2 to 8.0.2][3] - **Microsoft.NETCore.App.Re... --- NuGet.config | 8 ++--- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++---- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8524822db48a..5eeac7a13dd1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,7 +12,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -58,7 +58,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83e21a80bea4..b71c6e6c01ca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,32 +12,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441c91dab92ca259db1952ee64f5a7522b12f59b + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441c91dab92ca259db1952ee64f5a7522b12f59b + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441c91dab92ca259db1952ee64f5a7522b12f59b + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441c91dab92ca259db1952ee64f5a7522b12f59b + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441c91dab92ca259db1952ee64f5a7522b12f59b + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441c91dab92ca259db1952ee64f5a7522b12f59b + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441c91dab92ca259db1952ee64f5a7522b12f59b + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -45,7 +45,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441c91dab92ca259db1952ee64f5a7522b12f59b + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 https://github.com/dotnet/emsdk @@ -107,13 +107,13 @@ https://github.com/dotnet/roslyn 28e49407a6e4744819bd471707259b99964e441c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://github.com/nuget/nuget.client @@ -194,7 +194,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 441c91dab92ca259db1952ee64f5a7522b12f59b + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -234,48 +234,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://github.com/dotnet/razor @@ -292,19 +292,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a48fa2c65030b315c294bce6d94bb49aeb749b16 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 6087ac29e851..7cac6cf310cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,12 +51,12 @@ 8.0.2 - 8.0.2-servicing.24066.27 + 8.0.2-servicing.24067.11 8.0.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.0 8.0.2 - 8.0.2-servicing.24066.27 + 8.0.2-servicing.24067.11 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.0 @@ -151,11 +151,11 @@ 8.0.2 - 8.0.2-servicing.24067.13 - 8.0.2-servicing.24067.13 - 8.0.2-servicing.24067.13 - 8.0.2-servicing.24067.13 - 8.0.2-servicing.24067.13 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 8.0.2 From 9861ce82a93ec6df12e3eabc45f60eccf6321448 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jan 2024 23:34:33 +0000 Subject: [PATCH 547/550] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240118.6 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.2 -> To Version 8.0.2 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.2-servicing.24060.15 -> To Version 8.0.2-servicing.24068.6 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 658142c4a58a..ee3bc19edf7e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,7 +25,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d302282b2a3f..70ca3ce54dfb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,23 +214,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d409ddaf7da38b20f30f260f5b84ffdadb5626c8 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4c5c25180f2937b7c0691483dc892169fc13ddb3 + 472140dd926227876848e48f41cfc9acb9275492 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e32f5ca612de..60a4525e82ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ - 8.0.2-servicing.24060.15 + 8.0.2-servicing.24068.6 From b52099fa633d4a8951144072c341cf859df36b45 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 19 Jan 2024 16:49:29 +0000 Subject: [PATCH 548/550] Merged PR 36643: Merge the public 8.0.2xx into internal/release/8.0.2xx --- Directory.Packages.props | 32 ++++++++++---------- eng/Version.Details.xml | 64 ++++++++++++++++++++++++++++++++++++++++ eng/Versions.props | 21 ++++++++++--- 3 files changed, 97 insertions(+), 20 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 49e2459b9fb4..5d37eb795d6b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ - + @@ -32,12 +32,12 @@ - + - + @@ -55,8 +55,8 @@ - + @@ -82,27 +82,27 @@ - - - - - - - + + + + + + + - + - - + + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70ca3ce54dfb..99cb175622a7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -409,6 +409,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 + diff --git a/eng/Versions.props b/eng/Versions.props index 60a4525e82ac..18285db23d27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,6 @@ 1.0.0-20230414.1 - 2.1.0-preview2-26306-03 2.21.0 2.0.1-servicing-26011-01 13.0.3 @@ -40,7 +39,6 @@ 4.3.0 4.3.0 4.0.5 - 7.0.3 8.0.0 4.6.0 2.0.0-beta4.23307.1 @@ -59,11 +57,27 @@ 8.0.2-servicing.24067.11 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) + 8.0.0 8.0.0 8.0.0 - 8.0.0 8.0.2 + 8.0.0 + 8.0.0 + 8.0.2 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.1 + 8.0.0 + 8.0.0 + 8.0.0 8.0.0 + 8.0.2 + 8.0.0 @@ -210,7 +224,6 @@ - 8.0.0 8.0.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) From a96621e7a46f1549e058719777f4c12650cc5ee7 Mon Sep 17 00:00:00 2001 From: Martin Ruiz Date: Fri, 19 Jan 2024 18:17:23 +0000 Subject: [PATCH 549/550] Merged PR 36597: Insert nuget.client 6.9.1-rc.3 to dotnet sdk 8.0.2xx insert nuget.client 6.9.1-rc.3 to dotnet sdk 8.0.2xx --- NuGet.config | 1 + eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 22 +++++----- 3 files changed, 60 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index ee3bc19edf7e..4632f1861eb3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,6 +37,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99cb175622a7..b1d4cb9ee3c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,69 +115,69 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 18285db23d27..eb210470a04d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,18 +81,18 @@ - 6.9.0-rc.74 - 6.9.0-rc.74 + 6.9.1-rc.3 + 6.9.1-rc.3 6.0.0-rc.278 - 6.9.0-rc.74 - 6.9.0-rc.74 - 6.9.0-rc.74 - 6.9.0-rc.74 - 6.9.0-rc.74 - 6.9.0-rc.74 - 6.9.0-rc.74 - 6.9.0-rc.74 - 6.9.0-rc.74 + 6.9.1-rc.3 + 6.9.1-rc.3 + 6.9.1-rc.3 + 6.9.1-rc.3 + 6.9.1-rc.3 + 6.9.1-rc.3 + 6.9.1-rc.3 + 6.9.1-rc.3 + 6.9.1-rc.3 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From af4967de46a87229c49f6d567028791c4c4683d0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 19 Jan 2024 19:51:58 +0000 Subject: [PATCH 550/550] Merged PR 36667: Merge public to internal This includes the nuget package search change, a merge resolution, and a revert of a bad merge. --- src/Cli/dotnet/Parser.cs | 1 + .../dotnet-package/PackageCommandParser.cs | 21 +++ .../search/LocalizableStrings.resx | 174 ++++++++++++++++++ .../search/PackageSearchCommand.cs | 31 ++++ .../search/PackageSearchCommandParser.cs | 105 +++++++++++ .../search/xlf/LocalizableStrings.cs.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.de.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.es.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.fr.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.it.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.ja.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.ko.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.pl.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.pt-BR.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.ru.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.tr.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.zh-Hans.xlf | 97 ++++++++++ .../search/xlf/LocalizableStrings.zh-Hant.xlf | 97 ++++++++++ src/Cli/dotnet/dotnet.csproj | 1 + .../GivenANuGetCommand.cs | 11 ++ .../CommandTests/CompleteCommandTests.cs | 1 + 21 files changed, 1606 insertions(+) create mode 100644 src/Cli/dotnet/commands/dotnet-package/PackageCommandParser.cs create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/LocalizableStrings.resx create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommand.cs create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommandParser.cs create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.cs.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.de.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.es.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.fr.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.it.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ja.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ko.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pl.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pt-BR.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ru.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.tr.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hans.xlf create mode 100644 src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hant.xlf diff --git a/src/Cli/dotnet/Parser.cs b/src/Cli/dotnet/Parser.cs index 12da079c7f53..1a19ef71612c 100644 --- a/src/Cli/dotnet/Parser.cs +++ b/src/Cli/dotnet/Parser.cs @@ -38,6 +38,7 @@ public static class Parser NewCommandParser.GetCommand(), NuGetCommandParser.GetCommand(), PackCommandParser.GetCommand(), + PackageCommandParser.GetCommand(), ParseCommandParser.GetCommand(), PublishCommandParser.GetCommand(), RemoveCommandParser.GetCommand(), diff --git a/src/Cli/dotnet/commands/dotnet-package/PackageCommandParser.cs b/src/Cli/dotnet/commands/dotnet-package/PackageCommandParser.cs new file mode 100644 index 000000000000..63bf74e8faa3 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/PackageCommandParser.cs @@ -0,0 +1,21 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.CommandLine; + +namespace Microsoft.DotNet.Cli +{ + internal class PackageCommandParser + { + private const string DocsLink = "https://aka.ms/dotnet-package"; + + public static CliCommand GetCommand() + { + CliCommand command = new DocumentedCommand("package", DocsLink); + command.SetAction((parseResult) => parseResult.HandleMissingCommand()); + command.Subcommands.Add(PackageSearchCommandParser.GetCommand()); + + return command; + } + } +} diff --git a/src/Cli/dotnet/commands/dotnet-package/search/LocalizableStrings.resx b/src/Cli/dotnet/commands/dotnet-package/search/LocalizableStrings.resx new file mode 100644 index 000000000000..de09b2b0ad7f --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/LocalizableStrings.resx @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + ConfigFile + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + Format + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + Stop and wait for user input or action (for example to complete authentication). + + + Include prerelease packages. + + + SearchTerm + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + Skip + + + Number of results to skip, to allow pagination. Default 0. + + + Source + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + Take + + + Number of results to return. Default 20. + + + Verbosity + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommand.cs b/src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommand.cs new file mode 100644 index 000000000000..f7a6d4800217 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommand.cs @@ -0,0 +1,31 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.DotNet.Tools.NuGet; +using System.CommandLine; + +namespace Microsoft.DotNet.Cli +{ + internal class PackageSearchCommand : CommandBase + { + public PackageSearchCommand(ParseResult parseResult) : base(parseResult) { } + + public override int Execute() + { + var args = new List + { + "package", + "search" + }; + + var searchArgument = _parseResult.GetValue(PackageSearchCommandParser.SearchTermArgument); + if (searchArgument != null) + { + args.Add(searchArgument); + } + + args.AddRange(_parseResult.OptionValuesToBeForwarded(PackageSearchCommandParser.GetCommand())); + return NuGetCommand.Run(args.ToArray()); + } + } +} diff --git a/src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommandParser.cs b/src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommandParser.cs new file mode 100644 index 000000000000..5bc951d470c4 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/PackageSearchCommandParser.cs @@ -0,0 +1,105 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.CommandLine; +using LocalizableStrings = Microsoft.DotNet.Tools.Package.Search.LocalizableStrings; + +namespace Microsoft.DotNet.Cli +{ + internal static class PackageSearchCommandParser + { + public static readonly CliArgument SearchTermArgument = new CliArgument("SearchTerm") + { + HelpName = LocalizableStrings.SearchTermArgumentName, + Description = LocalizableStrings.SearchTermDescription, + Arity = ArgumentArity.ZeroOrOne + }; + + public static readonly CliOption Sources = new ForwardedOption>("--source") + { + Description = LocalizableStrings.SourceDescription, + HelpName = LocalizableStrings.SourceArgumentName + }.ForwardAsManyArgumentsEachPrefixedByOption("--source") + .AllowSingleArgPerToken(); + + public static readonly CliOption Take = new ForwardedOption("--take") + { + Description = LocalizableStrings.TakeDescription, + HelpName = LocalizableStrings.TakeArgumentName + }.ForwardAsSingle(o => $"--take:{o}"); + + public static readonly CliOption Skip = new ForwardedOption("--skip") + { + Description = LocalizableStrings.SkipDescription, + HelpName = LocalizableStrings.SkipArgumentName + }.ForwardAsSingle(o => $"--skip:{o}"); + + public static readonly CliOption ExactMatch = new ForwardedOption("--exact-match") + { + Description = LocalizableStrings.ExactMatchDescription + }.ForwardAs("--exact-match"); + + public static readonly CliOption Interactive = new ForwardedOption("--interactive") + { + Description = LocalizableStrings.InteractiveDescription + }.ForwardAs("--interactive"); + + public static readonly CliOption Prerelease = new ForwardedOption("--prerelease") + { + Description = LocalizableStrings.PrereleaseDescription + }.ForwardAs("--prerelease"); + + public static readonly CliOption ConfigFile = new ForwardedOption("--configfile") + { + Description = LocalizableStrings.ConfigFileDescription, + HelpName = LocalizableStrings.ConfigFileArgumentName + }.ForwardAsSingle(o => $"--configfile:{o}"); + + public static readonly CliOption Format = new ForwardedOption("--format") + { + Description = LocalizableStrings.FormatDescription, + HelpName = LocalizableStrings.FormatArgumentName + }.ForwardAsSingle(o => $"--format:{o}"); + + public static readonly CliOption Verbosity = new ForwardedOption("--verbosity") + { + Description = LocalizableStrings.VerbosityDescription, + HelpName = LocalizableStrings.VerbosityArgumentName + }.ForwardAsSingle(o => $"--verbosity:{o}"); + + private static readonly CliCommand Command = ConstructCommand(); + + public static CliCommand GetCommand() + { + return Command; + } + + private static CliCommand ConstructCommand() + { + CliCommand searchCommand = new("search", LocalizableStrings.CommandDescription); + + searchCommand.Arguments.Add(SearchTermArgument); + searchCommand.Options.Add(Sources); + searchCommand.Options.Add(Take); + searchCommand.Options.Add(Skip); + searchCommand.Options.Add(ExactMatch); + searchCommand.Options.Add(Interactive); + searchCommand.Options.Add(Prerelease); + searchCommand.Options.Add(ConfigFile); + searchCommand.Options.Add(Format); + searchCommand.Options.Add(Verbosity); + + searchCommand.SetAction((parseResult) => { + var command = new PackageSearchCommand(parseResult); + int exitCode = command.Execute(); + + if (exitCode == 1) + { + parseResult.ShowHelp(); + } + }); + + return searchCommand; + } + } +} diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.cs.xlf new file mode 100644 index 000000000000..ab95f376c5ef --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.cs.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.de.xlf new file mode 100644 index 000000000000..25c81c1bd851 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.de.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.es.xlf new file mode 100644 index 000000000000..e588d1659213 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.es.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.fr.xlf new file mode 100644 index 000000000000..af84c66837d9 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.fr.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.it.xlf new file mode 100644 index 000000000000..d11f25fd0541 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.it.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ja.xlf new file mode 100644 index 000000000000..11c4cb28b221 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ja.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ko.xlf new file mode 100644 index 000000000000..2920635a01c3 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ko.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pl.xlf new file mode 100644 index 000000000000..a9051a7b47fc --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pl.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pt-BR.xlf new file mode 100644 index 000000000000..c5c8365f6a04 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.pt-BR.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ru.xlf new file mode 100644 index 000000000000..46b1600c3a28 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.ru.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.tr.xlf new file mode 100644 index 000000000000..4a383e5cda10 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.tr.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hans.xlf new file mode 100644 index 000000000000..dd4e698e80cd --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hans.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hant.xlf new file mode 100644 index 000000000000..f66a8fe3c625 --- /dev/null +++ b/src/Cli/dotnet/commands/dotnet-package/search/xlf/LocalizableStrings.zh-Hant.xlf @@ -0,0 +1,97 @@ + + + + + + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + Searches one or more package sources for packages that match a search term. If no sources are specified, all sources defined in the NuGet.Config are used. + + + + ConfigFile + ConfigFile + + + + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + The NuGet configuration file. If specified, only the settings from this file will be used. If not specified, the hierarchy of configuration files from the current directory will be used. For more information, see https://docs.microsoft.com/nuget/consume-packages/configuring-nuget-behavior + + + + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + Require that the search term exactly match the name of the package. Causes `--take` and `--skip` options to be ignored. + + + + Format + Format + + + + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + Format the output accordingly. Either `table`, or `json`. The default value is `table`. + + + + Stop and wait for user input or action (for example to complete authentication). + Stop and wait for user input or action (for example to complete authentication). + + + + Include prerelease packages. + Include prerelease packages. + + + + SearchTerm + SearchTerm + + + + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + Search term to filter package names, descriptions, and tags. Used as a literal value. Example: `dotnet package search some.package`. See also `--exact-match`. + + + + Skip + Skip + + + + Number of results to skip, to allow pagination. Default 0. + Number of results to skip, to allow pagination. Default 0. + + + + Source + Source + + + + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + The package source to search. You can pass multiple `--source` options to search multiple package sources. Example: `--source https://api.nuget.org/v3/index.json`. + + + + Take + Take + + + + Number of results to return. Default 20. + Number of results to return. Default 20. + + + + Verbosity + Verbosity + + + + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + Display this amount of details in the output: `normal`, `minimal`, `detailed`. The default is `normal` + + + + + \ No newline at end of file diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index 97db1f85a572..de27955804a3 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -44,6 +44,7 @@ + diff --git a/src/Tests/dotnet-nuget.UnitTests/GivenANuGetCommand.cs b/src/Tests/dotnet-nuget.UnitTests/GivenANuGetCommand.cs index 6806a7d4e8ee..b405aa74e257 100644 --- a/src/Tests/dotnet-nuget.UnitTests/GivenANuGetCommand.cs +++ b/src/Tests/dotnet-nuget.UnitTests/GivenANuGetCommand.cs @@ -65,6 +65,17 @@ public GivenANuGetCommand(ITestOutputHelper log) : base(log) "--certificate-store-location", "CurrentUser", "--certificate-subject-name", "CE40881FF5F0AD3E58965DA20A9F57", "--certificate-password", "PlaceholderPassword"}, 0)] + [InlineData(new[] { "package", "search", "nuget"}, 0)] + [InlineData(new[] { "package", "search", "nuget", + "--source", "https://api.nuget.org/v3/index.json", + "--take", "10", + "--skip", "5", + "--prerelease", + "--exact-match", + "--interactive", + "--verbosity", "detailed", + "--format", "json"}, 0)] + public void ItPassesCommandIfSupported(string[] inputArgs, int result) { // Arrange diff --git a/src/Tests/dotnet.Tests/CommandTests/CompleteCommandTests.cs b/src/Tests/dotnet.Tests/CommandTests/CompleteCommandTests.cs index b4b2160fb370..a895374c1802 100644 --- a/src/Tests/dotnet.Tests/CommandTests/CompleteCommandTests.cs +++ b/src/Tests/dotnet.Tests/CommandTests/CompleteCommandTests.cs @@ -39,6 +39,7 @@ public void GivenOnlyDotnetItSuggestsTopLevelCommandsAndOptions() "new", "nuget", "pack", + "package", "publish", "remove", "restore",