From d2e7288267416a41a6cc8cd4d732e7052dbbf406 Mon Sep 17 00:00:00 2001 From: Annie Li Date: Thu, 9 Feb 2023 10:56:58 -0800 Subject: [PATCH 001/135] Issue 25536 enable -disable-build-servers for pack clean test msbuild --- .../commands/dotnet-build/BuildCommand.cs | 5 +-- .../dotnet-clean/CleanCommandParser.cs | 1 + .../dotnet-msbuild/MSBuildCommandParser.cs | 4 +- .../dotnet/commands/dotnet-msbuild/Program.cs | 45 +++++++++++++++++-- .../commands/dotnet-pack/PackCommandParser.cs | 3 +- .../dotnet/commands/dotnet-test/Program.cs | 15 +++++++ .../commands/dotnet-test/TestCommandParser.cs | 1 + .../GivenDotnetBuildInvocation.cs | 4 +- .../GivenDotnetCleanInvocation.cs | 9 ++-- .../GivenDotnetMSBuildInvocation.cs | 41 +++++++++++++++++ .../GivenDotnetPackInvocation.cs | 2 + .../GivenDotnetTestInvocation.cs | 41 +++++++++++++++++ 12 files changed, 154 insertions(+), 17 deletions(-) create mode 100644 src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs create mode 100644 src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetTestInvocation.cs diff --git a/src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs b/src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs index d7fc1097c89a..2996cd8fc07f 100644 --- a/src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs @@ -1,12 +1,11 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System; using System.Collections.Generic; -using Microsoft.DotNet.Cli.Utils; -using Microsoft.DotNet.Cli; using System.CommandLine; using System.CommandLine.Parsing; -using System; +using Microsoft.DotNet.Cli; namespace Microsoft.DotNet.Tools.Build { diff --git a/src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs b/src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs index b7a82fca3630..6af6981d0dc3 100644 --- a/src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs @@ -52,6 +52,7 @@ private static Command ConstructCommand() command.AddOption(CommonOptions.VerbosityOption); command.AddOption(OutputOption); command.AddOption(NoLogoOption); + command.AddOption(CommonOptions.DisableBuildServersOption); command.SetHandler(CleanCommand.Run); diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs b/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs index 842b7cfc7714..7c6314d33447 100644 --- a/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs @@ -29,7 +29,9 @@ private static Command ConstructCommand() Arguments }; - command.SetHandler((ParseResult parseResult) => MSBuildCommand.Run(parseResult.GetValue(Arguments))); + command.AddOption(CommonOptions.DisableBuildServersOption); + + command.SetHandler(MSBuildCommand.Run); return command; } diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs b/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs index cf412db20e12..9b89a1a11e1d 100644 --- a/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs +++ b/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs @@ -1,17 +1,54 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System.Collections.Generic; using System.CommandLine; -using System.CommandLine.Parsing; using Microsoft.DotNet.Cli; namespace Microsoft.DotNet.Tools.MSBuild { - public class MSBuildCommand + public class MSBuildCommand : MSBuildForwardingApp { - public static int Run(string[] args) + public MSBuildCommand + (IEnumerable msbuildArgs, + string msbuildPath = null) + : base(msbuildArgs, msbuildPath) { - return new MSBuildForwardingApp(args).Execute(); + } + + public static MSBuildCommand FromArgs(string[] args, string msbuildPath = null) + { + var parser = Cli.Parser.Instance; + var result = parser.ParseFrom("dotnet msbuild", args); + return FromParseResult(result, msbuildPath); + } + + public static MSBuildCommand FromParseResult(ParseResult parseResult, string msbuildPath = null) + { + var msbuildArgs = new List(); + + msbuildArgs.AddRange(parseResult.GetValue(MSBuildCommandParser.Arguments)); + + //result.ShowHelpOrErrorIfAppropriate(); + + msbuildArgs.AddRange(parseResult.OptionValuesToBeForwarded(MSBuildCommandParser.GetCommand())); + + MSBuildCommand command = new MSBuildCommand( + msbuildArgs, + msbuildPath); + return command; + } + + //public int Execute() + //{ + // return new MSBuildForwardingApp(_msbuildArgs, _msbuildPath).Execute(); + //} + + public static int Run(ParseResult parseResult) + { + parseResult.HandleDebugSwitch(); + + return FromParseResult(parseResult).Execute(); } } } diff --git a/src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs b/src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs index 55f90bd9ac12..14c29d9abe31 100644 --- a/src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.CommandLine; -using System.CommandLine.Invocation; -using System.CommandLine.Parsing; using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.Pack; using LocalizableStrings = Microsoft.DotNet.Tools.Pack.LocalizableStrings; @@ -68,6 +66,7 @@ private static Command ConstructCommand() command.AddOption(CommonOptions.VerbosityOption); command.AddOption(CommonOptions.VersionSuffixOption); command.AddOption(ConfigurationOption); + command.AddOption(CommonOptions.DisableBuildServersOption); RestoreCommandParser.AddImplicitRestoreOptions(command, includeRuntimeOption: true, includeNoDependenciesOption: true); command.SetHandler(PackCommand.Run); diff --git a/src/Cli/dotnet/commands/dotnet-test/Program.cs b/src/Cli/dotnet/commands/dotnet-test/Program.cs index ca6a565d478f..cbe6a59df4a4 100644 --- a/src/Cli/dotnet/commands/dotnet-test/Program.cs +++ b/src/Cli/dotnet/commands/dotnet-test/Program.cs @@ -108,6 +108,21 @@ private static int ForwardToVSTestConsole(ParseResult parseResult, string[] args return exitCode; } + public static TestCommand FromArgs(string[] args, string testSessionCorrelationId = null, string msbuildPath = null) + { + var parser = Microsoft.DotNet.Cli.Parser.Instance; + var parseResult = parser.ParseFrom("dotnet test", args); + + // settings parameters are after -- (including --), these should not be considered by the parser + string[] settings = args.SkipWhile(a => a != "--").ToArray(); + if (string.IsNullOrEmpty(testSessionCorrelationId)) + { + testSessionCorrelationId = $"{Environment.ProcessId}_{Guid.NewGuid()}"; + } + + return FromParseResult(parseResult, settings, testSessionCorrelationId, msbuildPath); + } + private static TestCommand FromParseResult(ParseResult result, string[] settings, string testSessionCorrelationId, string msbuildPath = null) { result.ShowHelpOrErrorIfAppropriate(); diff --git a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs index 03b02284dac8..0064ad6ab34c 100644 --- a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs @@ -160,6 +160,7 @@ private static Command ConstructCommand() command.AddOption(CommonOptions.VerbosityOption); command.AddOption(CommonOptions.ArchitectureOption); command.AddOption(CommonOptions.OperatingSystemOption); + command.AddOption(CommonOptions.DisableBuildServersOption); command.SetHandler(TestCommand.Run); diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs index 95dc65f15d45..08b56c151c01 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs @@ -1,10 +1,10 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.DotNet.Tools.Build; using FluentAssertions; -using Xunit; +using Microsoft.DotNet.Tools.Build; using Microsoft.NET.TestFramework; +using Xunit; namespace Microsoft.DotNet.Cli.MSBuild.Tests { diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetCleanInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetCleanInvocation.cs index f7448c96aa8e..e86feb9dcd67 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetCleanInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetCleanInvocation.cs @@ -1,13 +1,10 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.DotNet.Tools.Clean; using FluentAssertions; -using Xunit; -using System; -using System.IO; -using System.Runtime.InteropServices; +using Microsoft.DotNet.Tools.Clean; using Microsoft.NET.TestFramework; +using Xunit; namespace Microsoft.DotNet.Cli.MSBuild.Tests { @@ -37,6 +34,8 @@ public void ItAddsProjectToMsbuildInvocation() [InlineData(new string[] { "--configuration", "" }, "-property:Configuration=")] [InlineData(new string[] { "-v", "diag" }, "-verbosity:diag")] [InlineData(new string[] { "--verbosity", "diag" }, "-verbosity:diag")] + [InlineData(new string[] { "--disable-build-servers" }, "-p:UseRazorBuildServer=false -p:UseSharedCompilation=false /nodeReuse:false")] + public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs) { CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () => diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs new file mode 100644 index 000000000000..29c55f9f204e --- /dev/null +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs @@ -0,0 +1,41 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +using FluentAssertions; +using Microsoft.DotNet.Tools.MSBuild; +using Microsoft.NET.TestFramework; +using Xunit; + +namespace Microsoft.DotNet.Cli.MSBuild.Tests +{ + [Collection(TestConstants.UsesStaticTelemetryState)] + + public class GivenDotnetMSBuildInvocation : IClassFixture + { + const string ExpectedPrefix = "-maxcpucount -verbosity:m"; + + private static readonly string WorkingDirectory = + TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetPackInvocation)); + + [Theory] + [InlineData(new string[] { "--disable-build-servers" }, "-p:UseRazorBuildServer=false -p:UseSharedCompilation=false /nodeReuse:false")] + + public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs) + { + CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () => + { + expectedAdditionalArgs = + (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}") + .Replace("", WorkingDirectory); + + var msbuildPath = ""; + var command = MSBuildCommand.FromArgs(args, msbuildPath); + //var expectedPrefix = args.FirstOrDefault() == "--no-build" ? ExpectedNoBuildPrefix : ExpectedPrefix; + + //command.SeparateRestoreCommand.Should().BeNull(); + command.GetArgumentsToMSBuild().Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}"); + }); + } + } +} diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPackInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPackInvocation.cs index e4009ea000a6..f566895b1760 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPackInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPackInvocation.cs @@ -37,6 +37,8 @@ public class GivenDotnetPackInvocation : IClassFixture" }, "")] + [InlineData(new string[] { "--disable-build-servers" }, "-p:UseRazorBuildServer=false -p:UseSharedCompilation=false /nodeReuse:false")] + public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs) { CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () => diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetTestInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetTestInvocation.cs new file mode 100644 index 000000000000..e4465bf4a453 --- /dev/null +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetTestInvocation.cs @@ -0,0 +1,41 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. +// + +using FluentAssertions; +using Microsoft.DotNet.Tools.Test; +using Microsoft.NET.TestFramework; +using Xunit; + +namespace Microsoft.DotNet.Cli.MSBuild.Tests +{ + [Collection(TestConstants.UsesStaticTelemetryState)] + public class GivenDotnetTestInvocation : IClassFixture + { + private const string ExpectedPrefix = + "-maxcpucount -verbosity:m -restore -target:VSTest -nodereuse:false -nologo"; + private static readonly string WorkingDirectory = + TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetTestInvocation)); + + [Theory] + [InlineData(new string[] { "--disable-build-servers" }, "-p:UseRazorBuildServer=false -p:UseSharedCompilation=false /nodeReuse:false -property:VSTestArtifactsProcessingMode=collect -property:VSTestSessionCorrelationId=")] + public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs) + { + CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () => + { + Telemetry.Telemetry.DisableForTests(); + + expectedAdditionalArgs = + (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}") + .Replace("", WorkingDirectory); + + var testSessionCorrelationId = ""; + var msbuildPath = ""; + + TestCommand.FromArgs(args, testSessionCorrelationId, msbuildPath) + .GetArgumentsToMSBuild() + .Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}"); + }); + } + } +} From 367ea33a5063730b665b0324dc343e165d5c0748 Mon Sep 17 00:00:00 2001 From: Annie Li Date: Thu, 9 Feb 2023 15:38:58 -0800 Subject: [PATCH 002/135] Issue 25536: update remove commented lines in code --- src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs | 2 -- src/Cli/dotnet/commands/dotnet-msbuild/Program.cs | 7 ------- .../dotnet-msbuild/GivenDotnetMSBuildInvocation.cs | 4 +--- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs b/src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs index 0a5271610a58..f31df407073e 100644 --- a/src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs @@ -3,8 +3,6 @@ using System.Collections.Generic; using System.CommandLine; -using System.CommandLine.Invocation; -using System.CommandLine.Parsing; using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.Build; using LocalizableStrings = Microsoft.DotNet.Tools.Build.LocalizableStrings; diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs b/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs index 9b89a1a11e1d..d935e974c46b 100644 --- a/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs +++ b/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs @@ -29,8 +29,6 @@ public static MSBuildCommand FromParseResult(ParseResult parseResult, string msb msbuildArgs.AddRange(parseResult.GetValue(MSBuildCommandParser.Arguments)); - //result.ShowHelpOrErrorIfAppropriate(); - msbuildArgs.AddRange(parseResult.OptionValuesToBeForwarded(MSBuildCommandParser.GetCommand())); MSBuildCommand command = new MSBuildCommand( @@ -39,11 +37,6 @@ public static MSBuildCommand FromParseResult(ParseResult parseResult, string msb return command; } - //public int Execute() - //{ - // return new MSBuildForwardingApp(_msbuildArgs, _msbuildPath).Execute(); - //} - public static int Run(ParseResult parseResult) { parseResult.HandleDebugSwitch(); diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs index 29c55f9f204e..546f27c11ac2 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs @@ -31,9 +31,7 @@ public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalA var msbuildPath = ""; var command = MSBuildCommand.FromArgs(args, msbuildPath); - //var expectedPrefix = args.FirstOrDefault() == "--no-build" ? ExpectedNoBuildPrefix : ExpectedPrefix; - - //command.SeparateRestoreCommand.Should().BeNull(); + command.GetArgumentsToMSBuild().Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}"); }); } From 46ce995907e119b359103d0e8d73c5b7d062e681 Mon Sep 17 00:00:00 2001 From: Annie Li Date: Tue, 14 Feb 2023 17:38:28 -0800 Subject: [PATCH 003/135] 24004: Add --configfile switch to dotnet list package --- .../dotnet-list-package/ListPackageReferencesCommandParser.cs | 2 +- src/Tests/dotnet-list-package.Tests/GivenDotnetListPackage.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs b/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs index e8f2b52ba9fc..2ad7d6754f97 100644 --- a/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs @@ -39,7 +39,7 @@ internal static class ListPackageReferencesCommandParser public static readonly Option HighestMinorOption = new ForwardedOption("--highest-minor", LocalizableStrings.CmdHighestMinorDescription) .ForwardAs("--highest-minor"); - public static readonly Option ConfigOption = new ForwardedOption("--config", LocalizableStrings.CmdConfigDescription) + public static readonly Option ConfigOption = new ForwardedOption(new string[] { "--config", "--configfile"}, LocalizableStrings.CmdConfigDescription) { ArgumentHelpName = LocalizableStrings.CmdConfig }.ForwardAsMany(o => new[] { "--config", o }); diff --git a/src/Tests/dotnet-list-package.Tests/GivenDotnetListPackage.cs b/src/Tests/dotnet-list-package.Tests/GivenDotnetListPackage.cs index 356563af2a08..c30e7dc5fb0e 100644 --- a/src/Tests/dotnet-list-package.Tests/GivenDotnetListPackage.cs +++ b/src/Tests/dotnet-list-package.Tests/GivenDotnetListPackage.cs @@ -314,8 +314,10 @@ public void ItListsFSharpProject() [InlineData(false, "--outdated", "--highest-minor")] [InlineData(false, "--outdated", "--highest-patch")] [InlineData(false, "--config")] + [InlineData(false, "--configfile")] [InlineData(false, "--source")] [InlineData(false, "--config", "--deprecated")] + [InlineData(false, "--configfile", "--deprecated")] [InlineData(false, "--source", "--vulnerable")] [InlineData(true, "--vulnerable", "--deprecated")] [InlineData(true, "--vulnerable", "--outdated")] From 8c23a0428b067ea0d7ebf50477aa694bf782a72f Mon Sep 17 00:00:00 2001 From: Annie Li Date: Tue, 14 Feb 2023 17:09:50 -0800 Subject: [PATCH 004/135] #28518:stop generate warning when target library Remove the changes for issue 24004 --- .../Microsoft.NET.EolTargetFrameworks.targets | 2 +- .../GivenThatWeWantToTargetEolFrameworks.cs | 24 +++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets index 573f54eef588..57deb0606c72 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets @@ -12,7 +12,7 @@ Copyright (c) .NET Foundation. All rights reserved. - true + true - + From 01a5a1fa92d6d75246c1aa3dedfc81c4ebd84898 Mon Sep 17 00:00:00 2001 From: Annie Li Date: Tue, 21 Feb 2023 14:48:07 -0800 Subject: [PATCH 006/135] fix issue 30369 enable docker build platform switch --- src/Cli/dotnet/CommonOptions.cs | 12 +++++++++++- .../ResolveReadyToRunCompilers.cs | 1 + .../dotnet-msbuild/GivenDotnetBuildInvocation.cs | 1 + .../dotnet-msbuild/GivenDotnetOsArchOptions.cs | 13 +++++++++++++ .../dotnet-msbuild/GivenDotnetPublishInvocation.cs | 1 + .../dotnet-msbuild/GivenDotnetStoreInvocation.cs | 1 + 6 files changed, 28 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs index 97a35ee092a4..e2ca16521ca3 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -52,7 +52,16 @@ public static Option FrameworkOption(string description) => .AddCompletions(Complete.TargetFrameworksFromProjectFile); private static string RuntimeArgName = CommonLocalizableStrings.RuntimeIdentifierArgumentName; - private static Func> RuntimeArgFunc = o => new string[] { $"-property:RuntimeIdentifier={o}", "-property:_CommandLineDefinedRuntimeIdentifier=true" }; + /*private static Func> RuntimeArgFunc = + o => new string[] { $"-property:RuntimeIdentifier={o}", "-property:_CommandLineDefinedRuntimeIdentifier=true" };*/ + private static IEnumerable RuntimeArgFunc(string rid) + { + if (GetArchFromRid(rid) == "amd64") + { + rid = GetOsFromRid(rid) + "-x64"; + } + return new string[] { $"-property:RuntimeIdentifier={rid}", "-property:_CommandLineDefinedRuntimeIdentifier=true" }; + } private static Func> RuntimeCompletions = Complete.RunTimesFromProjectFile; public static Option RuntimeOption = @@ -224,6 +233,7 @@ private static IEnumerable ResolveRidShorthandOptions(string os, string internal static string ResolveRidShorthandOptionsToRuntimeIdentifier(string os, string arch) { var currentRid = GetCurrentRuntimeId(); + arch = arch == "amd64" ? "x64" : arch; os = string.IsNullOrEmpty(os) ? GetOsFromRid(currentRid) : os; arch = string.IsNullOrEmpty(arch) ? GetArchFromRid(currentRid) : arch; return $"{os}-{arch}"; diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs index 5d21bc96e846..35dede7c1db7 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs @@ -342,6 +342,7 @@ private bool GetCrossgenComponentsPaths() _crossgenTool.ClrJitPath = Path.Combine(_crossgenTool.PackagePath, "runtimes", _targetRuntimeIdentifier, "native", "libclrjit.so"); } else if (RuntimeInformation.OSArchitecture == Architecture.X64) + //else if(RuntimeInformation.OSArchitecture == Architecture.X64 || RuntimeInformation.OSArchitecture == Architecture.AMD64) { string xarchPath = (_targetArchitecture == Architecture.Arm ? "x64_arm" : "x64_arm64"); _crossgenTool.ToolPath = Path.Combine(_crossgenTool.PackagePath, "tools", xarchPath, "crossgen"); diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs index 95dc65f15d45..b0856fda4188 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs @@ -24,6 +24,7 @@ public class GivenDotnetBuildInvocation : IClassFixturefoo1 foo2\" -property:_CommandLineDefinedOutputPath=true")] [InlineData(new string[] { "--no-incremental" }, "-target:Rebuild")] [InlineData(new string[] { "-r", "rid" }, "-property:RuntimeIdentifier=rid -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifier=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")] [InlineData(new string[] { "--runtime", "rid" }, "-property:RuntimeIdentifier=rid -property:_CommandLineDefinedRuntimeIdentifier=true")] [InlineData(new string[] { "--use-current-runtime" }, "-property:UseCurrentRuntimeIdentifier=True")] [InlineData(new string[] { "--ucr" }, "-property:UseCurrentRuntimeIdentifier=True")] diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs index 872f19968158..111f3c3420f9 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs @@ -143,5 +143,18 @@ public void CommandsRunWithArchOption(string command) .Should() .Pass(); } + + [Fact] + public void ArchOptionsAMD64toX64() + { + CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () => + { + var msbuildPath = ""; + var command = BuildCommand.FromArgs(new string[] { "--arch", "amd64", "--os", "os" }, msbuildPath); + command.GetArgumentsToMSBuild() + .Should() + .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary -property:RuntimeIdentifier=os-x64 -property:SelfContained=false"); + }); + } } } diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs index 0e58ee9d1e3f..e1acd1938d46 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs @@ -28,6 +28,7 @@ public GivenDotnetPublishInvocation(ITestOutputHelper output) [Theory] [InlineData(new string[] { }, "")] [InlineData(new string[] { "-r", "" }, "-property:RuntimeIdentifier= -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifier=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")] [InlineData(new string[] { "--runtime", "" }, "-property:RuntimeIdentifier= -property:_CommandLineDefinedRuntimeIdentifier=true")] [InlineData(new string[] { "--use-current-runtime" }, "-property:UseCurrentRuntimeIdentifier=True")] [InlineData(new string[] { "--ucr" }, "-property:UseCurrentRuntimeIdentifier=True")] diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs index 596f028e7eab..41d19ac2cde8 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs @@ -34,6 +34,7 @@ public void ItAddsProjectToMsbuildInvocation(string optionName) [InlineData(new string[] { "-f", "" }, @"-property:TargetFramework=")] [InlineData(new string[] { "--framework", "" }, @"-property:TargetFramework=")] [InlineData(new string[] { "-r", "" }, @"-property:RuntimeIdentifier= -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "-r", "linux-amd64" }, @"-property:RuntimeIdentifier=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")] [InlineData(new string[] { "--runtime", "" }, @"-property:RuntimeIdentifier= -property:_CommandLineDefinedRuntimeIdentifier=true")] [InlineData(new string[] { "--use-current-runtime" }, "-property:UseCurrentRuntimeIdentifier=True")] [InlineData(new string[] { "--ucr" }, "-property:UseCurrentRuntimeIdentifier=True")] From 5175aac43422c7b4c2174146aa4daeac25e0a0d3 Mon Sep 17 00:00:00 2001 From: Annie Li Date: Tue, 21 Feb 2023 15:01:54 -0800 Subject: [PATCH 007/135] remove comments --- .../Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs index 35dede7c1db7..5d21bc96e846 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ResolveReadyToRunCompilers.cs @@ -342,7 +342,6 @@ private bool GetCrossgenComponentsPaths() _crossgenTool.ClrJitPath = Path.Combine(_crossgenTool.PackagePath, "runtimes", _targetRuntimeIdentifier, "native", "libclrjit.so"); } else if (RuntimeInformation.OSArchitecture == Architecture.X64) - //else if(RuntimeInformation.OSArchitecture == Architecture.X64 || RuntimeInformation.OSArchitecture == Architecture.AMD64) { string xarchPath = (_targetArchitecture == Architecture.Arm ? "x64_arm" : "x64_arm64"); _crossgenTool.ToolPath = Path.Combine(_crossgenTool.PackagePath, "tools", xarchPath, "crossgen"); From 19dc003938da32124d434a22cd7be548d7e1bc2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 02:38:18 +0000 Subject: [PATCH 008/135] Update dependencies from https://github.com/dotnet/msbuild build 20230222.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.6.0-preview-23121-03 -> To Version 17.6.0-preview-23122-01 --- 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 8a8bb5f25db3..8aab04f220da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://github.com/dotnet/msbuild - 02c4162874fb061081978f49295c3c3cee25978a + 4b5e303b3646131dfbaf425c21021f5233cece8e - + https://github.com/dotnet/msbuild - 02c4162874fb061081978f49295c3c3cee25978a + 4b5e303b3646131dfbaf425c21021f5233cece8e https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bfd76de8a3cc..162847952865 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.6.0-preview-23121-03 + 17.6.0-preview-23122-01 $(MicrosoftBuildPackageVersion) - 7.0.300-preview.true.23115.9 + 7.0.300-preview.true.23122.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.300-preview.true.23115.9 + 7.0.300-preview.true.23122.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 7e2fd11022f4037831fce289c001b519ab3e79c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 17:11:48 +0000 Subject: [PATCH 010/135] Update dependencies from https://github.com/dotnet/arcade build 20230217.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23114.3 -> To Version 7.0.0-beta.23117.3 --- 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 8aab04f220da..a42c93c2592c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -279,22 +279,22 @@ - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 - + https://github.com/dotnet/arcade - 4625a29565a94d3b8c5c680c8f1f1d53b2f216f5 + 555a00b95dd95d956dddf6bb9e213fa27fc61383 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 162847952865..538096e83614 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.23114.3 + 7.0.0-beta.23117.3 7.0.0-preview.22423.2 7.0.1 4.3.0 @@ -188,7 +188,7 @@ 6.10.0 6.1.0 - 7.0.0-beta.23114.3 + 7.0.0-beta.23117.3 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index eed5bb973ff7..b16eeb9ad476 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23114.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23114.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23117.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23117.3" } } From 2cee5b1eee6e37cdfefbba72d0974a5d726e1a5c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 18:59:32 +0000 Subject: [PATCH 011/135] Update dependencies from https://github.com/dotnet/roslyn build 20230222.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.6.0-2.23121.6 -> To Version 4.6.0-2.23122.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 8aab04f220da..c45ea93844a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 4e3a326331862437d984af582ddc4cea50b54a0b - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 4e3a326331862437d984af582ddc4cea50b54a0b - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 4e3a326331862437d984af582ddc4cea50b54a0b - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 4e3a326331862437d984af582ddc4cea50b54a0b - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 4e3a326331862437d984af582ddc4cea50b54a0b - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 4e3a326331862437d984af582ddc4cea50b54a0b - + https://github.com/dotnet/roslyn - e728efff2fe94c2614dd53ae4bd428cb4187753e + 4e3a326331862437d984af582ddc4cea50b54a0b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 162847952865..ab783755bcab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23121.6 - 4.6.0-2.23121.6 - 4.6.0-2.23121.6 - 4.6.0-2.23121.6 - 4.6.0-2.23121.6 - 4.6.0-2.23121.6 - 4.6.0-2.23121.6 + 4.6.0-2.23122.1 + 4.6.0-2.23122.1 + 4.6.0-2.23122.1 + 4.6.0-2.23122.1 + 4.6.0-2.23122.1 + 4.6.0-2.23122.1 + 4.6.0-2.23122.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 4baf469ec89e5ea4b2ae17f6f73b65fc687f48a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 20:37:38 +0000 Subject: [PATCH 012/135] Update dependencies from https://github.com/dotnet/fsharp build 20230222.4 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.300-beta.23114.3 -> To Version 7.0.300-beta.23122.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 8aab04f220da..58b0ab153903 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 4b5e303b3646131dfbaf425c21021f5233cece8e - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e diff --git a/eng/Versions.props b/eng/Versions.props index 162847952865..af8d440d8f34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,7 +138,7 @@ - 12.5.0-beta.23114.3 + 12.5.0-beta.23122.4 From 0b6ad31517b3278521b8ff0d3b2242eade8c19e5 Mon Sep 17 00:00:00 2001 From: Annie Li Date: Wed, 22 Feb 2023 12:45:38 -0800 Subject: [PATCH 013/135] add --arch to restorecommand --- src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index a29848fd0081..f2beec78151d 100644 --- a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -73,7 +73,7 @@ private static Command ConstructCommand() { command.AddOption(option); } - + command.AddOption(CommonOptions.ArchitectureOption); command.SetHandler(RestoreCommand.Run); return command; From 6ca43f219712499e6ee1b8140522c8d36a4f56da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 21:58:33 +0000 Subject: [PATCH 014/135] Update dependencies from https://github.com/dotnet/msbuild build 20230222.3 Microsoft.Build , Microsoft.Build.Localization From Version 17.6.0-preview-23122-01 -> To Version 17.6.0-preview-23122-03 --- 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 8aab04f220da..0b900116ba57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://github.com/dotnet/msbuild - 4b5e303b3646131dfbaf425c21021f5233cece8e + f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 - + https://github.com/dotnet/msbuild - 4b5e303b3646131dfbaf425c21021f5233cece8e + f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 162847952865..1b4ae920fc34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.6.0-preview-23122-01 + 17.6.0-preview-23122-03 $(MicrosoftBuildPackageVersion) - 4.6.0-2.23122.1 - 4.6.0-2.23122.1 - 4.6.0-2.23122.1 - 4.6.0-2.23122.1 - 4.6.0-2.23122.1 - 4.6.0-2.23122.1 - 4.6.0-2.23122.1 + 4.6.0-2.23122.2 + 4.6.0-2.23122.2 + 4.6.0-2.23122.2 + 4.6.0-2.23122.2 + 4.6.0-2.23122.2 + 4.6.0-2.23122.2 + 4.6.0-2.23122.2 $(MicrosoftNetCompilersToolsetPackageVersion) From 93c2d90077513b3b57e9d19f314190fe91f5504f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 22 Feb 2023 22:23:29 +0000 Subject: [PATCH 017/135] Update dependencies from https://github.com/dotnet/roslyn build 20230222.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.6.0-2.23122.2 -> To Version 4.6.0-2.23122.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 ccdacc8ffec1..ef5f773db974 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 0a7aec0241a126ec63511a54bc63d4021acb52f5 + 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/roslyn - 0a7aec0241a126ec63511a54bc63d4021acb52f5 + 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/roslyn - 0a7aec0241a126ec63511a54bc63d4021acb52f5 + 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/roslyn - 0a7aec0241a126ec63511a54bc63d4021acb52f5 + 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/roslyn - 0a7aec0241a126ec63511a54bc63d4021acb52f5 + 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/roslyn - 0a7aec0241a126ec63511a54bc63d4021acb52f5 + 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/roslyn - 0a7aec0241a126ec63511a54bc63d4021acb52f5 + 7347efa598bc5e34086f6c1078f1c0e864400d29 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 24e819139030..acb13aa0b897 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23122.2 - 4.6.0-2.23122.2 - 4.6.0-2.23122.2 - 4.6.0-2.23122.2 - 4.6.0-2.23122.2 - 4.6.0-2.23122.2 - 4.6.0-2.23122.2 + 4.6.0-2.23122.3 + 4.6.0-2.23122.3 + 4.6.0-2.23122.3 + 4.6.0-2.23122.3 + 4.6.0-2.23122.3 + 4.6.0-2.23122.3 + 4.6.0-2.23122.3 $(MicrosoftNetCompilersToolsetPackageVersion) From f00ee271a39c9f3702509875b2a88a49e6783e96 Mon Sep 17 00:00:00 2001 From: Annie Li Date: Wed, 22 Feb 2023 15:51:11 -0800 Subject: [PATCH 018/135] add commonOptions --runtime to restore command --- src/Cli/dotnet/CommonOptions.cs | 4 +--- .../dotnet-restore/RestoreCommandParser.cs | 16 +++++----------- .../GivenDotnetRestoreInvocation.cs | 7 ++++--- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs index e2ca16521ca3..ee4fb619ef97 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -52,9 +52,7 @@ public static Option FrameworkOption(string description) => .AddCompletions(Complete.TargetFrameworksFromProjectFile); private static string RuntimeArgName = CommonLocalizableStrings.RuntimeIdentifierArgumentName; - /*private static Func> RuntimeArgFunc = - o => new string[] { $"-property:RuntimeIdentifier={o}", "-property:_CommandLineDefinedRuntimeIdentifier=true" };*/ - private static IEnumerable RuntimeArgFunc(string rid) + public static IEnumerable RuntimeArgFunc(string rid) { if (GetArchFromRid(rid) == "amd64") { diff --git a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index f2beec78151d..55afb8eb7cbc 100644 --- a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -3,11 +3,10 @@ using System.Collections.Generic; using System.CommandLine; -using System.CommandLine.Invocation; -using System.CommandLine.Parsing; using System.Linq; using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.Restore; +using Microsoft.TemplateEngine.Cli.Commands; using LocalizableStrings = Microsoft.DotNet.Tools.Restore.LocalizableStrings; namespace Microsoft.DotNet.Cli @@ -143,15 +142,10 @@ private static Option[] ImplicitRestoreOptions(bool showHelp, bool useShortOptio if (includeRuntimeOption) { options = options.Append( - new ForwardedOption>( - useShortOptions ? new string[] { "-r", "--runtime" } : new string[] { "--runtime" }, - LocalizableStrings.CmdRuntimeOptionDescription) - { - ArgumentHelpName = LocalizableStrings.CmdRuntimeOption, - IsHidden = !showHelp - }.ForwardAsSingle(o => $"-property:RuntimeIdentifiers={string.Join("%3B", o)}") - .AllowSingleArgPerToken() - .AddCompletions(Complete.RunTimesFromProjectFile) + CommonOptions.RuntimeOption + .WithDescription(LocalizableStrings.CmdRuntimeOptionDescription) + .AllowSingleArgPerToken() + .AddCompletions(Complete.RunTimesFromProjectFile) ).ToArray(); } diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs index 9dbc3c6530ad..aba8045f1b1b 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs @@ -24,9 +24,10 @@ public class GivenDotnetRestoreInvocation : IClassFixture" }, "-property:RestoreSources=")] [InlineData(new string[] { "--source", "" }, "-property:RestoreSources=")] [InlineData(new string[] { "-s", "", "-s", "" }, "-property:RestoreSources=%3B")] - [InlineData(new string[] { "-r", "" }, "-property:RuntimeIdentifiers=")] - [InlineData(new string[] { "--runtime", "" }, "-property:RuntimeIdentifiers=")] - [InlineData(new string[] { "-r", "", "-r", "" }, "-property:RuntimeIdentifiers=%3B")] + [InlineData(new string[] { "-r", "" }, "-property:RuntimeIdentifiers= -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifiers=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "--runtime", "" }, "-property:RuntimeIdentifiers= -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "-r", "", "-r", "" }, "-property:RuntimeIdentifiers=%3B -property:_CommandLineDefinedRuntimeIdentifier=true")] [InlineData(new string[] { "--packages", "" }, "-property:RestorePackagesPath=")] [InlineData(new string[] { "--disable-parallel" }, "-property:RestoreDisableParallel=true")] [InlineData(new string[] { "--configfile", "" }, "-property:RestoreConfigFile=")] From 854826d569ad743a0d55fde44a7d642e5d646745 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 08:06:48 +0000 Subject: [PATCH 019/135] [release/7.0.3xx] Update dependencies from dotnet/razor (#30766) [release/7.0.3xx] Update dependencies from dotnet/razor - Bump required MSBuild version --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- .../BuildWithComponentsIntegrationTest.cs | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d9d06575912..f10ac6cf7b7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -216,22 +216,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://github.com/dotnet/razor - 23245e6bf9f65ef800009909a5de3e3ebb3f075e + cd9273ff529ec2103c054c0620870d977c08e0a9 - + https://github.com/dotnet/razor - 23245e6bf9f65ef800009909a5de3e3ebb3f075e + cd9273ff529ec2103c054c0620870d977c08e0a9 - + https://github.com/dotnet/razor - 23245e6bf9f65ef800009909a5de3e3ebb3f075e + cd9273ff529ec2103c054c0620870d977c08e0a9 - + https://github.com/dotnet/razor - 23245e6bf9f65ef800009909a5de3e3ebb3f075e + cd9273ff529ec2103c054c0620870d977c08e0a9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b8640a153800..e47de2e7d874 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,10 +162,10 @@ - 7.0.0-preview.23107.1 - 7.0.0-preview.23107.1 - 7.0.0-preview.23107.1 - 7.0.0-preview.23107.1 + 7.0.0-preview.23122.4 + 7.0.0-preview.23122.4 + 7.0.0-preview.23122.4 + 7.0.0-preview.23122.4 diff --git a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs index f534deda86a7..193d9d3f0580 100644 --- a/src/Tests/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs +++ b/src/Tests/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs @@ -21,7 +21,7 @@ public BuildWithComponentsIntegrationTest(ITestOutputHelper log) : base(log) {} [CoreMSBuildOnlyFact] public void Build_Components_WithDotNetCoreMSBuild_Works() => Build_ComponentsWorks(); - [RequiresMSBuildVersionFact("17.0.0.32901")] + [RequiresMSBuildVersionFact("17.5.0.52501")] public void Build_Components_WithDesktopMSBuild_Works() => Build_ComponentsWorks(); [Fact] From dce39898eaecc0f74a0685eca0e7dc446bfdb136 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 11:11:43 +0000 Subject: [PATCH 020/135] Update dependencies from https://github.com/dotnet/templating build 20230223.1 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-preview.2.23122.3 -> To Version 8.0.100-preview.2.23123.1 --- 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 1bec18114bb6..68454547d76c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 38cb2e434cc8c6f1de7f44386c9c9dc0c75792cb + cf3338948fb34b5ba3f3f2d44a23831b611a3909 diff --git a/eng/Versions.props b/eng/Versions.props index 6f087d92ffbf..cafb0052de5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,7 +120,7 @@ - 8.0.100-preview.2.23122.3 + 8.0.100-preview.2.23123.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 84978d5523a5fc9bcd6fa63990a16690b70cbe16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 13:14:52 +0000 Subject: [PATCH 021/135] Update dependencies from https://github.com/dotnet/fsharp build 20230222.4 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.300-beta.23114.3 -> To Version 7.0.300-beta.23122.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 1bec18114bb6..ed0ad27a68ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,13 +50,13 @@ https://github.com/dotnet/msbuild 4b5e303b3646131dfbaf425c21021f5233cece8e - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e - + https://github.com/dotnet/fsharp - 75647e8f098a1a2b50d4d755394598ae6f38b164 + 0b0c07d12f64502d28312d679a966b3f2285244e diff --git a/eng/Versions.props b/eng/Versions.props index 6f087d92ffbf..5fac8796fe27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.5.0-beta.23114.3 + 12.5.0-beta.23122.4 From 91952a2acfa2abfac9f6bcec055662bbc1b06054 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 13:29:58 +0000 Subject: [PATCH 022/135] Update dependencies from https://github.com/dotnet/source-build-externals build 20230222.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23121.1 -> To Version 8.0.0-alpha.1.23122.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 1bec18114bb6..06f7c44590a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -254,9 +254,9 @@ 8374d5fca634a93458c84414b1604c12f765d1ab - + https://github.com/dotnet/source-build-externals - 616f121630a3c46bff2cd7f50640f051f446070d + 54b1cf7905203a71e6883d2a3b8ea61d487cefdb From 425b975247bbed5139231a90329bb89c03fe4bdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 14:06:48 +0000 Subject: [PATCH 023/135] Update dependencies from https://github.com/dotnet/msbuild build 20230222.3 Microsoft.Build , Microsoft.Build.Localization From Version 17.6.0-preview-23122-01 -> To Version 17.6.0-preview-23122-03 --- 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 1bec18114bb6..7ea04d0cad38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/runtime 3adabbcf308556bd0506c2dc3d82a022c8751456 - + https://github.com/dotnet/msbuild - 4b5e303b3646131dfbaf425c21021f5233cece8e + f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 - + https://github.com/dotnet/msbuild - 4b5e303b3646131dfbaf425c21021f5233cece8e + f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6f087d92ffbf..d8c33d71d40d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,7 +100,7 @@ - 17.6.0-preview-23122-01 + 17.6.0-preview-23122-03 $(MicrosoftBuildPackageVersion) - 7.0.300-preview.true.23122.2 + 7.0.300-preview.true.23123.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 7.0.300-preview.true.23122.2 + 7.0.300-preview.true.23123.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 4f5c212b37b37cd76f32601cf4d3ee052f47ca66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 16:01:15 +0000 Subject: [PATCH 025/135] Update dependencies from https://github.com/dotnet/templating build 20230223.2 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-preview.2.23122.3 -> To Version 8.0.100-preview.2.23123.2 --- 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 68454547d76c..c44dd90ae912 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - cf3338948fb34b5ba3f3f2d44a23831b611a3909 + 5ff28f5739bef80d0a30923b05f3f49d5d47541c diff --git a/eng/Versions.props b/eng/Versions.props index cafb0052de5b..119ee16178b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,7 +120,7 @@ - 8.0.100-preview.2.23123.1 + 8.0.100-preview.2.23123.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 069c0aaa3e6d4c00cb87a855a29580c02b37e5b8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 23 Feb 2023 16:02:59 +0000 Subject: [PATCH 026/135] [main] Update dependencies from dotnet/runtime (#30799) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bec18114bb6..7b0631b26f47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 38cb2e434cc8c6f1de7f44386c9c9dc0c75792cb - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - 3adabbcf308556bd0506c2dc3d82a022c8751456 + af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 6f087d92ffbf..34ddeadd5dc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.1 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.1 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.1 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 From 92e8c1ccc3e1ad3639643019c4d1f0257cbe411b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 23 Feb 2023 17:39:10 +0100 Subject: [PATCH 027/135] Fix GenAPI invocation with IncludeAssemblyAttributes (#30779) --- src/GenAPI/Microsoft.DotNet.GenAPI.Task/GenAPITask.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI.Task/GenAPITask.cs b/src/GenAPI/Microsoft.DotNet.GenAPI.Task/GenAPITask.cs index 31b5de0dc5a0..33ddba211b3a 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI.Task/GenAPITask.cs +++ b/src/GenAPI/Microsoft.DotNet.GenAPI.Task/GenAPITask.cs @@ -57,7 +57,7 @@ public class GenAPITask : TaskBase /// /// Includes assembly attributes which are values that provide information about an assembly. /// - public bool IncludeAssemblyAttributes { get; } + public bool IncludeAssemblyAttributes { get; set; } protected override void ExecuteCore() { From 07d8e6bb2f6b37231bf3b078e839377c151a5438 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 17:12:32 +0000 Subject: [PATCH 028/135] Update dependencies from https://github.com/dotnet/runtime build 20230223.2 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23123.1 -> To Version 8.0.0-preview.2.23123.2 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7162d6980f69..1636ec192cb0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 38cb2e434cc8c6f1de7f44386c9c9dc0c75792cb - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - af18fd07d1bb5a0d923a49c39b19c6fbcb6dc07b + 71753c417b760a4f6900840b4497c7c6866ebf82 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index aea7c4d57e0a..aa4c1371f224 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.2 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.2 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.2 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.2 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.2 From 0baa9a8ca662f28959df84446e98b155c607a966 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 17:24:45 +0000 Subject: [PATCH 029/135] Update dependencies from https://github.com/nuget/nuget.client build 6.6.0.27 NuGet.Build.Tasks From Version 6.6.0-preview.2.23 -> To Version 6.6.0-preview.2.27 --- 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 7162d6980f69..0871a5801132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -101,9 +101,9 @@ https://github.com/dotnet/aspnetcore ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/nuget/nuget.client - 00375a7dfc2e2687c95ada0a0d24b570dc807d5d + 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index aea7c4d57e0a..b5b3289950d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ - 6.6.0-preview.2.23 + 6.6.0-preview.2.27 $(NuGetBuildTasksPackageVersion) 6.0.0-rc.278 $(NuGetBuildTasksPackageVersion) From c59d79810f121c15ea6416798cf443d5ed3710e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 17:24:55 +0000 Subject: [PATCH 030/135] Update dependencies from https://github.com/nuget/nuget.client build 6.6.0.27 NuGet.Build.Tasks From Version 6.6.0-preview.2.22 -> To Version 6.6.0-preview.2.27 --- 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 596363415d2c..c0c70d7f5ad0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,9 +105,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://github.com/nuget/nuget.client - 55728432057dc57733661fe01e9c8493ab5034f2 + 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 3ccd6ec4b04a..6b3c440882dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ - 6.6.0-preview.2.22 + 6.6.0-preview.2.27 $(NuGetBuildTasksPackageVersion) 6.0.0-rc.278 $(NuGetBuildTasksPackageVersion) From 3aa0469fd22074b97f77404838cfe6fddfea94a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 18:46:21 +0000 Subject: [PATCH 031/135] Update dependencies from https://github.com/dotnet/fsharp build 20230223.2 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.300-beta.23122.4 -> To Version 7.0.300-beta.23123.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 596363415d2c..8e8101815e8d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 77528ef88dcffb9a089bea428bc95037a089a206 - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 77528ef88dcffb9a089bea428bc95037a089a206 diff --git a/eng/Versions.props b/eng/Versions.props index 3ccd6ec4b04a..b0854f02aa85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,7 +138,7 @@ - 12.5.0-beta.23122.4 + 12.5.0-beta.23123.2 From 50e76eb8d11e07d65c45e4d893ef099dd29570bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 19:14:49 +0000 Subject: [PATCH 032/135] Update dependencies from https://github.com/dotnet/aspnetcore build 20230223.1 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-preview.2.23122.6 -> To Version 8.0.0-preview.2.23123.1 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 962acdd64907..c5a110ee276d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf c37ab558d3aebf3bfe0038c86e8a4be78d09e03c - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor cd9273ff529ec2103c054c0620870d977c08e0a9 - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e - + https://github.com/dotnet/aspnetcore - ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 + 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 39369e3acbb8..8284a5d81ce0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 - 8.0.0-preview.2.23122.6 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.1 From ff1514f5d0d24cf0ee048667e8ae58595385fd57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 20:57:44 +0000 Subject: [PATCH 033/135] Update dependencies from https://github.com/dotnet/aspnetcore build 20230223.3 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-preview.2.23122.6 -> To Version 8.0.0-preview.2.23123.3 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5a110ee276d..d422c1a85ee2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf c37ab558d3aebf3bfe0038c86e8a4be78d09e03c - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor cd9273ff529ec2103c054c0620870d977c08e0a9 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 - + https://github.com/dotnet/aspnetcore - 91fd14d0cefdf238e56ca9ab2ee7d7b8c2a8386e + 05b6233613818753242df96b0e5ca2fc82b3a809 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 8284a5d81ce0..37adbc012764 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 - 8.0.0-preview.2.23123.1 + 8.0.0-preview.2.23123.3 + 8.0.0-preview.2.23123.3 + 8.0.0-preview.2.23123.3 + 8.0.0-preview.2.23123.3 + 8.0.0-preview.2.23123.3 + 8.0.0-preview.2.23123.3 From 3b28d10b1c10eadccc414786e0e0bb49bab08950 Mon Sep 17 00:00:00 2001 From: Annie Li Date: Thu, 23 Feb 2023 13:51:36 -0800 Subject: [PATCH 034/135] fix rid tests plural --- .../dotnet-msbuild/GivenDotnetRestoreInvocation.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs index aba8045f1b1b..c103259ad719 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs @@ -24,9 +24,9 @@ public class GivenDotnetRestoreInvocation : IClassFixture" }, "-property:RestoreSources=")] [InlineData(new string[] { "--source", "" }, "-property:RestoreSources=")] [InlineData(new string[] { "-s", "", "-s", "" }, "-property:RestoreSources=%3B")] - [InlineData(new string[] { "-r", "" }, "-property:RuntimeIdentifiers= -property:_CommandLineDefinedRuntimeIdentifier=true")] - [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifiers=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")] - [InlineData(new string[] { "--runtime", "" }, "-property:RuntimeIdentifiers= -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "-r", "" }, "-property:RuntimeIdentifier= -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifier=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "--runtime", "" }, "-property:RuntimeIdentifier= -property:_CommandLineDefinedRuntimeIdentifier=true")] [InlineData(new string[] { "-r", "", "-r", "" }, "-property:RuntimeIdentifiers=%3B -property:_CommandLineDefinedRuntimeIdentifier=true")] [InlineData(new string[] { "--packages", "" }, "-property:RestorePackagesPath=")] [InlineData(new string[] { "--disable-parallel" }, "-property:RestoreDisableParallel=true")] From 4f981fc86d2c9c489dcbbb6c8e288e51b2a962df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 22:27:04 +0000 Subject: [PATCH 035/135] Update dependencies from https://github.com/dotnet/arcade build 20230222.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 7.0.0-beta.23117.3 -> To Version 7.0.0-beta.23122.4 --- 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 596363415d2c..326a68dd780c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -279,22 +279,22 @@ - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be - + https://github.com/dotnet/arcade - 555a00b95dd95d956dddf6bb9e213fa27fc61383 + 2e0fab0209c66d181d93b0d03bc267db5bde75be https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3ccd6ec4b04a..b840ea043373 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 6.0.0 4.0.0 6.0.0 - 7.0.0-beta.23117.3 + 7.0.0-beta.23122.4 7.0.0-preview.22423.2 7.0.1 4.3.0 @@ -188,7 +188,7 @@ 6.10.0 6.1.0 - 7.0.0-beta.23117.3 + 7.0.0-beta.23122.4 4.8.2 6.0.0-beta.22262.1 diff --git a/global.json b/global.json index b16eeb9ad476..742cd9069aab 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23117.3", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23117.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23122.4", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.23122.4" } } From 3c4385a014d91a21e2c725bbec7b00190d1bfd06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 22:40:31 +0000 Subject: [PATCH 036/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.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.6.0-2.23122.3 -> To Version 4.6.0-2.23123.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 596363415d2c..3bc679fc0635 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + ef9c5b351872d5f4230a1542b9e43c789bdb582d - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + ef9c5b351872d5f4230a1542b9e43c789bdb582d - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + ef9c5b351872d5f4230a1542b9e43c789bdb582d - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + ef9c5b351872d5f4230a1542b9e43c789bdb582d - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + ef9c5b351872d5f4230a1542b9e43c789bdb582d - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + ef9c5b351872d5f4230a1542b9e43c789bdb582d - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + ef9c5b351872d5f4230a1542b9e43c789bdb582d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3ccd6ec4b04a..2e8da9625fad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 + 4.6.0-2.23123.1 + 4.6.0-2.23123.1 + 4.6.0-2.23123.1 + 4.6.0-2.23123.1 + 4.6.0-2.23123.1 + 4.6.0-2.23123.1 + 4.6.0-2.23123.1 $(MicrosoftNetCompilersToolsetPackageVersion) From c2bde646cc3229191b38f09fbaf71865af7170a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 22:40:49 +0000 Subject: [PATCH 037/135] Update dependencies from https://github.com/dotnet/aspnetcore build 20230223.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-preview.2.23122.6 -> To Version 8.0.0-preview.2.23123.4 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d422c1a85ee2..6d13ec9c346e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn 7347efa598bc5e34086f6c1078f1c0e864400d29 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf c37ab558d3aebf3bfe0038c86e8a4be78d09e03c - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor cd9273ff529ec2103c054c0620870d977c08e0a9 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 - + https://github.com/dotnet/aspnetcore - 05b6233613818753242df96b0e5ca2fc82b3a809 + f09180f1154a47f1e1dc9a9b46130ef058248a85 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 37adbc012764..7e8589df0d10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.2.23123.3 - 8.0.0-preview.2.23123.3 - 8.0.0-preview.2.23123.3 - 8.0.0-preview.2.23123.3 - 8.0.0-preview.2.23123.3 - 8.0.0-preview.2.23123.3 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 From be03c19df5c3ede4cae13d825421fa266371fd05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 23:31:11 +0000 Subject: [PATCH 038/135] Update dependencies from https://github.com/dotnet/razor build 20230223.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23122.4 -> To Version 7.0.0-preview.23123.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 962acdd64907..ceb0ace3bc6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,22 +198,22 @@ https://github.com/dotnet/aspnetcore ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/razor - cd9273ff529ec2103c054c0620870d977c08e0a9 + d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb - + https://github.com/dotnet/razor - cd9273ff529ec2103c054c0620870d977c08e0a9 + d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb - + https://github.com/dotnet/razor - cd9273ff529ec2103c054c0620870d977c08e0a9 + d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb - + https://github.com/dotnet/razor - cd9273ff529ec2103c054c0620870d977c08e0a9 + d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 39369e3acbb8..43be521d9df0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,10 +158,10 @@ - 7.0.0-preview.23122.4 - 7.0.0-preview.23122.4 - 7.0.0-preview.23122.4 - 7.0.0-preview.23122.4 + 7.0.0-preview.23123.1 + 7.0.0-preview.23123.1 + 7.0.0-preview.23123.1 + 7.0.0-preview.23123.1 From 25a13a37b00a0f043b624985d27ef15796de6de9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 23 Feb 2023 23:31:24 +0000 Subject: [PATCH 039/135] Update dependencies from https://github.com/dotnet/razor build 20230223.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23122.4 -> To Version 7.0.0-preview.23123.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 596363415d2c..144aaad8ffc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -216,22 +216,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://github.com/dotnet/razor - cd9273ff529ec2103c054c0620870d977c08e0a9 + d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb - + https://github.com/dotnet/razor - cd9273ff529ec2103c054c0620870d977c08e0a9 + d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb - + https://github.com/dotnet/razor - cd9273ff529ec2103c054c0620870d977c08e0a9 + d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb - + https://github.com/dotnet/razor - cd9273ff529ec2103c054c0620870d977c08e0a9 + d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3ccd6ec4b04a..0a132bbfbb2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,10 +162,10 @@ - 7.0.0-preview.23122.4 - 7.0.0-preview.23122.4 - 7.0.0-preview.23122.4 - 7.0.0-preview.23122.4 + 7.0.0-preview.23123.1 + 7.0.0-preview.23123.1 + 7.0.0-preview.23123.1 + 7.0.0-preview.23123.1 From caa8daf75bf76c3fb089f7b9a5e9e0e4afc4d3e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 00:11:55 +0000 Subject: [PATCH 040/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.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.6.0-2.23122.3 -> To Version 4.6.0-2.23123.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 3bc679fc0635..512ecd2d4c8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - ef9c5b351872d5f4230a1542b9e43c789bdb582d + 8a377b08fbfdd84a162a01226f8367a458855807 - + https://github.com/dotnet/roslyn - ef9c5b351872d5f4230a1542b9e43c789bdb582d + 8a377b08fbfdd84a162a01226f8367a458855807 - + https://github.com/dotnet/roslyn - ef9c5b351872d5f4230a1542b9e43c789bdb582d + 8a377b08fbfdd84a162a01226f8367a458855807 - + https://github.com/dotnet/roslyn - ef9c5b351872d5f4230a1542b9e43c789bdb582d + 8a377b08fbfdd84a162a01226f8367a458855807 - + https://github.com/dotnet/roslyn - ef9c5b351872d5f4230a1542b9e43c789bdb582d + 8a377b08fbfdd84a162a01226f8367a458855807 - + https://github.com/dotnet/roslyn - ef9c5b351872d5f4230a1542b9e43c789bdb582d + 8a377b08fbfdd84a162a01226f8367a458855807 - + https://github.com/dotnet/roslyn - ef9c5b351872d5f4230a1542b9e43c789bdb582d + 8a377b08fbfdd84a162a01226f8367a458855807 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2e8da9625fad..93dd40d72fde 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.1 - 4.6.0-2.23123.1 - 4.6.0-2.23123.1 - 4.6.0-2.23123.1 - 4.6.0-2.23123.1 - 4.6.0-2.23123.1 - 4.6.0-2.23123.1 + 4.6.0-2.23123.2 + 4.6.0-2.23123.2 + 4.6.0-2.23123.2 + 4.6.0-2.23123.2 + 4.6.0-2.23123.2 + 4.6.0-2.23123.2 + 4.6.0-2.23123.2 $(MicrosoftNetCompilersToolsetPackageVersion) From 2a17d9c4346af11d3e1292e414e83ce9f8229fc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 00:37:20 +0000 Subject: [PATCH 041/135] Update dependencies from https://github.com/dotnet/runtime build 20230223.4 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23123.1 -> To Version 8.0.0-preview.2.23123.4 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1636ec192cb0..8a5d3796d716 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 38cb2e434cc8c6f1de7f44386c9c9dc0c75792cb - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - 71753c417b760a4f6900840b4497c7c6866ebf82 + ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index aa4c1371f224..9bb5097066fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.4 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.4 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23123.2 - 8.0.0-preview.2.23123.2 - 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23123.2 - 8.0.0-preview.2.23123.2 - 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.4 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23123.2 - 8.0.0-preview.2.23123.2 - 8.0.0-preview.2.23123.2 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.4 From 88c0f2d8382c8a3c67a70c35617584fe883fde94 Mon Sep 17 00:00:00 2001 From: Annie Li Date: Thu, 23 Feb 2023 16:58:18 -0800 Subject: [PATCH 042/135] fix dotnet restore command -r/--runtime for amd64-x64 --- .../dotnet-restore/RestoreCommandParser.cs | 33 ++++++++++++++++--- .../GivenDotnetRestoreInvocation.cs | 15 ++++----- 2 files changed, 35 insertions(+), 13 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs index 55afb8eb7cbc..af480bfff3d9 100644 --- a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs +++ b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs @@ -1,9 +1,11 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. +using System; using System.Collections.Generic; using System.CommandLine; using System.Linq; +using System.Reflection.Metadata.Ecma335; using Microsoft.DotNet.Tools; using Microsoft.DotNet.Tools.Restore; using Microsoft.TemplateEngine.Cli.Commands; @@ -85,6 +87,24 @@ public static void AddImplicitRestoreOptions(Command command, bool showHelp = fa command.AddOption(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) + { + List convertedRids = new(); + foreach (string rid in rids) + { + if (GetArchFromRid(rid.ToString()) == "amd64") + { + convertedRids.Add($"{GetOsFromRid(rid.ToString())}-x64"); + } + else + { + convertedRids.Add($"{rid}"); + } + } + return $"-property:RuntimeIdentifiers={string.Join("%3B", convertedRids)}"; + } private static Option[] ImplicitRestoreOptions(bool showHelp, bool useShortOptions, bool includeRuntimeOption, bool includeNoDependenciesOption) { @@ -142,10 +162,15 @@ private static Option[] ImplicitRestoreOptions(bool showHelp, bool useShortOptio if (includeRuntimeOption) { options = options.Append( - CommonOptions.RuntimeOption - .WithDescription(LocalizableStrings.CmdRuntimeOptionDescription) - .AllowSingleArgPerToken() - .AddCompletions(Complete.RunTimesFromProjectFile) + new ForwardedOption>( + useShortOptions ? new string[] { "-r", "--runtime" } : new string[] { "--runtime" }, + LocalizableStrings.CmdRuntimeOptionDescription) + { + ArgumentHelpName = LocalizableStrings.CmdRuntimeOption, + IsHidden = !showHelp + }.ForwardAsSingle(RestoreRuntimeArgFunc) + .AllowSingleArgPerToken() + .AddCompletions(Complete.RunTimesFromProjectFile) ).ToArray(); } diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs index c103259ad719..448387d74b13 100644 --- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs +++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs @@ -1,13 +1,10 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.DotNet.Tools.Restore; using FluentAssertions; -using Xunit; -using System; -using System.IO; -using System.Runtime.InteropServices; +using Microsoft.DotNet.Tools.Restore; using Microsoft.NET.TestFramework; +using Xunit; namespace Microsoft.DotNet.Cli.MSBuild.Tests { @@ -24,10 +21,10 @@ public class GivenDotnetRestoreInvocation : IClassFixture" }, "-property:RestoreSources=")] [InlineData(new string[] { "--source", "" }, "-property:RestoreSources=")] [InlineData(new string[] { "-s", "", "-s", "" }, "-property:RestoreSources=%3B")] - [InlineData(new string[] { "-r", "" }, "-property:RuntimeIdentifier= -property:_CommandLineDefinedRuntimeIdentifier=true")] - [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifier=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")] - [InlineData(new string[] { "--runtime", "" }, "-property:RuntimeIdentifier= -property:_CommandLineDefinedRuntimeIdentifier=true")] - [InlineData(new string[] { "-r", "", "-r", "" }, "-property:RuntimeIdentifiers=%3B -property:_CommandLineDefinedRuntimeIdentifier=true")] + [InlineData(new string[] { "-r", "" }, "-property:RuntimeIdentifiers=")] + [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifiers=linux-x64")] + [InlineData(new string[] { "--runtime", "" }, "-property:RuntimeIdentifiers=")] + [InlineData(new string[] { "-r", "", "-r", "" }, "-property:RuntimeIdentifiers=%3B")] [InlineData(new string[] { "--packages", "" }, "-property:RestorePackagesPath=")] [InlineData(new string[] { "--disable-parallel" }, "-property:RestoreDisableParallel=true")] [InlineData(new string[] { "--configfile", "" }, "-property:RestoreConfigFile=")] From bb1475d0217dcb50642d07d58059b978fb128fb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 01:50:07 +0000 Subject: [PATCH 043/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.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.6.0-2.23122.3 -> To Version 4.6.0-2.23123.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 512ecd2d4c8f..b6dc02a3f75f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 8a377b08fbfdd84a162a01226f8367a458855807 + b172185a13f2699080f4b49c2b6b56302694c3fb - + https://github.com/dotnet/roslyn - 8a377b08fbfdd84a162a01226f8367a458855807 + b172185a13f2699080f4b49c2b6b56302694c3fb - + https://github.com/dotnet/roslyn - 8a377b08fbfdd84a162a01226f8367a458855807 + b172185a13f2699080f4b49c2b6b56302694c3fb - + https://github.com/dotnet/roslyn - 8a377b08fbfdd84a162a01226f8367a458855807 + b172185a13f2699080f4b49c2b6b56302694c3fb - + https://github.com/dotnet/roslyn - 8a377b08fbfdd84a162a01226f8367a458855807 + b172185a13f2699080f4b49c2b6b56302694c3fb - + https://github.com/dotnet/roslyn - 8a377b08fbfdd84a162a01226f8367a458855807 + b172185a13f2699080f4b49c2b6b56302694c3fb - + https://github.com/dotnet/roslyn - 8a377b08fbfdd84a162a01226f8367a458855807 + b172185a13f2699080f4b49c2b6b56302694c3fb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 93dd40d72fde..c1905688061c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.2 - 4.6.0-2.23123.2 - 4.6.0-2.23123.2 - 4.6.0-2.23123.2 - 4.6.0-2.23123.2 - 4.6.0-2.23123.2 - 4.6.0-2.23123.2 + 4.6.0-2.23123.3 + 4.6.0-2.23123.3 + 4.6.0-2.23123.3 + 4.6.0-2.23123.3 + 4.6.0-2.23123.3 + 4.6.0-2.23123.3 + 4.6.0-2.23123.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 0e0958c45e111742ec77e6c8c04ef04c73d8f170 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 01:50:24 +0000 Subject: [PATCH 044/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.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.6.0-2.23123.3 -> To Version 4.6.0-2.23123.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 b6dc02a3f75f..e3e57c248775 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - b172185a13f2699080f4b49c2b6b56302694c3fb + 3a37d24e920bc15526d8f08703c7f32965ecb7c9 - + https://github.com/dotnet/roslyn - b172185a13f2699080f4b49c2b6b56302694c3fb + 3a37d24e920bc15526d8f08703c7f32965ecb7c9 - + https://github.com/dotnet/roslyn - b172185a13f2699080f4b49c2b6b56302694c3fb + 3a37d24e920bc15526d8f08703c7f32965ecb7c9 - + https://github.com/dotnet/roslyn - b172185a13f2699080f4b49c2b6b56302694c3fb + 3a37d24e920bc15526d8f08703c7f32965ecb7c9 - + https://github.com/dotnet/roslyn - b172185a13f2699080f4b49c2b6b56302694c3fb + 3a37d24e920bc15526d8f08703c7f32965ecb7c9 - + https://github.com/dotnet/roslyn - b172185a13f2699080f4b49c2b6b56302694c3fb + 3a37d24e920bc15526d8f08703c7f32965ecb7c9 - + https://github.com/dotnet/roslyn - b172185a13f2699080f4b49c2b6b56302694c3fb + 3a37d24e920bc15526d8f08703c7f32965ecb7c9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c1905688061c..905947f5f673 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.3 - 4.6.0-2.23123.3 - 4.6.0-2.23123.3 - 4.6.0-2.23123.3 - 4.6.0-2.23123.3 - 4.6.0-2.23123.3 - 4.6.0-2.23123.3 + 4.6.0-2.23123.4 + 4.6.0-2.23123.4 + 4.6.0-2.23123.4 + 4.6.0-2.23123.4 + 4.6.0-2.23123.4 + 4.6.0-2.23123.4 + 4.6.0-2.23123.4 $(MicrosoftNetCompilersToolsetPackageVersion) From 14b319a0e7983ae2b985c182170479cdd46ccaa9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 01:50:42 +0000 Subject: [PATCH 045/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.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.6.0-2.23123.4 -> To Version 4.6.0-2.23123.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 e3e57c248775..04c56de0f129 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 3a37d24e920bc15526d8f08703c7f32965ecb7c9 + 104f0dcd74804aaf0b02df745910e9ab3973d758 - + https://github.com/dotnet/roslyn - 3a37d24e920bc15526d8f08703c7f32965ecb7c9 + 104f0dcd74804aaf0b02df745910e9ab3973d758 - + https://github.com/dotnet/roslyn - 3a37d24e920bc15526d8f08703c7f32965ecb7c9 + 104f0dcd74804aaf0b02df745910e9ab3973d758 - + https://github.com/dotnet/roslyn - 3a37d24e920bc15526d8f08703c7f32965ecb7c9 + 104f0dcd74804aaf0b02df745910e9ab3973d758 - + https://github.com/dotnet/roslyn - 3a37d24e920bc15526d8f08703c7f32965ecb7c9 + 104f0dcd74804aaf0b02df745910e9ab3973d758 - + https://github.com/dotnet/roslyn - 3a37d24e920bc15526d8f08703c7f32965ecb7c9 + 104f0dcd74804aaf0b02df745910e9ab3973d758 - + https://github.com/dotnet/roslyn - 3a37d24e920bc15526d8f08703c7f32965ecb7c9 + 104f0dcd74804aaf0b02df745910e9ab3973d758 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 905947f5f673..9de9150a8b44 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.4 - 4.6.0-2.23123.4 - 4.6.0-2.23123.4 - 4.6.0-2.23123.4 - 4.6.0-2.23123.4 - 4.6.0-2.23123.4 - 4.6.0-2.23123.4 + 4.6.0-2.23123.5 + 4.6.0-2.23123.5 + 4.6.0-2.23123.5 + 4.6.0-2.23123.5 + 4.6.0-2.23123.5 + 4.6.0-2.23123.5 + 4.6.0-2.23123.5 $(MicrosoftNetCompilersToolsetPackageVersion) From 8fe4d1786f6b6ee7f1667f3802f91f019ea097ed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 02:20:55 +0000 Subject: [PATCH 046/135] Update dependencies from https://github.com/dotnet/razor build 20230223.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23123.1 -> To Version 7.0.0-preview.23123.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ceb0ace3bc6e..654efd58e7b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,22 +198,22 @@ https://github.com/dotnet/aspnetcore ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21 - + https://github.com/dotnet/razor - d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb + 07658577ff1f8c49f6abc92b5bbdc46431380553 - + https://github.com/dotnet/razor - d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb + 07658577ff1f8c49f6abc92b5bbdc46431380553 - + https://github.com/dotnet/razor - d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb + 07658577ff1f8c49f6abc92b5bbdc46431380553 - + https://github.com/dotnet/razor - d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb + 07658577ff1f8c49f6abc92b5bbdc46431380553 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 43be521d9df0..31582917c88d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,10 +158,10 @@ - 7.0.0-preview.23123.1 - 7.0.0-preview.23123.1 - 7.0.0-preview.23123.1 - 7.0.0-preview.23123.1 + 7.0.0-preview.23123.2 + 7.0.0-preview.23123.2 + 7.0.0-preview.23123.2 + 7.0.0-preview.23123.2 From 7c1b8782ea30912867ba30d4f3c5d5376df739bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 02:21:07 +0000 Subject: [PATCH 047/135] Update dependencies from https://github.com/dotnet/razor build 20230223.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23123.1 -> To Version 7.0.0-preview.23123.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba469e5773f8..62f879a5c0bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -216,22 +216,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://github.com/dotnet/razor - d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb + 07658577ff1f8c49f6abc92b5bbdc46431380553 - + https://github.com/dotnet/razor - d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb + 07658577ff1f8c49f6abc92b5bbdc46431380553 - + https://github.com/dotnet/razor - d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb + 07658577ff1f8c49f6abc92b5bbdc46431380553 - + https://github.com/dotnet/razor - d1326adea4c8fc8653e2e4fa9a6c45fda8c900cb + 07658577ff1f8c49f6abc92b5bbdc46431380553 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 137b66c5a920..4fd563f55c27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,10 +162,10 @@ - 7.0.0-preview.23123.1 - 7.0.0-preview.23123.1 - 7.0.0-preview.23123.1 - 7.0.0-preview.23123.1 + 7.0.0-preview.23123.2 + 7.0.0-preview.23123.2 + 7.0.0-preview.23123.2 + 7.0.0-preview.23123.2 From 2a72fd7690df09c2e20e84e45543a72e7d201bb8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 03:01:19 +0000 Subject: [PATCH 048/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.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.6.0-2.23123.5 -> To Version 4.6.0-2.23123.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 c9a9698474e8..c3a56f53ff16 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 104f0dcd74804aaf0b02df745910e9ab3973d758 + 78e476af91662513e38f7afe9facd1b9c975f333 - + https://github.com/dotnet/roslyn - 104f0dcd74804aaf0b02df745910e9ab3973d758 + 78e476af91662513e38f7afe9facd1b9c975f333 - + https://github.com/dotnet/roslyn - 104f0dcd74804aaf0b02df745910e9ab3973d758 + 78e476af91662513e38f7afe9facd1b9c975f333 - + https://github.com/dotnet/roslyn - 104f0dcd74804aaf0b02df745910e9ab3973d758 + 78e476af91662513e38f7afe9facd1b9c975f333 - + https://github.com/dotnet/roslyn - 104f0dcd74804aaf0b02df745910e9ab3973d758 + 78e476af91662513e38f7afe9facd1b9c975f333 - + https://github.com/dotnet/roslyn - 104f0dcd74804aaf0b02df745910e9ab3973d758 + 78e476af91662513e38f7afe9facd1b9c975f333 - + https://github.com/dotnet/roslyn - 104f0dcd74804aaf0b02df745910e9ab3973d758 + 78e476af91662513e38f7afe9facd1b9c975f333 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 908b24df27b5..e70591ea4c87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.5 - 4.6.0-2.23123.5 - 4.6.0-2.23123.5 - 4.6.0-2.23123.5 - 4.6.0-2.23123.5 - 4.6.0-2.23123.5 - 4.6.0-2.23123.5 + 4.6.0-2.23123.9 + 4.6.0-2.23123.9 + 4.6.0-2.23123.9 + 4.6.0-2.23123.9 + 4.6.0-2.23123.9 + 4.6.0-2.23123.9 + 4.6.0-2.23123.9 $(MicrosoftNetCompilersToolsetPackageVersion) From 51aa6a29fea7058e2a4571f4febbbaa7e9f82fba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 03:13:33 +0000 Subject: [PATCH 049/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.6 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.6.0-2.23123.5 -> To Version 4.6.0-2.23123.6 --- 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 c3a56f53ff16..e6544fa3ca79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 78e476af91662513e38f7afe9facd1b9c975f333 + 92e55136241a3082561668f47a7b1238c9c476db - + https://github.com/dotnet/roslyn - 78e476af91662513e38f7afe9facd1b9c975f333 + 92e55136241a3082561668f47a7b1238c9c476db - + https://github.com/dotnet/roslyn - 78e476af91662513e38f7afe9facd1b9c975f333 + 92e55136241a3082561668f47a7b1238c9c476db - + https://github.com/dotnet/roslyn - 78e476af91662513e38f7afe9facd1b9c975f333 + 92e55136241a3082561668f47a7b1238c9c476db - + https://github.com/dotnet/roslyn - 78e476af91662513e38f7afe9facd1b9c975f333 + 92e55136241a3082561668f47a7b1238c9c476db - + https://github.com/dotnet/roslyn - 78e476af91662513e38f7afe9facd1b9c975f333 + 92e55136241a3082561668f47a7b1238c9c476db - + https://github.com/dotnet/roslyn - 78e476af91662513e38f7afe9facd1b9c975f333 + 92e55136241a3082561668f47a7b1238c9c476db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e70591ea4c87..61790973e866 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.9 - 4.6.0-2.23123.9 - 4.6.0-2.23123.9 - 4.6.0-2.23123.9 - 4.6.0-2.23123.9 - 4.6.0-2.23123.9 - 4.6.0-2.23123.9 + 4.6.0-2.23123.6 + 4.6.0-2.23123.6 + 4.6.0-2.23123.6 + 4.6.0-2.23123.6 + 4.6.0-2.23123.6 + 4.6.0-2.23123.6 + 4.6.0-2.23123.6 $(MicrosoftNetCompilersToolsetPackageVersion) From ea1567e921c45ed04121622905cf7758abf657cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 03:13:52 +0000 Subject: [PATCH 050/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.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.6.0-2.23123.6 -> To Version 4.6.0-2.23123.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 e6544fa3ca79..d07164fcc4e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 92e55136241a3082561668f47a7b1238c9c476db + 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 - + https://github.com/dotnet/roslyn - 92e55136241a3082561668f47a7b1238c9c476db + 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 - + https://github.com/dotnet/roslyn - 92e55136241a3082561668f47a7b1238c9c476db + 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 - + https://github.com/dotnet/roslyn - 92e55136241a3082561668f47a7b1238c9c476db + 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 - + https://github.com/dotnet/roslyn - 92e55136241a3082561668f47a7b1238c9c476db + 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 - + https://github.com/dotnet/roslyn - 92e55136241a3082561668f47a7b1238c9c476db + 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 - + https://github.com/dotnet/roslyn - 92e55136241a3082561668f47a7b1238c9c476db + 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 61790973e866..5033687b8b5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.6 - 4.6.0-2.23123.6 - 4.6.0-2.23123.6 - 4.6.0-2.23123.6 - 4.6.0-2.23123.6 - 4.6.0-2.23123.6 - 4.6.0-2.23123.6 + 4.6.0-2.23123.8 + 4.6.0-2.23123.8 + 4.6.0-2.23123.8 + 4.6.0-2.23123.8 + 4.6.0-2.23123.8 + 4.6.0-2.23123.8 + 4.6.0-2.23123.8 $(MicrosoftNetCompilersToolsetPackageVersion) From 1d3aab66438e0528f8261eca078bd60c51262775 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 03:27:35 +0000 Subject: [PATCH 051/135] Update dependencies from https://github.com/dotnet/msbuild build 20230224.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.6.0-preview-23122-03 -> To Version 17.6.0-preview-23124-01 --- 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 c9a9698474e8..b17af1aa1e53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://github.com/dotnet/msbuild - f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 + 3a7bdada94286f0715dca3a2298a74c450a90a48 - + https://github.com/dotnet/msbuild - f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 + 3a7bdada94286f0715dca3a2298a74c450a90a48 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 908b24df27b5..657f5c289c80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.6.0-preview-23122-03 + 17.6.0-preview-23124-01 $(MicrosoftBuildPackageVersion) - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 From 16dd4e58ae8c0e45503dfc1ed2c68277eceff420 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 05:00:20 +0000 Subject: [PATCH 053/135] Update dependencies from https://github.com/dotnet/runtime build 20230223.5 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23123.4 -> To Version 8.0.0-preview.2.23123.5 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 325161152c7b..9b9bd0dfa2d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 5ff28f5739bef80d0a30923b05f3f49d5d47541c - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 3990c633bcf933291f40d44c0b7586c3a6e89d55 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74 + 5ba867f3b9dc40e5195c3901d3bc901a014332d1 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 05ccb8083bf7..84392ca1a9c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.5 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.5 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.5 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 - 8.0.0-preview.2.23123.4 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23123.5 From 386c56596c3fd0d8aee6f7f3959d61e19ad8663d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 06:05:50 +0000 Subject: [PATCH 054/135] Update dependencies from https://github.com/dotnet/fsharp build 20230223.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.300-beta.23123.2 -> To Version 7.0.300-beta.23123.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 e8869f9965f3..316cfee02939 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,13 +54,13 @@ https://github.com/dotnet/msbuild 3a7bdada94286f0715dca3a2298a74c450a90a48 - + https://github.com/dotnet/fsharp - 77528ef88dcffb9a089bea428bc95037a089a206 + 6fb3ae3c29411266f6ccc938ec922a49b61a319c - + https://github.com/dotnet/fsharp - 77528ef88dcffb9a089bea428bc95037a089a206 + 6fb3ae3c29411266f6ccc938ec922a49b61a319c diff --git a/eng/Versions.props b/eng/Versions.props index fe787f0ec1de..ebbddece2f7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -138,7 +138,7 @@ - 12.5.0-beta.23123.2 + 12.5.0-beta.23123.3 From 81045cbe76d2d648633d32c401fd94dc8a5ccf87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 06:34:24 +0000 Subject: [PATCH 055/135] [main] Update dependencies from dotnet/windowsdesktop (#30831) [main] Update dependencies from dotnet/windowsdesktop - Coherency Updates: - Microsoft.NET.Sdk.WindowsDesktop: from 8.0.0-preview.2.23121.2 to 8.0.0-preview.2.23122.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 8485974b5134..ccf5555dd232 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -133,25 +133,25 @@ https://github.com/dotnet/runtime 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/windowsdesktop - 7514f9bc0755cdb942b1426c99e57abb129f6f43 + ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/windowsdesktop - 7514f9bc0755cdb942b1426c99e57abb129f6f43 + ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/windowsdesktop - 7514f9bc0755cdb942b1426c99e57abb129f6f43 + ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/windowsdesktop - 7514f9bc0755cdb942b1426c99e57abb129f6f43 + ffbd4efcd77f4bdc169739f91b703927649a90a8 - + https://github.com/dotnet/wpf - c37ab558d3aebf3bfe0038c86e8a4be78d09e03c + 6b67a31bca9cf848bb246895e046229dfb36bacc https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 26e5a56a0f24..ce1b23082a27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -165,7 +165,7 @@ - 8.0.0-preview.2.23121.2 + 8.0.0-preview.2.23122.1 From 74c01c35576265859b1e37e7459b52df2c77f1f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 07:47:55 +0000 Subject: [PATCH 056/135] [main] Update dependencies from dotnet/roslyn (#30821) [main] 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 ccf5555dd232..6c99c8da0595 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 7347efa598bc5e34086f6c1078f1c0e864400d29 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ce1b23082a27..2a479088911f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 - 4.6.0-2.23122.3 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 7bee5fd2e12088b4c40d83bdb5bcbb123c7409fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 08:29:48 +0000 Subject: [PATCH 057/135] [release/7.0.3xx] Update dependencies from dotnet/roslyn (#30836) [release/7.0.3xx] 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 316cfee02939..c1fe7f8c7c9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a - + https://github.com/dotnet/roslyn - 8b18ec44fd4fa03b1d1d895ee364eaf17bb18405 + a21b43516e2bd6e2c4ffef3aeba269008ccda03a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ebbddece2f7d..160622ae67f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.8 - 4.6.0-2.23123.8 - 4.6.0-2.23123.8 - 4.6.0-2.23123.8 - 4.6.0-2.23123.8 - 4.6.0-2.23123.8 - 4.6.0-2.23123.8 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 + 4.6.0-2.23123.13 $(MicrosoftNetCompilersToolsetPackageVersion) From b6c7d8e0c46fba7afd698861113d415d4b281cd6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 09:00:51 +0000 Subject: [PATCH 058/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.14 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.6.0-2.23123.13 -> To Version 4.6.0-2.23123.14 --- 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 6c99c8da0595..a00cb77c4c30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2a479088911f..b2b7ddffb923 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 7c1b4a99506aaa140757d23ba07ad737c0ebc0fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 09:01:02 +0000 Subject: [PATCH 059/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.14 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.6.0-2.23123.13 -> To Version 4.6.0-2.23123.14 --- 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 c1fe7f8c7c9b..1bb5a963057f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e - + https://github.com/dotnet/roslyn - a21b43516e2bd6e2c4ffef3aeba269008ccda03a + 87e657478eb0dbcdae0d59a0c0517a12ad999d7e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 160622ae67f2..0d1847742bff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 - 4.6.0-2.23123.13 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 + 4.6.0-2.23123.14 $(MicrosoftNetCompilersToolsetPackageVersion) From 024112c90b5e07cee602ad7bb0279caa512f6ebc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 09:32:37 +0000 Subject: [PATCH 060/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.15 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.6.0-2.23123.13 -> To Version 4.6.0-2.23123.15 --- 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 a00cb77c4c30..83a26cc939db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b2b7ddffb923..be4e8c119348 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 11e000a6b6ed41156715b3bf7a2a567cd5a67e23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 10:13:20 +0000 Subject: [PATCH 061/135] Update dependencies from https://github.com/dotnet/roslyn build 20230223.15 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.6.0-2.23123.13 -> To Version 4.6.0-2.23123.15 --- 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 1bb5a963057f..ccd81e98114b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 - + https://github.com/dotnet/roslyn - 87e657478eb0dbcdae0d59a0c0517a12ad999d7e + e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0d1847742bff..2f7667289e9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 - 4.6.0-2.23123.14 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 + 4.6.0-2.23123.15 $(MicrosoftNetCompilersToolsetPackageVersion) From 4ac71cb92940b83009322aa45ecf7abd42961b9e Mon Sep 17 00:00:00 2001 From: Andrii Patsula Date: Fri, 24 Feb 2023 12:35:06 +0100 Subject: [PATCH 062/135] GenAPI: Synthesize an internal default constructor for the type with implicit default constructor and the base type without. (#30594) --- .../CSharpFileBuilder.cs | 2 + .../INamedTypeSymbolExtension.cs | 77 ++++++++- .../SyntaxGeneratorExtensions.cs | 21 +-- .../Filtering/AccessibilitySymbolFilter.cs | 27 ++- .../Filtering/CompositeSymbolFilter.cs | 13 +- .../CSharpFileBuilderTests.cs | 159 ++++++++++++++++++ 6 files changed, 259 insertions(+), 40 deletions(-) diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs index 47720dd120f0..d0cea2c4c1fe 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs +++ b/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs @@ -137,6 +137,8 @@ private SyntaxNode Visit(SyntaxNode namedTypeNode, INamedTypeSymbol namedType) namedTypeNode = _syntaxGenerator.AddMembers(namedTypeNode, namedType.SynthesizeDummyFields(_symbolFilter)); } + namedTypeNode = _syntaxGenerator.AddMembers(namedTypeNode, namedType.TryGetInternalDefaultConstructor(_symbolFilter)); + foreach (ISymbol member in members.Order()) { // If the method is ExplicitInterfaceImplementation and is derived from an interface that was filtered out, we must filter out it either. diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs index 9bb03ec1c794..fe4366afa1e4 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs +++ b/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs @@ -7,6 +7,7 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; +using Microsoft.CodeAnalysis.Editing; using Microsoft.DotNet.ApiSymbolExtensions.Filtering; namespace Microsoft.DotNet.GenAPI @@ -28,14 +29,14 @@ private static bool WalkTypeSymbol(ITypeSymbol ty, HashSet visited, return true; } - foreach(INamedTypeSymbol memberType in ty.GetTypeMembers()) + foreach (INamedTypeSymbol memberType in ty.GetTypeMembers()) { if (!visited.Contains(memberType) && WalkTypeSymbol(memberType, visited, f)) { return true; } } - + return false; } @@ -45,8 +46,8 @@ private static bool IsOrContainsReferenceType(ITypeSymbol ty) => // Walk type with predicate that checks if a type is unmanaged or a reference that's not the root. private static bool IsOrContainsNonEmptyStruct(ITypeSymbol root) => - WalkTypeSymbol(root, new(SymbolEqualityComparer.Default), ty => - ty.IsUnmanagedType || + WalkTypeSymbol(root, new(SymbolEqualityComparer.Default), ty => + ty.IsUnmanagedType || ((ty.IsReferenceType || ty.IsRefLikeType) && !SymbolEqualityComparer.Default.Equals(root, ty))); // Convert IEnumerable to a SyntaxList. @@ -54,7 +55,7 @@ private static SyntaxList FromAttributeData(IEnumerable syntaxNodes = attrData.Select(ad => ad.ApplicationSyntaxReference?.GetSyntax(new System.Threading.CancellationToken(false))); - + IEnumerable asNodes = syntaxNodes.Select(sn => { if (sn is AttributeSyntax atSyntax) { @@ -65,7 +66,7 @@ private static SyntaxList FromAttributeData(IEnumerable asList = asNodes.Where(a => a != null).OfType().ToList(); return SyntaxFactory.List(asList); } @@ -104,7 +105,7 @@ public static IEnumerable SynthesizeDummyFields(this INamedTypeSymbo IEnumerable excludedFields = namedType.GetMembers() .Where(member => !symbolFilter.Include(member) && member is IFieldSymbol) .Select(m => (IFieldSymbol)m); - + if (excludedFields.Any()) { // Collect generic excluded fields @@ -116,7 +117,7 @@ public static IEnumerable SynthesizeDummyFields(this INamedTypeSymbo }); // Add a dummy field for each generic excluded field - foreach(IFieldSymbol genericField in genericTypedFields) + foreach (IFieldSymbol genericField in genericTypedFields) { yield return CreateDummyField( genericField.Type.ToDisplayString(), @@ -164,5 +165,65 @@ public static bool IsBoundGenericType(this INamedTypeSymbol namedType) return true; } + + /// + /// Synthesize an internal default constructor for the type with implicit default constructor and the base type without. + /// + /// A loaded named type symbol . + /// Assembly symbol filter . + public static IEnumerable TryGetInternalDefaultConstructor(this INamedTypeSymbol namedType, ISymbolFilter symbolFilter) + { + if (namedType.BaseType != null && !namedType.Constructors.Any(symbolFilter.Include)) + { + IEnumerable baseConstructors = namedType.BaseType.Constructors.Where(symbolFilter.Include); + if (baseConstructors.Any() && baseConstructors.All(c => !c.Parameters.IsEmpty)) + { + SyntaxKind visibility = SyntaxKind.InternalKeyword; + + Func includeInternalSymbols = filter => + filter is AccessibilitySymbolFilter accessibilityFilter && accessibilityFilter.IncludeInternalSymbols; + + // Use the `Private` visibility if internal symbols are not filtered out. + if (includeInternalSymbols(symbolFilter) || + (symbolFilter is CompositeSymbolFilter compositeSymbolFilter && + compositeSymbolFilter.Filters.Any(filter => includeInternalSymbols(filter)))) + { + visibility = SyntaxKind.PrivateKeyword; + } + + yield return SyntaxFactory.ConstructorDeclaration( + new SyntaxList(), + SyntaxFactory.TokenList(new[] { SyntaxFactory.Token(visibility) }), + SyntaxFactory.Identifier(namedType.ToDisplayString()), + SyntaxFactory.ParameterList(), + default!, + default(BlockSyntax)!).WithInitializer(baseConstructors.First().GenerateBaseConstructorInitializer()); + } + } + } + + /// + /// Synthesize a base class initializer. + /// + /// Represents a base class constructor . + /// Returns the syntax node . + public static ConstructorInitializerSyntax GenerateBaseConstructorInitializer(this IMethodSymbol baseTypeConstructor) + { + ConstructorInitializerSyntax constructorInitializer = SyntaxFactory.ConstructorInitializer(SyntaxKind.BaseConstructorInitializer); + + foreach (IParameterSymbol parameter in baseTypeConstructor.Parameters) + { + IdentifierNameSyntax identifier; + // If the parameter's type is known to be a value type or has top-level nullability annotation + if (parameter.Type.IsValueType || parameter.NullableAnnotation == NullableAnnotation.Annotated) + identifier = SyntaxFactory.IdentifierName("default"); + else + identifier = SyntaxFactory.IdentifierName("default!"); + + constructorInitializer = constructorInitializer.AddArgumentListArguments(SyntaxFactory.Argument(identifier)); + } + + return constructorInitializer; + } } } diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs index c1199c6040d9..e22a6e8e5243 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs +++ b/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs @@ -59,7 +59,7 @@ public static SyntaxNode DeclarationExt(this SyntaxGenerator syntaxGenerator, IS if (baseTypeConstructors.Any()) { ConstructorDeclarationSyntax declaration = (ConstructorDeclarationSyntax)syntaxGenerator.Declaration(method); - return declaration.WithInitializer(GenerateBaseConstructorInitializer(baseTypeConstructors.First())); + return declaration.WithInitializer(baseTypeConstructors.First().GenerateBaseConstructorInitializer()); } } } @@ -95,25 +95,6 @@ public static SyntaxNode DeclarationExt(this SyntaxGenerator syntaxGenerator, IS } } - private static ConstructorInitializerSyntax GenerateBaseConstructorInitializer(IMethodSymbol baseTypeConstructor) - { - ConstructorInitializerSyntax constructorInitializer = SyntaxFactory.ConstructorInitializer(SyntaxKind.BaseConstructorInitializer); - - foreach (IParameterSymbol parameter in baseTypeConstructor.Parameters) - { - IdentifierNameSyntax identifier; - // If the parameter's type is known to be a value type or has top-level nullability annotation - if (parameter.Type.IsValueType || parameter.NullableAnnotation == NullableAnnotation.Annotated) - identifier = SyntaxFactory.IdentifierName("default"); - else - identifier = SyntaxFactory.IdentifierName("default!"); - - constructorInitializer = constructorInitializer.AddArgumentListArguments(SyntaxFactory.Argument(identifier)); - } - - return constructorInitializer; - } - // Gets the list of base class and interfaces for a given symbol . private static BaseListSyntax? GetBaseTypeList(this SyntaxGenerator syntaxGenerator, INamedTypeSymbol type, diff --git a/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/AccessibilitySymbolFilter.cs b/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/AccessibilitySymbolFilter.cs index 5f70eb246868..40a50a2c11b8 100644 --- a/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/AccessibilitySymbolFilter.cs +++ b/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/AccessibilitySymbolFilter.cs @@ -10,22 +10,33 @@ namespace Microsoft.DotNet.ApiSymbolExtensions.Filtering /// public class AccessibilitySymbolFilter : ISymbolFilter { - private readonly bool _includeInternalSymbols; - private readonly bool _includeEffectivelyPrivateSymbols; - private readonly bool _includeExplicitInterfaceImplementationSymbols; + /// + /// Include internal API. + /// + public bool IncludeInternalSymbols { get; } + + /// + /// Include effectively private API. + /// + public bool IncludeEffectivelyPrivateSymbols { get; } + + /// + /// Include explicit interface implementation API. + /// + public bool IncludeExplicitInterfaceImplementationSymbols { get; } public AccessibilitySymbolFilter(bool includeInternalSymbols, bool includeEffectivelyPrivateSymbols = false, bool includeExplicitInterfaceImplementationSymbols = false) { - _includeInternalSymbols = includeInternalSymbols; - _includeEffectivelyPrivateSymbols = includeEffectivelyPrivateSymbols; - _includeExplicitInterfaceImplementationSymbols = includeExplicitInterfaceImplementationSymbols; + IncludeInternalSymbols = includeInternalSymbols; + IncludeEffectivelyPrivateSymbols = includeEffectivelyPrivateSymbols; + IncludeExplicitInterfaceImplementationSymbols = includeExplicitInterfaceImplementationSymbols; } /// public bool Include(ISymbol symbol) => - symbol.IsVisibleOutsideOfAssembly(_includeInternalSymbols, - _includeEffectivelyPrivateSymbols, _includeExplicitInterfaceImplementationSymbols); + symbol.IsVisibleOutsideOfAssembly(IncludeInternalSymbols, + IncludeEffectivelyPrivateSymbols, IncludeExplicitInterfaceImplementationSymbols); } } diff --git a/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/CompositeSymbolFilter.cs b/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/CompositeSymbolFilter.cs index f111befa1ab6..686274f3ed6e 100644 --- a/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/CompositeSymbolFilter.cs +++ b/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/CompositeSymbolFilter.cs @@ -13,14 +13,19 @@ namespace Microsoft.DotNet.ApiSymbolExtensions.Filtering /// public class CompositeSymbolFilter : ISymbolFilter { - private readonly List _innerFilters = new(); + public CompositeSymbolFilter() => Filters = new(); + + /// + /// List on inner filters. + /// + public List Filters { get; } /// /// Determines whether the should be included. /// /// to evaluate. /// True to include the or false to filter it out. - public bool Include(ISymbol symbol) => _innerFilters.All(f => f.Include(symbol)); + public bool Include(ISymbol symbol) => Filters.All(f => f.Include(symbol)); /// /// Construct and add a new filter object to a list of filters. @@ -29,7 +34,7 @@ public class CompositeSymbolFilter : ISymbolFilter /// Returns the current instance of the class. public CompositeSymbolFilter Add() where T : ISymbolFilter, new() { - _innerFilters.Add(new T()); + Filters.Add(new T()); return this; } @@ -40,7 +45,7 @@ public class CompositeSymbolFilter : ISymbolFilter /// Returns the current instance of the class. public CompositeSymbolFilter Add(ISymbolFilter filter) { - _innerFilters.Add(filter); + Filters.Add(filter); return this; } } diff --git a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs index 520757159642..94cf1aea1647 100644 --- a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs +++ b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs @@ -1417,5 +1417,164 @@ public partial class foo """, includeInternalSymbols: false); } + + [Fact] + public void TestInternalDefaultConstructorGeneration() + { + RunTest(original: """ + namespace A + { + public class Bar + { + public Bar(int a) { } + } + + public class Foo : Bar + { + internal Foo() : base(1) { } + } + } + namespace B + { + public class Bar + { + public Bar(int a) { } + } + + public class Foo : Bar + { + private Foo() : base(1) { } + } + } + """, + expected: """ + namespace A + { + public partial class Bar + { + public Bar(int a) { } + } + + public partial class Foo : Bar + { + internal Foo() : base(default) { } + } + } + namespace B + { + public partial class Bar + { + public Bar(int a) { } + } + + public partial class Foo : Bar + { + internal Foo() : base(default) { } + } + } + """, + includeInternalSymbols: false); + } + + [Fact] + public void TestPrivateDefaultConstructorGeneration() + { + RunTest(original: """ + namespace A + { + public class Bar + { + public Bar(int a) { } + } + + public class Foo : Bar + { + private Foo() : base(1) { } + } + } + """, + expected: """ + namespace A + { + public partial class Bar + { + public Bar(int a) { } + } + + public partial class Foo : Bar + { + private Foo() : base(default) { } + } + } + """, + includeInternalSymbols: true, + includeEffectivelyPrivateSymbols: true); + } + + [Fact] + public void TestInternalDefaultConstructorGenerationForGenericType() + { + RunTest(original: """ + namespace A + { + public class Bar + { + public Bar(int a) { } + } + + public class Foo : Bar + { + internal Foo() : base(1) { } + } + } + """, + expected: """ + namespace A + { + public partial class Bar + { + public Bar(int a) { } + } + + public partial class Foo : Bar + { + internal Foo() : base(default) { } + } + } + """, + includeInternalSymbols: false); + } + + [Fact] + public void TestBaseClassWithExplicitDefaultConstructor() + { + RunTest(original: """ + namespace A + { + public class Bar + { + public Bar() { } + } + + public class Foo : Bar + { + } + } + """, + expected: """ + namespace A + { + public partial class Bar + { + public Bar() { } + } + + public partial class Foo : Bar + { + } + } + """, + includeInternalSymbols: false); + } } } From a0aabb5549d9228bbc789d121d6277dace61d880 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 12:51:36 +0000 Subject: [PATCH 063/135] Update dependencies from https://github.com/dotnet/templating build 20230224.1 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-preview.2.23123.2 -> To Version 8.0.100-preview.3.23124.1 --- 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 6c99c8da0595..f0e33c9a1a21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 5ff28f5739bef80d0a30923b05f3f49d5d47541c + 7897504dfbaff24113dff99d4613446636ca1f1f diff --git a/eng/Versions.props b/eng/Versions.props index 2a479088911f..e74457e3455a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,7 +120,7 @@ - 8.0.100-preview.2.23123.2 + 8.0.100-preview.3.23124.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From e0c4f25f96114db21b44e372a492ff49765a510e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 13:20:45 +0000 Subject: [PATCH 064/135] Update dependencies from https://github.com/dotnet/fsharp build 20230223.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.300-beta.23122.4 -> To Version 7.0.300-beta.23123.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 6c99c8da0595..22127991c8cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,13 +50,13 @@ https://github.com/dotnet/msbuild f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 6fb3ae3c29411266f6ccc938ec922a49b61a319c - + https://github.com/dotnet/fsharp - 0b0c07d12f64502d28312d679a966b3f2285244e + 6fb3ae3c29411266f6ccc938ec922a49b61a319c diff --git a/eng/Versions.props b/eng/Versions.props index 2a479088911f..288cdcaccbc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.5.0-beta.23122.4 + 12.5.0-beta.23123.3 From 229e0d93243b829ff3130586ce008e911509909b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 13:39:39 +0000 Subject: [PATCH 065/135] Update dependencies from https://github.com/dotnet/source-build-externals build 20230223.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23122.1 -> To Version 8.0.0-alpha.1.23123.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 6c99c8da0595..e1e10b791724 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -254,9 +254,9 @@ 8374d5fca634a93458c84414b1604c12f765d1ab - + https://github.com/dotnet/source-build-externals - 54b1cf7905203a71e6883d2a3b8ea61d487cefdb + 8e1b361dfb41ed15955a3793d4da1f2cf8129fb0 From 833a7b804f2d446c7b1bfe44c29c75f6c69ac2e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 13:51:44 +0000 Subject: [PATCH 066/135] Update dependencies from https://github.com/microsoft/vstest build 20230223-05 Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230221-02 -> To Version 17.6.0-preview-20230223-05 --- 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 6c99c8da0595..255e9d026b43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,9 +105,9 @@ https://github.com/nuget/nuget.client 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 - + https://github.com/microsoft/vstest - 3990c633bcf933291f40d44c0b7586c3a6e89d55 + 05c0c4c4f084782533443dfeae0f6627018c5b6a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2a479088911f..620fba45cc76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ - 17.6.0-preview-20230221-02 + 17.6.0-preview-20230223-05 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From c1d196f185ee338979de224bc987e2b5f9bc601e Mon Sep 17 00:00:00 2001 From: Andrii Patsula Date: Fri, 24 Feb 2023 15:00:25 +0100 Subject: [PATCH 067/135] GenAPI: improve error handling, extend test coverage. (#30803) --- .../CSharpFileBuilder.cs | 11 +- .../SymbolFactory.cs | 38 ++++-- .../CSharpFileBuilderTests.cs | 121 +++++++++++++++++- 3 files changed, 155 insertions(+), 15 deletions(-) diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs index d0cea2c4c1fe..9aa4143fcd9d 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs +++ b/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs @@ -163,7 +163,16 @@ private SyntaxNode Visit(SyntaxNode namedTypeNode, INamedTypeSymbol namedType) memberDeclaration = Visit(memberDeclaration, nestedTypeSymbol); } - namedTypeNode = _syntaxGenerator.AddMembers(namedTypeNode, memberDeclaration); + try + { + namedTypeNode = _syntaxGenerator.AddMembers(namedTypeNode, memberDeclaration); + } + catch (InvalidOperationException e) + { + // re-throw the InvalidOperationException with the symbol that caused it. + throw new InvalidOperationException($"Adding member {member.ToDisplayString()} to the " + + $"named type {namedTypeNode.ToString()} failed with an exception {e.Message}"); + } } return namedTypeNode; diff --git a/src/Tests/Microsoft.DotNet.ApiSymbolExtensions.Tests/SymbolFactory.cs b/src/Tests/Microsoft.DotNet.ApiSymbolExtensions.Tests/SymbolFactory.cs index 7afd896fdb5f..b5f39a3644cf 100644 --- a/src/Tests/Microsoft.DotNet.ApiSymbolExtensions.Tests/SymbolFactory.cs +++ b/src/Tests/Microsoft.DotNet.ApiSymbolExtensions.Tests/SymbolFactory.cs @@ -15,9 +15,13 @@ namespace Microsoft.DotNet.ApiSymbolExtensions.Tests { internal static class SymbolFactory { - public static string EmitAssemblyFromSyntax(string syntax, bool enableNullable = false, byte[] publicKey = null, [CallerMemberName] string assemblyName = "") + public static string EmitAssemblyFromSyntax(string syntax, + bool enableNullable = false, + byte[] publicKey = null, + [CallerMemberName] string assemblyName = "", + bool allowUnsafe = false) { - CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey); + CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey, allowUnsafe); Assert.Empty(compilation.GetDiagnostics()); @@ -29,19 +33,28 @@ public static string EmitAssemblyFromSyntax(string syntax, bool enableNullable = return assemblyPath; } - public static IAssemblySymbol GetAssemblyFromSyntax(string syntax, bool enableNullable = false, byte[] publicKey = null, [CallerMemberName] string assemblyName = "") + public static IAssemblySymbol GetAssemblyFromSyntax(string syntax, + bool enableNullable = false, + byte[] publicKey = null, + [CallerMemberName] string assemblyName = "", + bool allowUnsafe = false) { - CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey); + CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey, allowUnsafe); Assert.Empty(compilation.GetDiagnostics()); return compilation.Assembly; } - public static IAssemblySymbol GetAssemblyFromSyntaxWithReferences(string syntax, IEnumerable referencesSyntax, bool enableNullable = false, byte[] publicKey = null, [CallerMemberName] string assemblyName = "") + public static IAssemblySymbol GetAssemblyFromSyntaxWithReferences(string syntax, + IEnumerable referencesSyntax, + bool enableNullable = false, + byte[] publicKey = null, + [CallerMemberName] string assemblyName = "", + bool allowUnsafe = false) { - CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey); - CSharpCompilation compilationWithReferences = CreateCSharpCompilationFromSyntax(referencesSyntax, $"{assemblyName}_reference", enableNullable, publicKey); + CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey, allowUnsafe); + CSharpCompilation compilationWithReferences = CreateCSharpCompilationFromSyntax(referencesSyntax, $"{assemblyName}_reference", enableNullable, publicKey, allowUnsafe); compilation = compilation.AddReferences(compilationWithReferences.ToMetadataReference()); @@ -50,15 +63,15 @@ public static IAssemblySymbol GetAssemblyFromSyntaxWithReferences(string syntax, return compilation.Assembly; } - private static CSharpCompilation CreateCSharpCompilationFromSyntax(string syntax, string name, bool enableNullable, byte[] publicKey) + private static CSharpCompilation CreateCSharpCompilationFromSyntax(string syntax, string name, bool enableNullable, byte[] publicKey, bool allowUnsafe) { - CSharpCompilation compilation = CreateCSharpCompilation(name, enableNullable, publicKey); + CSharpCompilation compilation = CreateCSharpCompilation(name, enableNullable, publicKey, allowUnsafe); return compilation.AddSyntaxTrees(GetSyntaxTree(syntax)); } - private static CSharpCompilation CreateCSharpCompilationFromSyntax(IEnumerable syntax, string name, bool enableNullable, byte[] publicKey) + private static CSharpCompilation CreateCSharpCompilationFromSyntax(IEnumerable syntax, string name, bool enableNullable, byte[] publicKey, bool allowUnsafe) { - CSharpCompilation compilation = CreateCSharpCompilation(name, enableNullable, publicKey); + CSharpCompilation compilation = CreateCSharpCompilation(name, enableNullable, publicKey, allowUnsafe); IEnumerable syntaxTrees = syntax.Select(s => GetSyntaxTree(s)); return compilation.AddSyntaxTrees(syntaxTrees); } @@ -68,13 +81,14 @@ private static SyntaxTree GetSyntaxTree(string syntax) return CSharpSyntaxTree.ParseText(syntax, ParseOptions); } - private static CSharpCompilation CreateCSharpCompilation(string name, bool enableNullable, byte[] publicKey) + private static CSharpCompilation CreateCSharpCompilation(string name, bool enableNullable, byte[] publicKey, bool allowUnsafe) { bool publicSign = publicKey != null ? true : false; var compilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary, publicSign: publicSign, cryptoPublicKey: publicSign ? publicKey.ToImmutableArray() : default, nullableContextOptions: enableNullable ? NullableContextOptions.Enable : NullableContextOptions.Disable, + allowUnsafe: allowUnsafe, specificDiagnosticOptions: DiagnosticOptions); return CSharpCompilation.Create(name, options: compilationOptions, references: DefaultReferences); diff --git a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs index 94cf1aea1647..c5f7403d8155 100644 --- a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs +++ b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs @@ -35,7 +35,8 @@ private void RunTest(string original, string expected, bool includeInternalSymbols = true, bool includeEffectivelyPrivateSymbols = true, - bool includeExplicitInterfaceImplementationSymbols = true) + bool includeExplicitInterfaceImplementationSymbols = true, + bool allowUnsafe = false) { StringWriter stringWriter = new(); @@ -46,7 +47,7 @@ private void RunTest(string original, IAssemblySymbolWriter csharpFileBuilder = new CSharpFileBuilder(new ConsoleLog(MessageImportance.Low), compositeFilter, stringWriter, null, false, MetadataReferences); - IAssemblySymbol assemblySymbol = SymbolFactory.GetAssemblyFromSyntax(original, enableNullable: true); + IAssemblySymbol assemblySymbol = SymbolFactory.GetAssemblyFromSyntax(original, enableNullable: true, allowUnsafe: allowUnsafe); csharpFileBuilder.WriteAssembly(assemblySymbol); StringBuilder stringBuilder = stringWriter.GetStringBuilder(); @@ -1418,6 +1419,122 @@ public partial class foo includeInternalSymbols: false); } + [Fact (Skip="https://github.com/dotnet/roslyn/issues/67019")] + public void TestInterfaceWithOperatorGeneration() + { + RunTest(original: """ + namespace A + { + public interface IntType + { + public static IntType operator +(IntType left, IntType right) => left + right; + } + } + """, + expected: """ + namespace A + { + public partial interface IntType + { + public static IntType operator +(IntType left, IntType right) => left + right; + } + } + """, + includeInternalSymbols: false); + } + + [Fact(Skip = "https://github.com/dotnet/roslyn/issues/67019")] + public void TestInterfaceWithCheckedOperatorGeneration() + { + RunTest(original: """ + namespace A + { + public interface IAdditionOperators + where TSelf : IAdditionOperators? + { + static abstract TResult operator +(TSelf left, TOther right); + static virtual TResult operator checked +(TSelf left, TOther right) => left + right; + } + } + """, + expected: """ + namespace A + { + public interface IAdditionOperators + where TSelf : IAdditionOperators? + { + static abstract TResult operator +(TSelf left, TOther right); + static virtual TResult operator checked +(TSelf left, TOther right) { throw null; } + } + } + """, + includeInternalSymbols: false); + } + + [Fact] + public void TestUnsafeFieldGeneration() + { + RunTest(original: """ + namespace A + { + public struct Node + { + public unsafe Node* Left; + public unsafe Node* Right; + public int Value; + } + } + """, + expected: """ + namespace A + { + public partial struct Node + { + public unsafe Node* Left; + public unsafe Node* Right; + public int Value; + } + } + """, + includeInternalSymbols: false, + allowUnsafe: true); + } + + [Fact] + public void TestUnsafeMethodGeneration() + { + RunTest(original: """ + namespace A + { + public unsafe class A + { + public virtual void F(char* p) {} + } + + public class B: A + { + public unsafe override void F(char* p) {} + } + } + """, + expected: """ + namespace A + { + public partial class A + { + public virtual unsafe void F(char* p) { } + } + + public partial class B : A + { + public override unsafe void F(char* p) { } + } + } + """, + includeInternalSymbols: false, + allowUnsafe: true); + } + [Fact] public void TestInternalDefaultConstructorGeneration() { From 06bce05fa4c7457e188b1ac6f591e7ffd724554e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 14:02:41 +0000 Subject: [PATCH 068/135] Update dependencies from https://github.com/microsoft/vstest build 20230223-05 Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230221-02 -> To Version 17.6.0-preview-20230223-05 --- 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 c1fe7f8c7c9b..371a51034fa0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -109,9 +109,9 @@ https://github.com/nuget/nuget.client 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 - + https://github.com/microsoft/vstest - 3990c633bcf933291f40d44c0b7586c3a6e89d55 + 05c0c4c4f084782533443dfeae0f6627018c5b6a https://github.com/dotnet/linker diff --git a/eng/Versions.props b/eng/Versions.props index 160622ae67f2..5c3e288f1bcb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,7 +80,7 @@ - 17.6.0-preview-20230221-02 + 17.6.0-preview-20230223-05 $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETTestSdkPackageVersion) From 240cdb3c583f33e038ba0b20f3af820ca049d12f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 14:02:54 +0000 Subject: [PATCH 069/135] Update dependencies from https://github.com/dotnet/msbuild build 20230224.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.6.0-preview-23122-03 -> To Version 17.6.0-preview-23124-01 --- 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 6c99c8da0595..19a3c55e70bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/runtime 5ba867f3b9dc40e5195c3901d3bc901a014332d1 - + https://github.com/dotnet/msbuild - f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 + 3a7bdada94286f0715dca3a2298a74c450a90a48 - + https://github.com/dotnet/msbuild - f93b24b5a88a37a3b6b122c7f65f910fcc2ba2f0 + 3a7bdada94286f0715dca3a2298a74c450a90a48 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2a479088911f..ec776e8d36e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,7 +100,7 @@ - 17.6.0-preview-23122-03 + 17.6.0-preview-23124-01 $(MicrosoftBuildPackageVersion) - 8.0.100-preview.3.23124.1 + 8.0.100-preview.2.23124.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From ec5bbb9613849f526e42b9113ddd1b32f89e247d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 15:35:17 +0000 Subject: [PATCH 071/135] Update dependencies from https://github.com/dotnet/templating build 20230224.3 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-preview.2.23123.2 -> To Version 8.0.100-preview.2.23124.3 --- 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 9d466f11bc35..66a4bf9f5de0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 8b13963bf41c42e279b431edffda08b02b7de8ba + a7fc2a0785d56324cd839dd7c59a2661b620267e diff --git a/eng/Versions.props b/eng/Versions.props index 0d46c547e826..00424daf2e08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,7 +120,7 @@ - 8.0.100-preview.2.23124.2 + 8.0.100-preview.2.23124.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From eb32ba2208fa8be7a53aa76c30af30818ec4ffec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 15:58:37 +0000 Subject: [PATCH 072/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23123.13 -> To Version 4.6.0-2.23124.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 83a26cc939db..0844a55284d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index be4e8c119348..10b54ff03627 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 572e3eb644f117cb85e45222b2398218fa7f7125 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 15:58:47 +0000 Subject: [PATCH 073/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23123.13 -> To Version 4.6.0-2.23124.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 ccd81e98114b..5c3535215f5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/roslyn - e99d9eea4c4b66aca5d2b1f4c4b13a4b68d1d425 + b80df1b027ab46d65c6986c33840721ff71ba0c0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2f7667289e9c..2adebed27548 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 - 4.6.0-2.23123.15 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 + 4.6.0-2.23124.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 53831e9ffbc0f7f360e96feedcf62811fb101a03 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 16:45:30 +0000 Subject: [PATCH 074/135] Update dependencies from https://github.com/dotnet/msbuild build 20230224.12 Microsoft.Build , Microsoft.Build.Localization From Version 17.6.0-preview-23124-01 -> To Version 17.6.0-preview-23124-12 --- 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 c1fe7f8c7c9b..407881e86fba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,13 +46,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 0a2bda10e81d901396c3cff95533529e3a93ad47 - + https://github.com/dotnet/msbuild - 3a7bdada94286f0715dca3a2298a74c450a90a48 + d434c0e464ee0c119bdd5ee87b448e16fe0786be - + https://github.com/dotnet/msbuild - 3a7bdada94286f0715dca3a2298a74c450a90a48 + d434c0e464ee0c119bdd5ee87b448e16fe0786be https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 160622ae67f2..81b34757be2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -106,7 +106,7 @@ - 17.6.0-preview-23124-01 + 17.6.0-preview-23124-12 $(MicrosoftBuildPackageVersion) - 8.0.100-preview.2.23124.3 + 8.0.100-preview.3.23124.6 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From f1fa04576b64cf5286972451a2ba0de66caa8e01 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 17:26:17 +0000 Subject: [PATCH 076/135] Update dependencies from https://github.com/nuget/nuget.client build 6.6.0.29 NuGet.Build.Tasks From Version 6.6.0-preview.2.27 -> To Version 6.6.0-preview.2.29 --- 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 6c99c8da0595..6eb21286db28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -101,9 +101,9 @@ https://github.com/dotnet/aspnetcore 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 - + https://github.com/nuget/nuget.client - 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 + 4d5af8a3492c8d9d0c99c3cdf3cce12129c8e743 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 2a479088911f..f53c09e472d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ - 6.6.0-preview.2.27 + 6.6.0-preview.2.29 $(NuGetBuildTasksPackageVersion) 6.0.0-rc.278 $(NuGetBuildTasksPackageVersion) From 269c432c5b73ac862b585610a0ac05969a4f90e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 17:26:23 +0000 Subject: [PATCH 077/135] Update dependencies from https://github.com/nuget/nuget.client build 6.6.0.29 NuGet.Build.Tasks From Version 6.6.0-preview.2.27 -> To Version 6.6.0-preview.2.29 --- 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 c1fe7f8c7c9b..a1b7f65affcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,9 +105,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://github.com/nuget/nuget.client - 32dfd20a77f37a75fd2e7d3f785a0abb1eb5f3e3 + 4d5af8a3492c8d9d0c99c3cdf3cce12129c8e743 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 160622ae67f2..6dbbc43ddc21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ - 6.6.0-preview.2.27 + 6.6.0-preview.2.29 $(NuGetBuildTasksPackageVersion) 6.0.0-rc.278 $(NuGetBuildTasksPackageVersion) From 0a6b1c924f33ae0e910d5bc09c34bb138d571c39 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 18:21:39 +0000 Subject: [PATCH 078/135] Update dependencies from https://github.com/dotnet/templating build 20230224.8 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-preview.3.23124.6 -> To Version 8.0.100-preview.3.23124.8 --- 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 fc845cac4265..0bc0e09e431c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 9d4af30311ee03f52409caedd9f7881a4c03c62c + 41e6e40afd6864941ceaabc6d6451925daa47c01 diff --git a/eng/Versions.props b/eng/Versions.props index ea80d4bd6c86..f08909a78878 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -120,7 +120,7 @@ - 8.0.100-preview.3.23124.6 + 8.0.100-preview.3.23124.8 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 28ac7963c921f6fee440ff6eaf1b3c5eacf91d86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 19:24:53 +0000 Subject: [PATCH 079/135] [main] Update dependencies from dotnet/runtime (#30842) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f47439b471f5..9a21b22ac61d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 9d4af30311ee03f52409caedd9f7881a4c03c62c - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - 5ba867f3b9dc40e5195c3901d3bc901a014332d1 + 13a80ca10ddbb7b74ff888b62efc3eff72cab870 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 89b29dc9f71e..1496fb955fc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.1 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.1 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.1 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.1 From eccefe35a57c187951f0736a7e46084a1b2b4bfb Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Fri, 24 Feb 2023 11:45:28 -0800 Subject: [PATCH 080/135] Update prereleaseversion to 3 for main as preview 2 branch has been snapped --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1496fb955fc2..2b0a4cf34b32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ 8.0.100 preview - 2 + 3 false release From 73d0071e6e1b45fde3a0e8df6e01e90932d44978 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 20:20:08 +0000 Subject: [PATCH 081/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.1 -> To Version 4.6.0-2.23124.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 9a21b22ac61d..6d8013ce954f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1496fb955fc2..6538f359c4d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 2ce0d7865432a7f69a5bb92cd6c8182884d72f9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 20:20:19 +0000 Subject: [PATCH 082/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.1 -> To Version 4.6.0-2.23124.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 6a62c641e1cb..1183e7001c8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b - + https://github.com/dotnet/roslyn - b80df1b027ab46d65c6986c33840721ff71ba0c0 + 78e26bbe373537ad3d297e571dbe7c02ff91b07b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 016001f56735..7356c56b5a53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 - 4.6.0-2.23124.1 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 + 4.6.0-2.23124.2 $(MicrosoftNetCompilersToolsetPackageVersion) From 43e2748219eb524ad7aeafc6a8ab54a8b5176736 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 20:38:21 +0000 Subject: [PATCH 083/135] Update dependencies from https://github.com/dotnet/runtime build 20230224.2 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23124.1 -> To Version 8.0.0-preview.2.23124.2 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a21b22ac61d..8b6117e005a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 9d4af30311ee03f52409caedd9f7881a4c03c62c - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - 13a80ca10ddbb7b74ff888b62efc3eff72cab870 + 9281022e56856094d2bade01908060a7536c3b75 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 1496fb955fc2..d150b5951599 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.2 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.2 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.2 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 - 8.0.0-preview.2.23124.1 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.2 From 6b14927c4fb4cd6145a515d46ab272b7a105c457 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 21:03:49 +0000 Subject: [PATCH 084/135] Update dependencies from https://github.com/dotnet/razor build 20230224.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23123.2 -> To Version 7.0.0-preview.23124.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a21b22ac61d..1c41b746aa95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,22 +198,22 @@ https://github.com/dotnet/aspnetcore 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 - + https://github.com/dotnet/razor - 07658577ff1f8c49f6abc92b5bbdc46431380553 + b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/razor - 07658577ff1f8c49f6abc92b5bbdc46431380553 + b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/razor - 07658577ff1f8c49f6abc92b5bbdc46431380553 + b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/razor - 07658577ff1f8c49f6abc92b5bbdc46431380553 + b20e1550461849fae4a040f9d65f4318a8ad3c80 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1496fb955fc2..3ed3afaa5382 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,10 +158,10 @@ - 7.0.0-preview.23123.2 - 7.0.0-preview.23123.2 - 7.0.0-preview.23123.2 - 7.0.0-preview.23123.2 + 7.0.0-preview.23124.1 + 7.0.0-preview.23124.1 + 7.0.0-preview.23124.1 + 7.0.0-preview.23124.1 From 32e71914714fd9b5b773d461b1cc9f126e81d9b6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 21:04:02 +0000 Subject: [PATCH 085/135] Update dependencies from https://github.com/dotnet/razor build 20230224.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23123.2 -> To Version 7.0.0-preview.23124.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a62c641e1cb..44a3d474362b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -216,22 +216,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://github.com/dotnet/razor - 07658577ff1f8c49f6abc92b5bbdc46431380553 + b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/razor - 07658577ff1f8c49f6abc92b5bbdc46431380553 + b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/razor - 07658577ff1f8c49f6abc92b5bbdc46431380553 + b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/razor - 07658577ff1f8c49f6abc92b5bbdc46431380553 + b20e1550461849fae4a040f9d65f4318a8ad3c80 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 016001f56735..0accd52ab87a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,10 +162,10 @@ - 7.0.0-preview.23123.2 - 7.0.0-preview.23123.2 - 7.0.0-preview.23123.2 - 7.0.0-preview.23123.2 + 7.0.0-preview.23124.1 + 7.0.0-preview.23124.1 + 7.0.0-preview.23124.1 + 7.0.0-preview.23124.1 From 1cbdb0755cc3d99a69b5c6a3617b383d13813d35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 21:25:23 +0000 Subject: [PATCH 086/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.1 -> To Version 4.6.0-2.23124.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 1183e7001c8e..628dcb8bb65e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7356c56b5a53..f6a273d3285b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 7e74f150c4fdc5a2c9fc7a9dfc19e1571f8507d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 21:26:18 +0000 Subject: [PATCH 087/135] Update dependencies from https://github.com/dotnet/aspnetcore build 20230224.5 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-preview.2.23123.5 -> To Version 8.0.0-preview.2.23124.5 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9a21b22ac61d..7c072407b971 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn b80df1b027ab46d65c6986c33840721ff71ba0c0 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf 6b67a31bca9cf848bb246895e046229dfb36bacc - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor 07658577ff1f8c49f6abc92b5bbdc46431380553 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/aspnetcore - 33ab5e2c45c618ef873cfaa26ab07c4527be4d15 + a11fec5fad546a315b4565af534f9efccec010b9 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 1496fb955fc2..eac8bb719337 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 - 8.0.0-preview.2.23123.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 From c4f83add45f0d8824983d93662a98852fc956b88 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 21:35:20 +0000 Subject: [PATCH 088/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.1 -> To Version 4.6.0-2.23124.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 6d8013ce954f..52f749b5ba95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/roslyn - 78e26bbe373537ad3d297e571dbe7c02ff91b07b + 3f192dc39715a87c827ed97b0573d860b6f14ac0 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6538f359c4d6..7a196b861870 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 - 4.6.0-2.23124.2 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 + 4.6.0-2.23124.3 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From c4fcd3ea328850002ccb3a9e6c5dcbfbc9343996 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 22:23:24 +0000 Subject: [PATCH 089/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.1 -> To Version 4.6.0-2.23124.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 628dcb8bb65e..387625f64c62 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f6a273d3285b..7052e89aad4b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 $(MicrosoftNetCompilersToolsetPackageVersion) From 3a2a2ee01d6fb44916a40deaf0d1140188688c2e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 22:58:37 +0000 Subject: [PATCH 090/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.3 -> To Version 4.6.0-2.23124.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 82959b85280f..64afb74e02c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c - + https://github.com/dotnet/roslyn - 3f192dc39715a87c827ed97b0573d860b6f14ac0 + 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c315ae2419bb..121a215b1fe3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 - 4.6.0-2.23124.3 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 + 4.6.0-2.23124.4 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 0147e01c8628ed24751fa8f67298ce9e17b422bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 22:58:46 +0000 Subject: [PATCH 091/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.4 -> To Version 4.6.0-2.23124.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 64afb74e02c7..771368c8e972 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 121a215b1fe3..d295f0fa3d2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 1372fa322d6e6cafd272abdf1cd66bf41e37a97e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 23:25:21 +0000 Subject: [PATCH 092/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.4 -> To Version 4.6.0-2.23124.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 ccc3ec4f5a85..f8fd771cc66c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 - + https://github.com/dotnet/roslyn - 3b9dbde77e1e324aefe5dec39336b6ada37a7d1c + 527c7924cef763dc65e5bd1fffdd10dded0a2307 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 14716755d1d9..0c6f590bc4f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 - 4.6.0-2.23124.4 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 + 4.6.0-2.23124.5 $(MicrosoftNetCompilersToolsetPackageVersion) From 51d4e012d07ed22aaa99c1a60363b7b31e7e64de Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 23:26:37 +0000 Subject: [PATCH 093/135] Update dependencies from https://github.com/dotnet/razor build 20230224.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23124.1 -> To Version 7.0.0-preview.23124.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82959b85280f..fe414902764b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,22 +198,22 @@ https://github.com/dotnet/aspnetcore a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/razor - b20e1550461849fae4a040f9d65f4318a8ad3c80 + 6eec69294fbc40eb819fb5a70729d1427d2fb262 - + https://github.com/dotnet/razor - b20e1550461849fae4a040f9d65f4318a8ad3c80 + 6eec69294fbc40eb819fb5a70729d1427d2fb262 - + https://github.com/dotnet/razor - b20e1550461849fae4a040f9d65f4318a8ad3c80 + 6eec69294fbc40eb819fb5a70729d1427d2fb262 - + https://github.com/dotnet/razor - b20e1550461849fae4a040f9d65f4318a8ad3c80 + 6eec69294fbc40eb819fb5a70729d1427d2fb262 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 62d9183fa06d..4acd44b8da59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,10 +158,10 @@ - 7.0.0-preview.23124.1 - 7.0.0-preview.23124.1 - 7.0.0-preview.23124.1 - 7.0.0-preview.23124.1 + 7.0.0-preview.23124.2 + 7.0.0-preview.23124.2 + 7.0.0-preview.23124.2 + 7.0.0-preview.23124.2 From 5a2d3d53117c7e23974d55ee99d9b603faeda344 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Feb 2023 23:26:49 +0000 Subject: [PATCH 094/135] Update dependencies from https://github.com/dotnet/razor build 20230224.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23124.1 -> To Version 7.0.0-preview.23124.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccc3ec4f5a85..75e838a8acfd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -216,22 +216,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://github.com/dotnet/razor - b20e1550461849fae4a040f9d65f4318a8ad3c80 + 6eec69294fbc40eb819fb5a70729d1427d2fb262 - + https://github.com/dotnet/razor - b20e1550461849fae4a040f9d65f4318a8ad3c80 + 6eec69294fbc40eb819fb5a70729d1427d2fb262 - + https://github.com/dotnet/razor - b20e1550461849fae4a040f9d65f4318a8ad3c80 + 6eec69294fbc40eb819fb5a70729d1427d2fb262 - + https://github.com/dotnet/razor - b20e1550461849fae4a040f9d65f4318a8ad3c80 + 6eec69294fbc40eb819fb5a70729d1427d2fb262 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 14716755d1d9..0ceeeaa7711d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,10 +162,10 @@ - 7.0.0-preview.23124.1 - 7.0.0-preview.23124.1 - 7.0.0-preview.23124.1 - 7.0.0-preview.23124.1 + 7.0.0-preview.23124.2 + 7.0.0-preview.23124.2 + 7.0.0-preview.23124.2 + 7.0.0-preview.23124.2 From 7d9b7c0de0fb3439b40348829a13c9783032d7a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 00:28:35 +0000 Subject: [PATCH 095/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.6 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.6.0-2.23124.3 -> To Version 4.6.0-2.23124.6 --- 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 771368c8e972..c8e393c56c38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d295f0fa3d2d..dff823a2b4c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 7abae187fd991fa4fa2337ba470cc9d07e8127d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 00:38:52 +0000 Subject: [PATCH 096/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.6 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.6.0-2.23124.4 -> To Version 4.6.0-2.23124.6 --- 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 f8fd771cc66c..cd7b30f57a1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 - + https://github.com/dotnet/roslyn - 527c7924cef763dc65e5bd1fffdd10dded0a2307 + 3aa2c5119a936009d9485cca8f245fbc8a42be26 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0c6f590bc4f3..aadade4a0cc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 - 4.6.0-2.23124.5 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 + 4.6.0-2.23124.6 $(MicrosoftNetCompilersToolsetPackageVersion) From 8e05b6666056a3db9911799205fbdf9e12e3ba10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Feb 2023 01:48:08 +0000 Subject: [PATCH 097/135] [main] Update dependencies from dotnet/aspnetcore (#30871) [main] Update dependencies from dotnet/aspnetcore --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82959b85280f..123f4778db22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf 6b67a31bca9cf848bb246895e046229dfb36bacc - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 - + https://github.com/dotnet/aspnetcore - a11fec5fad546a315b4565af534f9efccec010b9 + ecc10557650a2f0a54b1edc8398a4faae81d5da1 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 62d9183fa06d..a2e6d9d64b22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.6 From 73aa9add88b644494b1b8df4ba0fb25ee82d979a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 02:39:57 +0000 Subject: [PATCH 098/135] Update dependencies from https://github.com/dotnet/aspnetcore build 20230224.9 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-preview.2.23124.6 -> To Version 8.0.0-preview.2.23124.9 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 123f4778db22..51e19fa408f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf 6b67a31bca9cf848bb246895e046229dfb36bacc - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba - + https://github.com/dotnet/aspnetcore - ecc10557650a2f0a54b1edc8398a4faae81d5da1 + 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a2e6d9d64b22..7aa60dc0101d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 - 8.0.0-preview.2.23124.6 + 8.0.0-preview.2.23124.9 + 8.0.0-preview.2.23124.9 + 8.0.0-preview.2.23124.9 + 8.0.0-preview.2.23124.9 + 8.0.0-preview.2.23124.9 + 8.0.0-preview.2.23124.9 From 0f88ac2614d79635e9ad32bd798f0c0861a5ab43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 02:53:07 +0000 Subject: [PATCH 099/135] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20230224.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 3.3.5-beta1.23121.1 -> To Version 3.3.5-beta1.23124.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 123f4778db22..c8001072d991 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -236,13 +236,13 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - 50f62a926806bc75f294b5f738bc6694e0941361 + c6352bf2e1bd214fce090829de1042000d021497 - + https://github.com/dotnet/roslyn-analyzers - 50f62a926806bc75f294b5f738bc6694e0941361 + c6352bf2e1bd214fce090829de1042000d021497 diff --git a/eng/Versions.props b/eng/Versions.props index a2e6d9d64b22..14720635129f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -96,7 +96,7 @@ - 8.0.0-preview1.23121.1 + 8.0.0-preview1.23124.1 From 02f795461054b157031a091ec86771886159968b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 02:57:53 +0000 Subject: [PATCH 100/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.3 -> To Version 4.6.0-2.23124.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 c8e393c56c38..491df5c647b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index dff823a2b4c7..851e47f8829a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From ccc0ab959e8fd4b59d6b54b6dc7338a699744d2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 02:58:06 +0000 Subject: [PATCH 101/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.4 -> To Version 4.6.0-2.23124.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 cd7b30f57a1d..79c4a63504a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 - + https://github.com/dotnet/roslyn - 3aa2c5119a936009d9485cca8f245fbc8a42be26 + f94af1bbe075dbe68525115e4197e97f295dc7a7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index aadade4a0cc7..bf1f58ea3e37 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 - 4.6.0-2.23124.6 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 + 4.6.0-2.23124.8 $(MicrosoftNetCompilersToolsetPackageVersion) From ffa7f0dc233e01ee5af727ed01ad5c27e6126ce9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:59:28 +0000 Subject: [PATCH 102/135] [main] Update dependencies from dotnet/runtime (#30873) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 123f4778db22..8f8e017105d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 41e6e40afd6864941ceaabc6d6451925daa47c01 - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - 9281022e56856094d2bade01908060a7536c3b75 + d3b7dc1399d0214d627a4197be1fab734a84e05f https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index a2e6d9d64b22..16231101b917 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.3 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.3 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.3 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 - 8.0.0-preview.2.23124.2 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.3 From b225d430cd523eae265031d6343e4c2be02b3e3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 03:01:23 +0000 Subject: [PATCH 103/135] Update dependencies from https://github.com/dotnet/windowsdesktop build 20230224.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-preview.2.23123.1 -> To Version 8.0.0-preview.2.23124.1 --- eng/Version.Details.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f8e017105d2..f0e2bb9ff594 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -133,21 +133,21 @@ https://github.com/dotnet/runtime d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/windowsdesktop - ffbd4efcd77f4bdc169739f91b703927649a90a8 + 6e61aa9df3ce18122c0833243e200949ac05c41f - + https://github.com/dotnet/windowsdesktop - ffbd4efcd77f4bdc169739f91b703927649a90a8 + 6e61aa9df3ce18122c0833243e200949ac05c41f - + https://github.com/dotnet/windowsdesktop - ffbd4efcd77f4bdc169739f91b703927649a90a8 + 6e61aa9df3ce18122c0833243e200949ac05c41f - + https://github.com/dotnet/windowsdesktop - ffbd4efcd77f4bdc169739f91b703927649a90a8 + 6e61aa9df3ce18122c0833243e200949ac05c41f https://github.com/dotnet/wpf From c823ac1786898b3b31268ecd900a0c155405819c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 03:21:47 +0000 Subject: [PATCH 104/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.4 -> To Version 4.6.0-2.23124.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 79c4a63504a0..b496bc7f8214 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index bf1f58ea3e37..6e6d27ba9c8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 $(MicrosoftNetCompilersToolsetPackageVersion) From cccdd70b970d18e4f3afdff224801080d0743d57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 04:22:19 +0000 Subject: [PATCH 105/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.3 -> To Version 4.6.0-2.23124.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 491df5c647b0..418ca10b40d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a - + https://github.com/dotnet/roslyn - f94af1bbe075dbe68525115e4197e97f295dc7a7 + 9aab3449ddbdec13544c13ed6a01543ec054c76a https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 851e47f8829a..ae39e0372577 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 - 4.6.0-2.23124.8 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 + 4.6.0-2.23124.7 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From d65a54a703c3db652ad7c4558cef2f787f0643ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 04:22:29 +0000 Subject: [PATCH 106/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.7 -> To Version 4.6.0-2.23124.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 418ca10b40d6..cf131150f564 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index ae39e0372577..60bc7720bbc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 5bfbdf42c002da05189ddacf046c6069d9a524c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 04:22:37 +0000 Subject: [PATCH 107/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.10 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.6.0-2.23124.9 -> To Version 4.6.0-2.23124.10 --- 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 cf131150f564..f861bfbefc34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 60bc7720bbc4..7e51c1a326a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 2a93936f4cca02e6fd8da9f0234adb1ef5363414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 04:30:41 +0000 Subject: [PATCH 108/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.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.6.0-2.23124.4 -> To Version 4.6.0-2.23124.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 b496bc7f8214..1d61f5307b69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 - + https://github.com/dotnet/roslyn - 9aab3449ddbdec13544c13ed6a01543ec054c76a + 2e777289e92c96b8db0fab3c9963b8a0213caca4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 6e6d27ba9c8f..c3ba25d602ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 - 4.6.0-2.23124.7 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 + 4.6.0-2.23124.9 $(MicrosoftNetCompilersToolsetPackageVersion) From 21080072a5bf13bc3ba5fa2e3d6475b913838bfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 04:31:01 +0000 Subject: [PATCH 109/135] Update dependencies from https://github.com/dotnet/roslyn build 20230224.10 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.6.0-2.23124.9 -> To Version 4.6.0-2.23124.10 --- 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 1d61f5307b69..643e5d0b2f38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba - + https://github.com/dotnet/roslyn - 2e777289e92c96b8db0fab3c9963b8a0213caca4 + 741770b4d560e97ee9a75aee2a681468f59c1eba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c3ba25d602ab..4be53ce23295 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 - 4.6.0-2.23124.9 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 + 4.6.0-2.23124.10 $(MicrosoftNetCompilersToolsetPackageVersion) From 2791cf70adad350b0706aab1d011a70dbab8d238 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 05:37:42 +0000 Subject: [PATCH 110/135] Update dependencies from https://github.com/dotnet/runtime build 20230224.4 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23124.3 -> To Version 8.0.0-preview.2.23124.4 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8f8e017105d2..f3c03ae2564b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 41e6e40afd6864941ceaabc6d6451925daa47c01 - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - d3b7dc1399d0214d627a4197be1fab734a84e05f + 07c2ea06460610ee97876cf17b75c4bc770145db https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 16231101b917..4c7db4cdece7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.4 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.4 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.4 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.4 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.4 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 - 8.0.0-preview.2.23124.3 + 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.4 From 0dd6b2f72582e897748e3f6081f0bb854be9ebce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 05:44:37 +0000 Subject: [PATCH 111/135] Update dependencies from https://github.com/dotnet/aspnetcore build 20230224.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-preview.2.23124.6 -> To Version 8.0.0-preview.3.23124.10 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51e19fa408f9..3fb0a2c5ec15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf 6b67a31bca9cf848bb246895e046229dfb36bacc - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 - + https://github.com/dotnet/aspnetcore - 8b1e6fdabfbfa70383e42c2d6d098536d2f111ba + b47d2558388e1a8fec5c37b3a108668ae9308b14 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 7aa60dc0101d..438925090588 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.2.23124.9 - 8.0.0-preview.2.23124.9 - 8.0.0-preview.2.23124.9 - 8.0.0-preview.2.23124.9 - 8.0.0-preview.2.23124.9 - 8.0.0-preview.2.23124.9 + 8.0.0-preview.3.23124.10 + 8.0.0-preview.3.23124.10 + 8.0.0-preview.3.23124.10 + 8.0.0-preview.3.23124.10 + 8.0.0-preview.3.23124.10 + 8.0.0-preview.3.23124.10 From 587e18722db03a9909446f65db79c0a7b9f19c1d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 07:15:21 +0000 Subject: [PATCH 112/135] Update dependencies from https://github.com/dotnet/aspnetcore build 20230224.11 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-preview.2.23124.6 -> To Version 8.0.0-preview.3.23124.11 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fb0a2c5ec15..049d71727184 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf 6b67a31bca9cf848bb246895e046229dfb36bacc - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 - + https://github.com/dotnet/aspnetcore - b47d2558388e1a8fec5c37b3a108668ae9308b14 + 5003392ecbda03092083c1ae29e6dc7ba241d628 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 438925090588..e5a7df40f91e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.3.23124.10 - 8.0.0-preview.3.23124.10 - 8.0.0-preview.3.23124.10 - 8.0.0-preview.3.23124.10 - 8.0.0-preview.3.23124.10 - 8.0.0-preview.3.23124.10 + 8.0.0-preview.3.23124.11 + 8.0.0-preview.3.23124.11 + 8.0.0-preview.3.23124.11 + 8.0.0-preview.3.23124.11 + 8.0.0-preview.3.23124.11 + 8.0.0-preview.3.23124.11 From 4006f6855a30667914713f5cc6ec3e3440edf32e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 10:01:24 +0000 Subject: [PATCH 113/135] Update dependencies from https://github.com/dotnet/runtime build 20230224.5 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23124.3 -> To Version 8.0.0-preview.2.23124.5 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3c03ae2564b..04ee5f7f8734 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 41e6e40afd6864941ceaabc6d6451925daa47c01 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - 07c2ea06460610ee97876cf17b75c4bc770145db + cabaab5e90e19256ae404970091350bb6f0f7139 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 4c7db4cdece7..85ddbca0130c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.5 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.5 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23124.4 - 8.0.0-preview.2.23124.4 - 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23124.4 - 8.0.0-preview.2.23124.4 - 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.5 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23124.4 - 8.0.0-preview.2.23124.4 - 8.0.0-preview.2.23124.4 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23124.5 From 2570998e34053af30819e2e3c5f1c81037bb9447 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 12:57:44 +0000 Subject: [PATCH 114/135] Update dependencies from https://github.com/dotnet/roslyn build 20230225.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.6.0-2.23124.3 -> To Version 4.6.0-2.23125.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 f861bfbefc34..ba8290a00e5d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7e51c1a326a5..65c854c77cf7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 14f2fdbb4ced1a9f4476e55b2a18aa3bce84a626 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 12:57:54 +0000 Subject: [PATCH 115/135] Update dependencies from https://github.com/dotnet/roslyn build 20230225.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.6.0-2.23124.4 -> To Version 4.6.0-2.23125.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 643e5d0b2f38..b2492d7d36e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 - + https://github.com/dotnet/roslyn - 741770b4d560e97ee9a75aee2a681468f59c1eba + 62a827b5880d9f935297f1a83964f92cd519a734 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4be53ce23295..90fe9fb54418 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 - 4.6.0-2.23124.10 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 + 4.6.0-2.23125.1 $(MicrosoftNetCompilersToolsetPackageVersion) From 68a5b19864756be49fd7022395efcd5ceb35980c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 13:15:43 +0000 Subject: [PATCH 116/135] Update dependencies from https://github.com/dotnet/fsharp build 20230224.3 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 7.0.300-beta.23123.3 -> To Version 7.0.300-beta.23124.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 8f8e017105d2..11dea058f26b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,13 +50,13 @@ https://github.com/dotnet/msbuild 3a7bdada94286f0715dca3a2298a74c450a90a48 - + https://github.com/dotnet/fsharp - 6fb3ae3c29411266f6ccc938ec922a49b61a319c + 69e9a985b80c41e7d9d589e58b75a004831c07bc - + https://github.com/dotnet/fsharp - 6fb3ae3c29411266f6ccc938ec922a49b61a319c + 69e9a985b80c41e7d9d589e58b75a004831c07bc diff --git a/eng/Versions.props b/eng/Versions.props index 16231101b917..0db9719b092c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -133,7 +133,7 @@ - 12.5.0-beta.23123.3 + 12.5.0-beta.23124.3 From 9055843f20ad7af3a9f0ab8beef2b23c8bf5d080 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 13:42:30 +0000 Subject: [PATCH 117/135] Update dependencies from https://github.com/dotnet/msbuild build 20230224.12 Microsoft.Build , Microsoft.Build.Localization From Version 17.6.0-preview-23124-01 -> To Version 17.6.0-preview-23124-12 --- 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 8f8e017105d2..9140013aae53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,13 +42,13 @@ https://github.com/dotnet/runtime d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/msbuild - 3a7bdada94286f0715dca3a2298a74c450a90a48 + d434c0e464ee0c119bdd5ee87b448e16fe0786be - + https://github.com/dotnet/msbuild - 3a7bdada94286f0715dca3a2298a74c450a90a48 + d434c0e464ee0c119bdd5ee87b448e16fe0786be https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 16231101b917..3e8efcf85653 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -100,7 +100,7 @@ - 17.6.0-preview-23124-01 + 17.6.0-preview-23124-12 $(MicrosoftBuildPackageVersion) - 8.0.0-preview.3.23124.11 - 8.0.0-preview.3.23124.11 - 8.0.0-preview.3.23124.11 - 8.0.0-preview.3.23124.11 - 8.0.0-preview.3.23124.11 - 8.0.0-preview.3.23124.11 + 8.0.0-preview.3.23125.1 + 8.0.0-preview.3.23125.1 + 8.0.0-preview.3.23125.1 + 8.0.0-preview.3.23125.1 + 8.0.0-preview.3.23125.1 + 8.0.0-preview.3.23125.1 From f16b19b93193604ce35cf111b1ac5cb925dcf26c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 19:58:28 +0000 Subject: [PATCH 119/135] Update dependencies from https://github.com/dotnet/runtime build 20230225.1 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23124.3 -> To Version 8.0.0-preview.2.23125.1 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04ee5f7f8734..97ea2c42d631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 41e6e40afd6864941ceaabc6d6451925daa47c01 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - cabaab5e90e19256ae404970091350bb6f0f7139 + 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 85ddbca0130c..044e1625c31c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23125.1 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23125.1 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.1 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.1 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23125.1 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 - 8.0.0-preview.2.23124.5 + 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.1 From 6041c1a58988cc4161202ee228f001672ef0d99c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 20:12:46 +0000 Subject: [PATCH 120/135] Update dependencies from https://github.com/dotnet/aspnetcore build 20230225.2 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-preview.2.23124.6 -> To Version 8.0.0-preview.3.23125.2 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c4ee3508ef32..daf60bc42747 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn 3f192dc39715a87c827ed97b0573d860b6f14ac0 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf 6b67a31bca9cf848bb246895e046229dfb36bacc - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor b20e1550461849fae4a040f9d65f4318a8ad3c80 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 - + https://github.com/dotnet/aspnetcore - 7dc6dc63a60c38cd083e269ad510abd1ae114372 + 1455112d473a235ae6558da1c62b215531578801 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 99951b577d49..65e881672ad6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.3.23125.1 - 8.0.0-preview.3.23125.1 - 8.0.0-preview.3.23125.1 - 8.0.0-preview.3.23125.1 - 8.0.0-preview.3.23125.1 - 8.0.0-preview.3.23125.1 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23125.2 From 31e3d5a4577fb252c522612d14d799730494567c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 20:21:55 +0000 Subject: [PATCH 121/135] Update dependencies from https://github.com/dotnet/razor build 20230225.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23124.1 -> To Version 7.0.0-preview.23125.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe414902764b..2e6fe73c8a65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,22 +198,22 @@ https://github.com/dotnet/aspnetcore a11fec5fad546a315b4565af534f9efccec010b9 - + https://github.com/dotnet/razor - 6eec69294fbc40eb819fb5a70729d1427d2fb262 + d7ad748d4f436f89ecc1298f64a876047524ac45 - + https://github.com/dotnet/razor - 6eec69294fbc40eb819fb5a70729d1427d2fb262 + d7ad748d4f436f89ecc1298f64a876047524ac45 - + https://github.com/dotnet/razor - 6eec69294fbc40eb819fb5a70729d1427d2fb262 + d7ad748d4f436f89ecc1298f64a876047524ac45 - + https://github.com/dotnet/razor - 6eec69294fbc40eb819fb5a70729d1427d2fb262 + d7ad748d4f436f89ecc1298f64a876047524ac45 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4acd44b8da59..20e5822358ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,10 +158,10 @@ - 7.0.0-preview.23124.2 - 7.0.0-preview.23124.2 - 7.0.0-preview.23124.2 - 7.0.0-preview.23124.2 + 7.0.0-preview.23125.1 + 7.0.0-preview.23125.1 + 7.0.0-preview.23125.1 + 7.0.0-preview.23125.1 From 81215d943d0feaabd8e0346f9a726956e6baec80 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 20:22:12 +0000 Subject: [PATCH 122/135] Update dependencies from https://github.com/dotnet/razor build 20230225.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.23124.1 -> To Version 7.0.0-preview.23125.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75e838a8acfd..dbcafc2e4a0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -216,22 +216,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore febee99db845fd8766a13bdb391a07c3ee90b4ba - + https://github.com/dotnet/razor - 6eec69294fbc40eb819fb5a70729d1427d2fb262 + d7ad748d4f436f89ecc1298f64a876047524ac45 - + https://github.com/dotnet/razor - 6eec69294fbc40eb819fb5a70729d1427d2fb262 + d7ad748d4f436f89ecc1298f64a876047524ac45 - + https://github.com/dotnet/razor - 6eec69294fbc40eb819fb5a70729d1427d2fb262 + d7ad748d4f436f89ecc1298f64a876047524ac45 - + https://github.com/dotnet/razor - 6eec69294fbc40eb819fb5a70729d1427d2fb262 + d7ad748d4f436f89ecc1298f64a876047524ac45 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0ceeeaa7711d..0c6e098719d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,10 +162,10 @@ - 7.0.0-preview.23124.2 - 7.0.0-preview.23124.2 - 7.0.0-preview.23124.2 - 7.0.0-preview.23124.2 + 7.0.0-preview.23125.1 + 7.0.0-preview.23125.1 + 7.0.0-preview.23125.1 + 7.0.0-preview.23125.1 From 464547e942a3d1844e05e510c8ff66be3498a908 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 22:14:35 +0000 Subject: [PATCH 123/135] Update dependencies from https://github.com/dotnet/roslyn build 20230225.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.6.0-2.23124.3 -> To Version 4.6.0-2.23125.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 ba8290a00e5d..2c478d38ea36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 65c854c77cf7..8debdce38e5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From ced9a409eea3ca70bf2a27f1eb5a119be5132786 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Feb 2023 22:14:46 +0000 Subject: [PATCH 124/135] Update dependencies from https://github.com/dotnet/roslyn build 20230225.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.6.0-2.23124.4 -> To Version 4.6.0-2.23125.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 b2492d7d36e1..4bef5be9bc3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 - + https://github.com/dotnet/roslyn - 62a827b5880d9f935297f1a83964f92cd519a734 + 286d4ed006c381cfa6419f74f529a04b09c66186 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 90fe9fb54418..d82898d64af1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 - 4.6.0-2.23125.1 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 + 4.6.0-2.23125.2 $(MicrosoftNetCompilersToolsetPackageVersion) From 6a846a9f7758aa080eee441a5907fda8d75cfd09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Feb 2023 01:12:17 +0000 Subject: [PATCH 125/135] Update dependencies from https://github.com/dotnet/runtime build 20230225.2 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23124.3 -> To Version 8.0.0-preview.2.23125.2 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97ea2c42d631..6511ee242bd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 41e6e40afd6864941ceaabc6d6451925daa47c01 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - 75a32b8561cb2c2e9a5e1aebaf28c36ce20d2315 + 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 044e1625c31c..8ddf2c3910f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.2 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.2 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23125.1 - 8.0.0-preview.2.23125.1 - 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23125.1 - 8.0.0-preview.2.23125.1 - 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.2 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.2 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23125.1 - 8.0.0-preview.2.23125.1 - 8.0.0-preview.2.23125.1 + 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.2 From 20ad8951fe925167754f2c5afad3463b3622f513 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Feb 2023 03:01:07 +0000 Subject: [PATCH 126/135] Update dependencies from https://github.com/dotnet/windowsdesktop build 20230225.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-preview.2.23123.1 -> To Version 8.0.0-preview.2.23125.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.0-preview.2.23122.1 -> To Version 8.0.0-preview.2.23124.2 (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 f0e2bb9ff594..5cef504bbaa8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -133,25 +133,25 @@ https://github.com/dotnet/runtime d3b7dc1399d0214d627a4197be1fab734a84e05f - + https://github.com/dotnet/windowsdesktop - 6e61aa9df3ce18122c0833243e200949ac05c41f + b587906c2964aaefab5fbd7a27af5fbc59120a4e - + https://github.com/dotnet/windowsdesktop - 6e61aa9df3ce18122c0833243e200949ac05c41f + b587906c2964aaefab5fbd7a27af5fbc59120a4e - + https://github.com/dotnet/windowsdesktop - 6e61aa9df3ce18122c0833243e200949ac05c41f + b587906c2964aaefab5fbd7a27af5fbc59120a4e - + https://github.com/dotnet/windowsdesktop - 6e61aa9df3ce18122c0833243e200949ac05c41f + b587906c2964aaefab5fbd7a27af5fbc59120a4e - + https://github.com/dotnet/wpf - 6b67a31bca9cf848bb246895e046229dfb36bacc + 71ca704b43ee711d5808e71be88c67e18e99eea0 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 16231101b917..a675fb7a4a61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -165,7 +165,7 @@ - 8.0.0-preview.2.23122.1 + 8.0.0-preview.2.23124.2 From 7b9be472038e502b80d294520676c43802cdb4d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Feb 2023 11:54:04 +0000 Subject: [PATCH 127/135] Update dependencies from https://github.com/dotnet/roslyn build 20230226.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.6.0-2.23124.3 -> To Version 4.6.0-2.23126.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 2c478d38ea36..a1716a192d99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 8debdce38e5f..f9284f223a87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 302f2638832b33831fbe3871e4acfdff0dfb03a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Feb 2023 11:54:16 +0000 Subject: [PATCH 128/135] Update dependencies from https://github.com/dotnet/roslyn build 20230226.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.6.0-2.23124.4 -> To Version 4.6.0-2.23126.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 4bef5be9bc3e..278bdf3b857b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 - + https://github.com/dotnet/roslyn - 286d4ed006c381cfa6419f74f529a04b09c66186 + 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index d82898d64af1..72a7384c2752 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 - 4.6.0-2.23125.2 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 + 4.6.0-2.23126.1 $(MicrosoftNetCompilersToolsetPackageVersion) From a835a8931dd6a8818de584493318bb5fd071988b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Feb 2023 12:00:42 +0000 Subject: [PATCH 129/135] Update dependencies from https://github.com/dotnet/runtime build 20230225.5 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23124.3 -> To Version 8.0.0-preview.2.23125.5 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6511ee242bd2..4dfaeaef38de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 41e6e40afd6864941ceaabc6d6451925daa47c01 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - 2ee941b5e33b68fc39d2c6c2a26f025e0d2efee6 + bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 8ddf2c3910f8..1599aa888dcb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.5 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.5 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23125.2 - 8.0.0-preview.2.23125.2 - 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23125.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23125.2 - 8.0.0-preview.2.23125.2 - 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23125.5 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.5 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23125.2 - 8.0.0-preview.2.23125.2 - 8.0.0-preview.2.23125.2 + 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23125.5 From bb3b7000d7a30bdc3775302f1f09e0a597f17b39 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Feb 2023 13:54:37 +0000 Subject: [PATCH 130/135] Update dependencies from https://github.com/dotnet/roslyn build 20230226.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.6.0-2.23124.3 -> To Version 4.6.0-2.23126.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 a1716a192d99..522ba885cdda 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -64,34 +64,34 @@ 2cb3e68c6b9a966114572fd63f2a20d2cb54a288 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index f9284f223a87..dc2786dc7464 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 $(MicrosoftNetCompilersToolsetPackageVersion) 4.6.0-2.23081.23 From 0bcb655626bc1a72f9bee2a4580523dfad31c64f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Feb 2023 13:54:50 +0000 Subject: [PATCH 131/135] Update dependencies from https://github.com/dotnet/roslyn build 20230226.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.6.0-2.23124.4 -> To Version 4.6.0-2.23126.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 278bdf3b857b..061e87108c3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,34 +68,34 @@ 49c2ef651359526841d13e66129b71d1bcd9cef9 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/roslyn - 87debaebbb0b3d3d2ff0a74bd872b8b9c17fb917 + 4641f2bff815fb7743be8aa2bdafe82b74a1f756 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 72a7384c2752..7b0e1507a238 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 - 4.6.0-2.23126.1 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 + 4.6.0-2.23126.2 $(MicrosoftNetCompilersToolsetPackageVersion) From f7292087618a01216fd6b84bde4c9e4eb1f6b622 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 01:04:16 +0000 Subject: [PATCH 132/135] Update dependencies from https://github.com/dotnet/runtime build 20230226.2 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23124.3 -> To Version 8.0.0-preview.2.23126.2 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dfaeaef38de..aa166843df8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 41e6e40afd6864941ceaabc6d6451925daa47c01 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - bee217ffbdd6b3ad60b0e1e17c6370f4bb618779 + 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 1599aa888dcb..3c2639fd3110 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23126.2 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23126.2 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23125.5 - 8.0.0-preview.2.23125.5 - 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23125.5 - 8.0.0-preview.2.23125.5 - 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23126.2 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23125.5 - 8.0.0-preview.2.23125.5 - 8.0.0-preview.2.23125.5 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.2 From 1415b1ad4834f0bb16d22f701ea0858880b70fea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 05:43:25 +0000 Subject: [PATCH 133/135] Update dependencies from https://github.com/dotnet/runtime build 20230226.3 Microsoft.Extensions.DependencyModel , 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.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.0-preview.2.23126.2 -> To Version 8.0.0-preview.2.23126.3 --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 2 files changed, 42 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a59725039e58..ccce6ebebd2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,41 +6,41 @@ 41e6e40afd6864941ceaabc6d6451925daa47c01 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 https://github.com/dotnet/msbuild @@ -109,29 +109,29 @@ https://github.com/microsoft/vstest 05c0c4c4f084782533443dfeae0f6627018c5b6a - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 https://github.com/dotnet/linker c790896f128957acd2999208f44f09ae1e826c8c - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 https://github.com/dotnet/windowsdesktop @@ -278,9 +278,9 @@ https://github.com/dotnet/arcade c4a85adbff520f62bfade7a6132f471506c3d35a - + https://github.com/dotnet/runtime - 48bc77d54b462aa9ffe1d08f2735c0811e28b9f1 + eb20195fb00d3cc7217a10b7de4b3b00710ce672 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index 522f84f59009..6703339d64f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,12 +35,12 @@ 6.0.0 8.0.0-beta.23120.1 7.0.0-preview.22423.2 - 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.3 4.3.0 4.3.0 4.0.5 6.0.0 - 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.3 4.6.0 2.0.0-beta4.22564.1 1.0.0-preview5.1.22263.1 @@ -48,17 +48,17 @@ - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 6.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 6.0.0 - 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.3 7.0.0 @@ -86,9 +86,9 @@ - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 - 8.0.0-preview.2.23126.2 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 + 8.0.0-preview.2.23126.3 From 0b71c81baabd733e04ba0e321c3b0716dcda7c23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Feb 2023 06:15:16 +0000 Subject: [PATCH 134/135] Update dependencies from https://github.com/dotnet/aspnetcore build 20230226.2 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-preview.3.23125.2 -> To Version 8.0.0-preview.3.23126.2 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 12 ++++---- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a59725039e58..1a1270e61dee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,13 +93,13 @@ https://github.com/dotnet/roslyn 4641f2bff815fb7743be8aa2bdafe82b74a1f756 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 https://github.com/nuget/nuget.client @@ -153,50 +153,50 @@ https://github.com/dotnet/wpf 71ca704b43ee711d5808e71be88c67e18e99eea0 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 https://github.com/dotnet/razor @@ -215,21 +215,21 @@ https://github.com/dotnet/razor d7ad748d4f436f89ecc1298f64a876047524ac45 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 - + https://github.com/dotnet/aspnetcore - 1455112d473a235ae6558da1c62b215531578801 + 446e27e0fd79ab0e0193915d8d342b6f787a7569 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 522f84f59009..9980f1f836f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,12 +149,12 @@ - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 - 8.0.0-preview.3.23125.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 + 8.0.0-preview.3.23126.2 From a017b3e49ed865d468a45277f968e4d4bb4d9d24 Mon Sep 17 00:00:00 2001 From: Andrii Patsula Date: Mon, 27 Feb 2023 10:05:28 +0100 Subject: [PATCH 135/135] GenAPI: Filter out generic base interfaces if type argument/s are filtered out. (#30851) --- .../CSharpFileBuilder.cs | 5 +- .../INamedTypeSymbolExtension.cs | 10 +++- .../SyntaxGeneratorExtensions.cs | 8 +++- .../CSharpFileBuilderTests.cs | 48 ++++++++++++++++++- 4 files changed, 66 insertions(+), 5 deletions(-) diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs index 9aa4143fcd9d..6f9cee744287 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs +++ b/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs @@ -10,6 +10,7 @@ using Microsoft.CodeAnalysis.CSharp.Formatting; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Editing; +using Microsoft.CodeAnalysis.FindSymbols; using Microsoft.CodeAnalysis.Formatting; using Microsoft.CodeAnalysis.Options; using Microsoft.CodeAnalysis.Simplification; @@ -144,7 +145,9 @@ private SyntaxNode Visit(SyntaxNode namedTypeNode, INamedTypeSymbol namedType) // If the method is ExplicitInterfaceImplementation and is derived from an interface that was filtered out, we must filter out it either. if (member is IMethodSymbol method && method.MethodKind == MethodKind.ExplicitInterfaceImplementation && - method.ExplicitInterfaceImplementations.Any(m => !_symbolFilter.Include(m.ContainingSymbol))) + method.ExplicitInterfaceImplementations.Any(m => !_symbolFilter.Include(m.ContainingSymbol) || + // if explicit interface implementation method has inaccessible type argument + m.ContainingType.HasInaccessibleTypeArgument(_symbolFilter))) { continue; } diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs index fe4366afa1e4..4b4e6c9e05e3 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs +++ b/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs @@ -7,7 +7,6 @@ using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Syntax; -using Microsoft.CodeAnalysis.Editing; using Microsoft.DotNet.ApiSymbolExtensions.Filtering; namespace Microsoft.DotNet.GenAPI @@ -166,6 +165,15 @@ public static bool IsBoundGenericType(this INamedTypeSymbol namedType) return true; } + /// + /// Detects if a generic type contains inaccessible type arguments. + /// + /// A loaded named type symbol . + /// Assembly symbol filter . + /// Boolean + public static bool HasInaccessibleTypeArgument(this INamedTypeSymbol namedType, ISymbolFilter symbolFilter) + => namedType.IsGenericType && namedType.TypeArguments.Any(a => !symbolFilter.Include(a)); + /// /// Synthesize an internal default constructor for the type with implicit default constructor and the base type without. /// diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs index e22a6e8e5243..a31df3fae9c9 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs +++ b/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs @@ -9,6 +9,8 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using System.Collections.Generic; using Microsoft.DotNet.ApiSymbolExtensions.Filtering; +using System.Security.AccessControl; +using Microsoft.VisualBasic; namespace Microsoft.DotNet.GenAPI { @@ -107,8 +109,10 @@ public static SyntaxNode DeclarationExt(this SyntaxGenerator syntaxGenerator, IS baseTypes.Add(SyntaxFactory.SimpleBaseType((TypeSyntax)syntaxGenerator.TypeExpression(type.BaseType))); } - // includes only interfaces that were not filtered out by the given . - baseTypes.AddRange(type.Interfaces.Where(symbolFilter.Include).Select(i => SyntaxFactory.SimpleBaseType((TypeSyntax)syntaxGenerator.TypeExpression(i)))); + // includes only interfaces that were not filtered out by the given or none of TypeParameters were filtered out. + baseTypes.AddRange(type.Interfaces + .Where(i => symbolFilter.Include(i) && !i.HasInaccessibleTypeArgument(symbolFilter)) + .Select(i => SyntaxFactory.SimpleBaseType((TypeSyntax)syntaxGenerator.TypeExpression(i)))); return baseTypes.Count > 0 ? SyntaxFactory.BaseList(SyntaxFactory.SeparatedList(baseTypes)) : null; diff --git a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs index c5f7403d8155..63fcdd061d94 100644 --- a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs +++ b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs @@ -1685,7 +1685,7 @@ public partial class Bar { public Bar() { } } - + public partial class Foo : Bar { } @@ -1693,5 +1693,51 @@ public partial class Foo : Bar """, includeInternalSymbols: false); } + + [Fact] + public void TestGenericBaseInterfaceWithInaccessibleTypeArguments() + { + RunTest(original: """ + namespace A + { + internal class IOption2 + { + } + + public interface IOption + { + } + + public interface AreEqual + { + bool Compare(T other); + } + + public class PerLanguageOption : AreEqual, IOption + { + bool AreEqual.Compare(IOption2 other) => false; + } + } + """, + expected: """ + namespace A + { + public partial interface AreEqual + { + bool Compare(T other); + } + + public partial interface IOption + { + } + + public partial class PerLanguageOption : IOption + { + } + } + """, + includeInternalSymbols: false); + } } } +