From ae3dbe78fb8fe536711f27df92786fac55140f28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Jan 2025 05:02:21 +0000 Subject: [PATCH 01/44] Update dependencies from https://github.com/dotnet/arcade build 20250115.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25058.5 -> To Version 9.0.0-beta.25065.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/template-guidance.md | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 320f527dfd46..6732e27ec683 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 - + https://github.com/dotnet/arcade - 8cc6ecd76c24ef6665579a5c5e386a211a1e7c54 + c4bbc67763bf0c5a868862df874079380e647d61 diff --git a/eng/Versions.props b/eng/Versions.props index 790bd53fa4f9..61dd718296d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -268,10 +268,10 @@ - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 - 9.0.0-beta.25058.5 + 9.0.0-beta.25065.2 + 9.0.0-beta.25065.2 + 9.0.0-beta.25065.2 + 9.0.0-beta.25065.2 diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 5ef6c30ba924..98bbc1ded0ba 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -57,7 +57,7 @@ extends: Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`). -# Development notes +## Development notes **Folder / file structure** diff --git a/global.json b/global.json index 941956b31be0..faef1c789e0c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100", + "dotnet": "9.0.102", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25058.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25058.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From a8575fc5074295baa567154e3933b0f40b6f66f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Jan 2025 05:01:25 +0000 Subject: [PATCH 02/44] Update dependencies from https://github.com/dotnet/razor build 20250122.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25072.1 -> To Version 9.0.0-preview.25072.3 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93f69196026d..40cf3150f55c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 681195c6cdef..5bbddaae4eb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 08d80b6a31a10731bc4ed953dee962bd68f9ef8f + 4b6227bb3f6d9161b320d22ea1a82fc78821f278 - + https://github.com/dotnet/razor - 08d80b6a31a10731bc4ed953dee962bd68f9ef8f + 4b6227bb3f6d9161b320d22ea1a82fc78821f278 - + https://github.com/dotnet/razor - 08d80b6a31a10731bc4ed953dee962bd68f9ef8f + 4b6227bb3f6d9161b320d22ea1a82fc78821f278 - + https://github.com/dotnet/razor - 08d80b6a31a10731bc4ed953dee962bd68f9ef8f + 4b6227bb3f6d9161b320d22ea1a82fc78821f278 diff --git a/eng/Versions.props b/eng/Versions.props index a79bdb05f429..f688e7edb56f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25072.1 - 9.0.0-preview.25072.1 - 9.0.0-preview.25072.1 + 9.0.0-preview.25072.3 + 9.0.0-preview.25072.3 + 9.0.0-preview.25072.3 From 17c3bbe14e7a7e301841a3a675a2146b9bd026fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Jan 2025 05:02:42 +0000 Subject: [PATCH 03/44] Update dependencies from https://github.com/dotnet/msbuild build 20250123.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25072-12 -> To Version 17.14.0-preview-25073-02 --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93f69196026d..40cf3150f55c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 681195c6cdef..d961c06885c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 6bed355f6bb313c1f6e7b887da460f9b49ec8f6b + 291a8108761ed347562228f2f8f25477996a5a93 - + https://github.com/dotnet/msbuild - 6bed355f6bb313c1f6e7b887da460f9b49ec8f6b + 291a8108761ed347562228f2f8f25477996a5a93 - + https://github.com/dotnet/msbuild - 6bed355f6bb313c1f6e7b887da460f9b49ec8f6b + 291a8108761ed347562228f2f8f25477996a5a93 diff --git a/eng/Versions.props b/eng/Versions.props index a79bdb05f429..fbf72bdaf5cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.0-preview-25072-12 - 17.14.0-preview-25072-12 + 17.14.0-preview-25073-02 + 17.14.0-preview-25073-02 17.11.4 17.12 From 61ef4498689387f5d78e7068dc2f46beb41fb101 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Jan 2025 10:31:55 +0000 Subject: [PATCH 04/44] Update dependencies from https://github.com/microsoft/vstest build 20250123.7 Microsoft.SourceBuild.Intermediate.vstest , Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.12.0-release-24508-01 -> To Version 17.14.0-preview-25073-07 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 373f84b7025e..ac9fc5753525 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -208,22 +208,22 @@ https://github.com/nuget/nuget.client c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 88d210d6e5bc440f7defbe776ab40c3d63a3c5a6 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 88d210d6e5bc440f7defbe776ab40c3d63a3c5a6 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 88d210d6e5bc440f7defbe776ab40c3d63a3c5a6 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 88d210d6e5bc440f7defbe776ab40c3d63a3c5a6 diff --git a/eng/Versions.props b/eng/Versions.props index 805385d6f5d4..3fbe610edcec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,9 +150,9 @@ - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.0-preview-25073-07 + 17.14.0-preview-25073-07 + 17.14.0-preview-25073-07 From 3cd7c654c9052b5e08be0927d7dea9b01ac3b8c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Fri, 24 Jan 2025 11:39:25 -0800 Subject: [PATCH 05/44] Synchronize watched process and reporter output printing (#46141) --- .../Internal/BrowserSpecificReporter.cs | 10 +----- .../dotnet-watch/Internal/ConsoleReporter.cs | 17 +++++----- .../dotnet-watch/Internal/IReporter.cs | 12 +++++-- .../dotnet-watch/Internal/NullReporter.cs | 17 +++------- .../dotnet-watch/Internal/ProcessRunner.cs | 11 +++---- .../Internal/ProjectSpecificReporter.cs | 9 ++---- .../HotReload/RuntimeProcessLauncherTests.cs | 31 ++++++++++--------- .../MsBuildFileSetFactoryTest.cs | 16 +++------- .../Utilities/MockReporter.cs | 10 ++---- .../Utilities/TestReporter.cs | 23 +++++--------- 10 files changed, 60 insertions(+), 96 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs index 2d15a2d78ba8..11f0034d68d8 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/BrowserSpecificReporter.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Graph; - namespace Microsoft.DotNet.Watch; internal sealed class BrowserSpecificReporter(int browserId, IReporter underlyingReporter) : IReporter @@ -12,14 +10,8 @@ internal sealed class BrowserSpecificReporter(int browserId, IReporter underlyin public bool IsVerbose => underlyingReporter.IsVerbose; - public bool EnableProcessOutputReporting - => false; - - public void ReportProcessOutput(ProjectGraphNode project, OutputLine line) - => throw new InvalidOperationException(); - public void ReportProcessOutput(OutputLine line) - => throw new InvalidOperationException(); + => underlyingReporter.ReportProcessOutput(line); public void Report(MessageDescriptor descriptor, string prefix, object?[] args) => underlyingReporter.Report(descriptor, _prefix + prefix, args); diff --git a/src/BuiltInTools/dotnet-watch/Internal/ConsoleReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/ConsoleReporter.cs index d539664fe43b..aa958b9e6c44 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ConsoleReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ConsoleReporter.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Graph; - namespace Microsoft.DotNet.Watch { /// @@ -15,16 +13,15 @@ internal sealed class ConsoleReporter(IConsole console, bool verbose, bool quiet public bool IsQuiet { get; } = quiet; public bool SuppressEmojis { get; } = suppressEmojis; - private readonly object _writeLock = new(); - - public bool EnableProcessOutputReporting - => false; + private readonly Lock _writeLock = new(); public void ReportProcessOutput(OutputLine line) - => throw new InvalidOperationException(); - - public void ReportProcessOutput(ProjectGraphNode project, OutputLine line) - => throw new InvalidOperationException(); + { + lock (_writeLock) + { + (line.IsError ? console.Error : console.Out).WriteLine(line.Content); + } + } private void WriteLine(TextWriter writer, string message, ConsoleColor? color, string emoji) { diff --git a/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs index e00058d62221..27d3578f3727 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/IReporter.cs @@ -86,13 +86,19 @@ public bool IsVerbose => false; /// - /// True to call when launched process writes to standard output. + /// If true, the output of the process will be prefixed with the project display name. /// Used for testing. /// - bool EnableProcessOutputReporting { get; } + public bool PrefixProcessOutput + => false; + /// + /// Reports the output of a process that is being watched. + /// + /// + /// Not used to report output of dotnet-build processed launched by dotnet-watch to build or evaluate projects. + /// void ReportProcessOutput(OutputLine line); - void ReportProcessOutput(ProjectGraphNode project, OutputLine line); void Report(MessageDescriptor descriptor, params object?[] args) => Report(descriptor, prefix: "", args); diff --git a/src/BuiltInTools/dotnet-watch/Internal/NullReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/NullReporter.cs index 4e9ead24dcce..84fac6c1c273 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/NullReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/NullReporter.cs @@ -1,8 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using Microsoft.Build.Graph; - namespace Microsoft.DotNet.Watch { /// @@ -11,20 +9,15 @@ namespace Microsoft.DotNet.Watch /// internal sealed class NullReporter : IReporter { - private NullReporter() - { } - public static IReporter Singleton { get; } = new NullReporter(); - public bool EnableProcessOutputReporting - => false; + private NullReporter() + { + } public void ReportProcessOutput(OutputLine line) - => throw new InvalidOperationException(); - - public void ReportProcessOutput(ProjectGraphNode project, OutputLine line) - => throw new InvalidOperationException(); - + { + } public void Report(MessageDescriptor descriptor, string prefix, object?[] args) { diff --git a/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs b/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs index d3efc9d8d92c..8e877342fe0e 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ProcessRunner.cs @@ -31,11 +31,10 @@ public static async Task RunAsync(ProcessSpec processSpec, IReporter report var onOutput = processSpec.OnOutput; - // allow tests to watch for application output: - if (reporter.EnableProcessOutputReporting) - { - onOutput += line => reporter.ReportProcessOutput(line); - } + // If output isn't already redirected (build invocation) we redirect it to the reporter. + // The reporter synchronizes the output of the process with the reporter output, + // so that the printed lines don't interleave. + onOutput ??= line => reporter.ReportProcessOutput(line); using var process = CreateProcess(processSpec, onOutput, state, reporter); @@ -186,7 +185,7 @@ private static Process CreateProcess(ProcessSpec processSpec, Action FileName = processSpec.Executable, UseShellExecute = false, WorkingDirectory = processSpec.WorkingDirectory, - RedirectStandardOutput = onOutput != null, + RedirectStandardOutput = onOutput != null, RedirectStandardError = onOutput != null, } }; diff --git a/src/BuiltInTools/dotnet-watch/Internal/ProjectSpecificReporter.cs b/src/BuiltInTools/dotnet-watch/Internal/ProjectSpecificReporter.cs index e2746996b589..93d0a8fe0987 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/ProjectSpecificReporter.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/ProjectSpecificReporter.cs @@ -12,14 +12,9 @@ internal sealed class ProjectSpecificReporter(ProjectGraphNode node, IReporter u public bool IsVerbose => underlyingReporter.IsVerbose; - public bool EnableProcessOutputReporting - => underlyingReporter.EnableProcessOutputReporting; - - public void ReportProcessOutput(ProjectGraphNode project, OutputLine line) - => underlyingReporter.ReportProcessOutput(project, line); - public void ReportProcessOutput(OutputLine line) - => ReportProcessOutput(node, line); + => underlyingReporter.ReportProcessOutput( + underlyingReporter.PrefixProcessOutput ? line with { Content = $"[{_projectDisplayName}] {line.Content}" } : line); public void Report(MessageDescriptor descriptor, string prefix, object?[] args) => underlyingReporter.Report(descriptor, $"[{_projectDisplayName}] {prefix}", args); diff --git a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs index 103e5bfd8500..8b5b18cbce71 100644 --- a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs +++ b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs @@ -3,7 +3,6 @@ #nullable enable -using System.Collections.Immutable; using System.Runtime.CompilerServices; namespace Microsoft.DotNet.Watch.UnitTests; @@ -142,6 +141,8 @@ public async Task UpdateAndRudeEdit(TriggerEvent trigger) { var testAsset = CopyTestAsset("WatchAppMultiProc", trigger); + var tfm = ToolsetInfo.CurrentTargetFramework; + var workingDirectory = testAsset.Path; var hostDir = Path.Combine(testAsset.Path, "Host"); var hostProject = Path.Combine(hostDir, "Host.csproj"); @@ -219,18 +220,18 @@ async Task MakeValidDependencyChange() { var hasUpdateSourceA = w.CreateCompletionSource(); var hasUpdateSourceB = w.CreateCompletionSource(); - w.Reporter.OnProjectProcessOutput += (projectPath, line) => + w.Reporter.OnProcessOutput += line => { if (line.Content.Contains("")) { - if (projectPath == serviceProjectA) + if (line.Content.StartsWith($"[A ({tfm})]")) { if (!hasUpdateSourceA.Task.IsCompleted) { hasUpdateSourceA.SetResult(); } } - else if (projectPath == serviceProjectB) + else if (line.Content.StartsWith($"[B ({tfm})]")) { if (!hasUpdateSourceB.Task.IsCompleted) { @@ -239,7 +240,7 @@ async Task MakeValidDependencyChange() } else { - Assert.Fail("Only service projects should be updated"); + Assert.Fail($"Only service projects should be updated: '{line.Content}'"); } } }; @@ -273,9 +274,9 @@ public static void Common() async Task MakeRudeEditChange() { var hasUpdateSource = w.CreateCompletionSource(); - w.Reporter.OnProjectProcessOutput += (projectPath, line) => + w.Reporter.OnProcessOutput += line => { - if (projectPath == serviceProjectA && line.Content.Contains("Started A: 2")) + if (line.Content.StartsWith($"[A ({tfm})]") && line.Content.Contains("Started A: 2")) { hasUpdateSource.SetResult(); } @@ -300,6 +301,7 @@ async Task MakeRudeEditChange() public async Task UpdateAppliedToNewProcesses(bool sharedOutput) { var testAsset = CopyTestAsset("WatchAppMultiProc", sharedOutput); + var tfm = ToolsetInfo.CurrentTargetFramework; if (sharedOutput) { @@ -325,21 +327,21 @@ public async Task UpdateAppliedToNewProcesses(bool sharedOutput) var hasUpdateA = new SemaphoreSlim(initialCount: 0); var hasUpdateB = new SemaphoreSlim(initialCount: 0); - w.Reporter.OnProjectProcessOutput += (projectPath, line) => + w.Reporter.OnProcessOutput += line => { if (line.Content.Contains("")) { - if (projectPath == serviceProjectA) + if (line.Content.StartsWith($"[A ({tfm})]")) { hasUpdateA.Release(); } - else if (projectPath == serviceProjectB) + else if (line.Content.StartsWith($"[B ({tfm})]")) { hasUpdateB.Release(); } else { - Assert.Fail("Only service projects should be updated"); + Assert.Fail($"Only service projects should be updated: '{line.Content}'"); } } }; @@ -398,6 +400,7 @@ public enum UpdateLocation public async Task HostRestart(UpdateLocation updateLocation) { var testAsset = CopyTestAsset("WatchAppMultiProc", updateLocation); + var tfm = ToolsetInfo.CurrentTargetFramework; var workingDirectory = testAsset.Path; var hostDir = Path.Combine(testAsset.Path, "Host"); @@ -414,17 +417,17 @@ public async Task HostRestart(UpdateLocation updateLocation) var restartRequested = w.Reporter.RegisterSemaphore(MessageDescriptor.RestartRequested); var hasUpdate = new SemaphoreSlim(initialCount: 0); - w.Reporter.OnProjectProcessOutput += (projectPath, line) => + w.Reporter.OnProcessOutput += line => { if (line.Content.Contains("")) { - if (projectPath == hostProject) + if (line.Content.StartsWith($"[Host ({tfm})]")) { hasUpdate.Release(); } else { - Assert.Fail("Only service projects should be updated"); + Assert.Fail($"Only service projects should be updated: '{line.Content}'"); } } }; diff --git a/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs b/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs index 36c61d7de8f6..e4a569fc22b1 100644 --- a/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs +++ b/test/dotnet-watch.Tests/MsBuildFileSetFactoryTest.cs @@ -10,7 +10,7 @@ public class MsBuildFileSetFactoryTest(ITestOutputHelper output) private readonly TestReporter _reporter = new(output); private readonly TestAssetsManager _testAssets = new(output); - private string MuxerPath + private static string MuxerPath => TestContext.Current.ToolsetUnderTest.DotNetHostPath; private static string InspectPath(string path, string rootDir) @@ -327,9 +327,6 @@ public async Task ProjectReferences_Graph() var options = TestOptions.GetEnvironmentOptions(workingDirectory: testDirectory, muxerPath: MuxerPath); - var output = new List(); - _reporter.OnProcessOutput += line => output.Add(line.Content); - var filesetFactory = new MSBuildFileSetFactory(projectA, buildArguments: ["/p:_DotNetWatchTraceOutput=true"], options, _reporter); var result = await filesetFactory.TryCreateAsync(requireProjectGraph: null, CancellationToken.None); @@ -365,7 +362,7 @@ public async Task ProjectReferences_Graph() "Collecting watch items from 'F'", "Collecting watch items from 'G'", ], - output.Where(l => l.Contains("Collecting watch items from")).Select(l => l.Trim()).Order()); + _reporter.Messages.Where(l => l.text.Contains("Collecting watch items from")).Select(l => l.text.Trim()).Order()); } [Fact] @@ -386,17 +383,14 @@ public async Task MsbuildOutput() var options = TestOptions.GetEnvironmentOptions(workingDirectory: Path.GetDirectoryName(project1Path)!, muxerPath: MuxerPath); - var output = new List(); - _reporter.OnProcessOutput += line => output.Add($"{(line.IsError ? "[stderr]" : "[stdout]")} {line.Content}"); - var factory = new MSBuildFileSetFactory(project1Path, buildArguments: [], options, _reporter); var result = await factory.TryCreateAsync(requireProjectGraph: null, CancellationToken.None); Assert.Null(result); - // note: msbuild prints errors to stdout: + // note: msbuild prints errors to stdout, we match the pattern and report as error: AssertEx.Equal( - $"[stdout] {project1Path} : error NU1201: Project Project2 is not compatible with net462 (.NETFramework,Version=v4.6.2). Project Project2 supports: netstandard2.1 (.NETStandard,Version=v2.1)", - output.Single(l => l.Contains("error NU1201"))); + (MessageSeverity.Error, $"{project1Path} : error NU1201: Project Project2 is not compatible with net462 (.NETFramework,Version=v4.6.2). Project Project2 supports: netstandard2.1 (.NETStandard,Version=v2.1)"), + _reporter.Messages.Single(l => l.text.Contains("error NU1201"))); } private Task Evaluate(TestAsset projectPath) diff --git a/test/dotnet-watch.Tests/Utilities/MockReporter.cs b/test/dotnet-watch.Tests/Utilities/MockReporter.cs index ce39c5cd308f..c532551f1bf0 100644 --- a/test/dotnet-watch.Tests/Utilities/MockReporter.cs +++ b/test/dotnet-watch.Tests/Utilities/MockReporter.cs @@ -3,21 +3,15 @@ #nullable enable -using Microsoft.Build.Graph; - namespace Microsoft.DotNet.Watch.UnitTests; internal class MockReporter : IReporter { public readonly List Messages = []; - public bool EnableProcessOutputReporting => false; - public void ReportProcessOutput(OutputLine line) - => throw new InvalidOperationException(); - - public void ReportProcessOutput(ProjectGraphNode project, OutputLine line) - => throw new InvalidOperationException(); + { + } public void Report(MessageDescriptor descriptor, string prefix, object?[] args) { diff --git a/test/dotnet-watch.Tests/Utilities/TestReporter.cs b/test/dotnet-watch.Tests/Utilities/TestReporter.cs index b02a7ee5d5e6..7b85a20cc989 100644 --- a/test/dotnet-watch.Tests/Utilities/TestReporter.cs +++ b/test/dotnet-watch.Tests/Utilities/TestReporter.cs @@ -4,7 +4,6 @@ #nullable enable using System.Diagnostics; -using Microsoft.Build.Graph; namespace Microsoft.DotNet.Watch.UnitTests { @@ -12,14 +11,14 @@ internal class TestReporter(ITestOutputHelper output) : IReporter { private readonly Dictionary _actions = []; public readonly List ProcessOutput = []; + public readonly List<(MessageSeverity severity, string text)> Messages = []; - public bool EnableProcessOutputReporting + public bool IsVerbose => true; - public bool IsVerbose + public bool PrefixProcessOutput => true; - public event Action? OnProjectProcessOutput; public event Action? OnProcessOutput; public void ReportProcessOutput(OutputLine line) @@ -30,16 +29,6 @@ public void ReportProcessOutput(OutputLine line) OnProcessOutput?.Invoke(line); } - public void ReportProcessOutput(ProjectGraphNode project, OutputLine line) - { - var content = $"[{project.GetDisplayName()}]: {line.Content}"; - - WriteTestOutput(content); - ProcessOutput.Add(content); - - OnProjectProcessOutput?.Invoke(project.ProjectInstance.FullPath, line); - } - public SemaphoreSlim RegisterSemaphore(MessageDescriptor descriptor) { var semaphore = new SemaphoreSlim(initialCount: 0); @@ -67,6 +56,8 @@ public void Report(MessageDescriptor descriptor, string prefix, object?[] args) { if (descriptor.TryGetMessage(prefix, args, out var message)) { + Messages.Add((descriptor.Severity, message)); + WriteTestOutput($"{ToString(descriptor.Severity)} {descriptor.Emoji} {message}"); } @@ -76,11 +67,11 @@ public void Report(MessageDescriptor descriptor, string prefix, object?[] args) } } - private void WriteTestOutput(string message) + private void WriteTestOutput(string line) { try { - output.WriteLine(message); + output.WriteLine(line); } catch (InvalidOperationException) { From efa301eb5bce125c8db18f650e8f26de3ba23a7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 24 Jan 2025 22:43:05 +0000 Subject: [PATCH 06/44] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20250124.4 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.24527.2 -> To Version 3.11.0-beta1.25074.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 373f84b7025e..a81e27ca9171 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -374,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 5bfaf6aea5cf9d1c924d9adc69916eac3be07880 + 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn-analyzers - 5bfaf6aea5cf9d1c924d9adc69916eac3be07880 + 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn-analyzers - 5bfaf6aea5cf9d1c924d9adc69916eac3be07880 + 16865ea61910500f1022ad2b96c499e5df02c228 diff --git a/eng/Versions.props b/eng/Versions.props index 805385d6f5d4..93061101f762 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,8 +156,8 @@ - 9.0.0-preview.24527.2 - 3.11.0-beta1.24527.2 + 9.0.0-preview.25074.4 + 3.11.0-beta1.25074.4 From 027f2a4ac73570db09970d5a1558115e09ea2ae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Fri, 24 Jan 2025 15:18:03 -0800 Subject: [PATCH 07/44] Finalize packages for reuse of the agent in VS/ASP.NET (#46216) --- sdk.sln | 15 ++++++++++ ...osoft.Extensions.DotNetDeltaApplier.csproj | 9 +++++- .../AgentEnvironmentVariables.cs | 0 .../AgentMessageSeverity.cs | 0 ...DotNet.HotReload.Agent.Data.Package.csproj | 29 +++++++++++++++++++ ...soft.DotNet.HotReload.Agent.Data.projitems | 14 +++++++++ ...crosoft.DotNet.HotReload.Agent.Data.shproj | 13 +++++++++ .../ResponseLoggingLevel.cs | 0 .../StaticAssetUpdate.cs | 0 .../UpdateDelta.cs | 0 ...Net.HotReload.Agent.PipeRpc.Package.csproj | 6 +--- ...soft.DotNet.HotReload.Agent.Package.csproj | 1 + src/BuiltInTools/dotnet-watch.slnf | 2 ++ .../dotnet-watch/dotnet-watch.csproj | 7 +---- 14 files changed, 84 insertions(+), 12 deletions(-) rename src/BuiltInTools/{HotReloadAgent => HotReloadAgent.Data}/AgentEnvironmentVariables.cs (100%) rename src/BuiltInTools/{HotReloadAgent => HotReloadAgent.Data}/AgentMessageSeverity.cs (100%) create mode 100644 src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj create mode 100644 src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.projitems create mode 100644 src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj rename src/BuiltInTools/{HotReloadAgent => HotReloadAgent.Data}/ResponseLoggingLevel.cs (100%) rename src/BuiltInTools/{HotReloadAgent => HotReloadAgent.Data}/StaticAssetUpdate.cs (100%) rename src/BuiltInTools/{HotReloadAgent => HotReloadAgent.Data}/UpdateDelta.cs (100%) diff --git a/sdk.sln b/sdk.sln index 7b553797d6aa..8996cacceac3 100644 --- a/sdk.sln +++ b/sdk.sln @@ -516,6 +516,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.HotReload. EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.DotNet.HotReload.Agent.PipeRpc", "src\BuiltInTools\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj", "{FA3C7F91-42A2-45AD-897C-F646B081016C}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.HotReload.Agent.Data.Package", "src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.Package.csproj", "{3DF5A9B8-6F90-4CFB-4518-0E97982B6748}" +EndProject +Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.DotNet.HotReload.Agent.Data", "src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.shproj", "{0762B436-F4B0-4008-9097-BB5FF6BD84AF}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -978,6 +982,10 @@ Global {692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Debug|Any CPU.Build.0 = Debug|Any CPU {692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|Any CPU.ActiveCfg = Release|Any CPU {692B71D8-9C31-D1EE-6C1B-570A12B18E39}.Release|Any CPU.Build.0 = Release|Any CPU + {3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DF5A9B8-6F90-4CFB-4518-0E97982B6748}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1159,19 +1167,26 @@ Global {2FF79F82-60C1-349A-4726-7783D5A6D5DF} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} {692B71D8-9C31-D1EE-6C1B-570A12B18E39} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} {FA3C7F91-42A2-45AD-897C-F646B081016C} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} + {3DF5A9B8-6F90-4CFB-4518-0E97982B6748} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} + {0762B436-F4B0-4008-9097-BB5FF6BD84AF} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6} EndGlobalSection GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{03c5a84a-982b-4f38-ac73-ab832c645c4a}*SharedItemsImports = 5 + src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{0762b436-f4b0-4008-9097-bb5ff6bd84af}*SharedItemsImports = 13 src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{0a3c9afd-f6e6-4a5d-83fb-93bf66732696}*SharedItemsImports = 5 + src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{1bbfa19c-03f0-4d27-9d0d-0f8172642107}*SharedItemsImports = 5 src\BuiltInTools\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems*{1bbfa19c-03f0-4d27-9d0d-0f8172642107}*SharedItemsImports = 5 src\BuiltInTools\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems*{1bbfa19c-03f0-4d27-9d0d-0f8172642107}*SharedItemsImports = 5 src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{1f0b4b3c-dc88-4740-b04f-1707102e9930}*SharedItemsImports = 5 + src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{2ff79f82-60c1-349a-4726-7783d5a6d5df}*SharedItemsImports = 5 src\BuiltInTools\HotReloadAgent\Microsoft.DotNet.HotReload.Agent.projitems*{418b10bd-ca42-49f3-8f4a-d8cc90c8a17d}*SharedItemsImports = 13 src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{445efbd5-6730-4f09-943d-278e77501ffd}*SharedItemsImports = 5 + src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{445efbd5-6730-4f09-943d-278e77501ffd}*SharedItemsImports = 5 src\BuiltInTools\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems*{445efbd5-6730-4f09-943d-278e77501ffd}*SharedItemsImports = 5 + src\BuiltInTools\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems*{692b71d8-9c31-d1ee-6c1b-570a12b18e39}*SharedItemsImports = 5 src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{94c8526e-dcc2-442f-9868-3dd0ba2688be}*SharedItemsImports = 13 src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{9d36039f-d0a1-462f-85b4-81763c6b02cb}*SharedItemsImports = 13 src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{a9103b98-d888-4260-8a05-fa36f640698a}*SharedItemsImports = 5 diff --git a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj index 97436e7b061e..c9ea16a9e821 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj +++ b/src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj @@ -1,5 +1,6 @@  + + true + Microsoft.DotNet.HotReload.Agent.Host + + Package containing Hot Reload agent host. + diff --git a/src/BuiltInTools/HotReloadAgent/AgentEnvironmentVariables.cs b/src/BuiltInTools/HotReloadAgent.Data/AgentEnvironmentVariables.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent/AgentEnvironmentVariables.cs rename to src/BuiltInTools/HotReloadAgent.Data/AgentEnvironmentVariables.cs diff --git a/src/BuiltInTools/HotReloadAgent/AgentMessageSeverity.cs b/src/BuiltInTools/HotReloadAgent.Data/AgentMessageSeverity.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent/AgentMessageSeverity.cs rename to src/BuiltInTools/HotReloadAgent.Data/AgentMessageSeverity.cs diff --git a/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj b/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj new file mode 100644 index 000000000000..5586c0ea5050 --- /dev/null +++ b/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj @@ -0,0 +1,29 @@ + + + + netstandard2.0 + false + none + false + enable + preview + + + true + true + Microsoft.DotNet.HotReload.Agent.Data + false + + Package containing sources of Hot Reload agent data types. + + + $(NoWarn);NU5128 + + + + + + + diff --git a/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.projitems b/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.projitems new file mode 100644 index 000000000000..48476635fae3 --- /dev/null +++ b/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.projitems @@ -0,0 +1,14 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {0762B436-F4B0-4008-9097-BB5FF6BD84AF} + + + Microsoft.DotNet.HotReload + + + + + \ No newline at end of file diff --git a/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj b/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj new file mode 100644 index 000000000000..2668cf53de0f --- /dev/null +++ b/src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj @@ -0,0 +1,13 @@ + + + + 0762B436-F4B0-4008-9097-BB5FF6BD84AF + 14.0 + + + + + + + + \ No newline at end of file diff --git a/src/BuiltInTools/HotReloadAgent/ResponseLoggingLevel.cs b/src/BuiltInTools/HotReloadAgent.Data/ResponseLoggingLevel.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent/ResponseLoggingLevel.cs rename to src/BuiltInTools/HotReloadAgent.Data/ResponseLoggingLevel.cs diff --git a/src/BuiltInTools/HotReloadAgent/StaticAssetUpdate.cs b/src/BuiltInTools/HotReloadAgent.Data/StaticAssetUpdate.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent/StaticAssetUpdate.cs rename to src/BuiltInTools/HotReloadAgent.Data/StaticAssetUpdate.cs diff --git a/src/BuiltInTools/HotReloadAgent/UpdateDelta.cs b/src/BuiltInTools/HotReloadAgent.Data/UpdateDelta.cs similarity index 100% rename from src/BuiltInTools/HotReloadAgent/UpdateDelta.cs rename to src/BuiltInTools/HotReloadAgent.Data/UpdateDelta.cs diff --git a/src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj b/src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj index 3f7ff8c25ccb..52fede8b6ec0 100644 --- a/src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj +++ b/src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj @@ -34,9 +34,5 @@ - - - - - + diff --git a/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj b/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj index 9daff92e3b72..cbf6c0620709 100644 --- a/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj +++ b/src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj @@ -27,4 +27,5 @@ + diff --git a/src/BuiltInTools/dotnet-watch.slnf b/src/BuiltInTools/dotnet-watch.slnf index b0e0ee2dcafc..e2faefaeb64b 100644 --- a/src/BuiltInTools/dotnet-watch.slnf +++ b/src/BuiltInTools/dotnet-watch.slnf @@ -9,6 +9,8 @@ "src\\BuiltInTools\\DotNetWatchTasks\\DotNetWatchTasks.csproj", "src\\BuiltInTools\\HotReloadAgent\\Microsoft.DotNet.HotReload.Agent.Package.csproj", "src\\BuiltInTools\\HotReloadAgent\\Microsoft.DotNet.HotReload.Agent.shproj", + "src\\BuiltInTools\\HotReloadAgent.Data\\Microsoft.DotNet.HotReload.Agent.Data.Package.csproj", + "src\\BuiltInTools\\HotReloadAgent.Data\\Microsoft.DotNet.HotReload.Agent.Data.shproj", "src\\BuiltInTools\\HotReloadAgent.PipeRpc\\Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj", "src\\BuiltInTools\\HotReloadAgent.PipeRpc\\Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj", "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj", diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj index c4415d25b96c..61a824ab4848 100644 --- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj +++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj @@ -1,6 +1,7 @@  + @@ -39,12 +40,6 @@ - - - - - - From 515c4f7c1a15566fd3f9c912f293d7ed3ed0fec8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Jan 2025 05:01:17 +0000 Subject: [PATCH 08/44] Update dependencies from https://github.com/dotnet/razor build 20250124.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25072.3 -> To Version 9.0.0-preview.25074.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 373f84b7025e..391f6f77bce4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 4b6227bb3f6d9161b320d22ea1a82fc78821f278 + 67d928ffdbf8b35f24fdf04258d32f42123ce7ae - + https://github.com/dotnet/razor - 4b6227bb3f6d9161b320d22ea1a82fc78821f278 + 67d928ffdbf8b35f24fdf04258d32f42123ce7ae - + https://github.com/dotnet/razor - 4b6227bb3f6d9161b320d22ea1a82fc78821f278 + 67d928ffdbf8b35f24fdf04258d32f42123ce7ae - + https://github.com/dotnet/razor - 4b6227bb3f6d9161b320d22ea1a82fc78821f278 + 67d928ffdbf8b35f24fdf04258d32f42123ce7ae diff --git a/eng/Versions.props b/eng/Versions.props index 805385d6f5d4..000e2f69145c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25072.3 - 9.0.0-preview.25072.3 - 9.0.0-preview.25072.3 + 9.0.0-preview.25074.1 + 9.0.0-preview.25074.1 + 9.0.0-preview.25074.1 From 3ea01f3dc28debdaac242781d53480291d6c966f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 25 Jan 2025 05:02:43 +0000 Subject: [PATCH 09/44] Update dependencies from https://github.com/dotnet/roslyn build 20250124.8 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-1.25072.8 -> To Version 4.14.0-1.25074.8 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 373f84b7025e..b79e09e732c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 7abe97c385a57f3d43941c50259e24cd90997156 - + https://github.com/dotnet/roslyn - 1931cdad58cc077db02feaa80f454900355dd0e8 + ff40252939f4d51525149f80b2ae0baf6df93bb1 - + https://github.com/dotnet/roslyn - 1931cdad58cc077db02feaa80f454900355dd0e8 + ff40252939f4d51525149f80b2ae0baf6df93bb1 - + https://github.com/dotnet/roslyn - 1931cdad58cc077db02feaa80f454900355dd0e8 + ff40252939f4d51525149f80b2ae0baf6df93bb1 - + https://github.com/dotnet/roslyn - 1931cdad58cc077db02feaa80f454900355dd0e8 + ff40252939f4d51525149f80b2ae0baf6df93bb1 - + https://github.com/dotnet/roslyn - 1931cdad58cc077db02feaa80f454900355dd0e8 + ff40252939f4d51525149f80b2ae0baf6df93bb1 - + https://github.com/dotnet/roslyn - 1931cdad58cc077db02feaa80f454900355dd0e8 + ff40252939f4d51525149f80b2ae0baf6df93bb1 - + https://github.com/dotnet/roslyn - 1931cdad58cc077db02feaa80f454900355dd0e8 + ff40252939f4d51525149f80b2ae0baf6df93bb1 - + https://github.com/dotnet/roslyn - 1931cdad58cc077db02feaa80f454900355dd0e8 + ff40252939f4d51525149f80b2ae0baf6df93bb1 - + https://github.com/dotnet/roslyn - 1931cdad58cc077db02feaa80f454900355dd0e8 + ff40252939f4d51525149f80b2ae0baf6df93bb1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 805385d6f5d4..cb3d58a1027a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.14.0-1.25072.8 - 4.14.0-1.25072.8 - 4.14.0-1.25072.8 - 4.14.0-1.25072.8 - 4.14.0-1.25072.8 - 4.14.0-1.25072.8 - 4.14.0-1.25072.8 - 4.14.0-1.25072.8 + 4.14.0-1.25074.8 + 4.14.0-1.25074.8 + 4.14.0-1.25074.8 + 4.14.0-1.25074.8 + 4.14.0-1.25074.8 + 4.14.0-1.25074.8 + 4.14.0-1.25074.8 + 4.14.0-1.25074.8 From 4496d1494dff8f9274e94f8ae2db791ca66ed43a Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sat, 25 Jan 2025 18:55:39 -0800 Subject: [PATCH 10/44] Fix Test CLI package path --- src/Layout/redist/targets/GenerateLayout.targets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 84838632c10f..2f2c4bb7781f 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -177,8 +177,7 @@ - netcoreapp3.1 - net9.0 + net9.0 $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ From 55d6d86c8a2f65bfa408468d2759294b72e6d3c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Jan 2025 05:01:45 +0000 Subject: [PATCH 11/44] Update dependencies from https://github.com/dotnet/roslyn build 20250125.1 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-1.25074.8 -> To Version 4.14.0-1.25075.1 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52030765f86f..b4498d2fd3ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 7abe97c385a57f3d43941c50259e24cd90997156 - + https://github.com/dotnet/roslyn - ff40252939f4d51525149f80b2ae0baf6df93bb1 + f060a3f3c08ed0752a94d75972d5477927a003ab - + https://github.com/dotnet/roslyn - ff40252939f4d51525149f80b2ae0baf6df93bb1 + f060a3f3c08ed0752a94d75972d5477927a003ab - + https://github.com/dotnet/roslyn - ff40252939f4d51525149f80b2ae0baf6df93bb1 + f060a3f3c08ed0752a94d75972d5477927a003ab - + https://github.com/dotnet/roslyn - ff40252939f4d51525149f80b2ae0baf6df93bb1 + f060a3f3c08ed0752a94d75972d5477927a003ab - + https://github.com/dotnet/roslyn - ff40252939f4d51525149f80b2ae0baf6df93bb1 + f060a3f3c08ed0752a94d75972d5477927a003ab - + https://github.com/dotnet/roslyn - ff40252939f4d51525149f80b2ae0baf6df93bb1 + f060a3f3c08ed0752a94d75972d5477927a003ab - + https://github.com/dotnet/roslyn - ff40252939f4d51525149f80b2ae0baf6df93bb1 + f060a3f3c08ed0752a94d75972d5477927a003ab - + https://github.com/dotnet/roslyn - ff40252939f4d51525149f80b2ae0baf6df93bb1 + f060a3f3c08ed0752a94d75972d5477927a003ab - + https://github.com/dotnet/roslyn - ff40252939f4d51525149f80b2ae0baf6df93bb1 + f060a3f3c08ed0752a94d75972d5477927a003ab https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 74c9543e109a..e16f39a6d1cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.14.0-1.25074.8 - 4.14.0-1.25074.8 - 4.14.0-1.25074.8 - 4.14.0-1.25074.8 - 4.14.0-1.25074.8 - 4.14.0-1.25074.8 - 4.14.0-1.25074.8 - 4.14.0-1.25074.8 + 4.14.0-1.25075.1 + 4.14.0-1.25075.1 + 4.14.0-1.25075.1 + 4.14.0-1.25075.1 + 4.14.0-1.25075.1 + 4.14.0-1.25075.1 + 4.14.0-1.25075.1 + 4.14.0-1.25075.1 From 9670dee0761866d74daa9e03985afb8047c2cc7e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 26 Jan 2025 09:03:06 +0000 Subject: [PATCH 12/44] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20250126.1 Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.25074.4 -> To Version 3.11.0-beta1.25076.1 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52030765f86f..d56925373d5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -374,16 +374,16 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 - + https://github.com/dotnet/roslyn-analyzers 16865ea61910500f1022ad2b96c499e5df02c228 diff --git a/eng/Versions.props b/eng/Versions.props index 74c9543e109a..c5c6e5be6027 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -156,8 +156,8 @@ - 9.0.0-preview.25074.4 - 3.11.0-beta1.25074.4 + 9.0.0-preview.25076.1 + 3.11.0-beta1.25076.1 From 6713f15eff12d01f2355f976702f2538d0c7bbea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Jan 2025 05:02:13 +0000 Subject: [PATCH 13/44] Update dependencies from https://github.com/dotnet/razor build 20250126.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25074.1 -> To Version 9.0.0-preview.25076.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44d332c1d2a1..0e572f9a21f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,20 +321,20 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor 67d928ffdbf8b35f24fdf04258d32f42123ce7ae - + https://github.com/dotnet/razor 67d928ffdbf8b35f24fdf04258d32f42123ce7ae - + https://github.com/dotnet/razor 67d928ffdbf8b35f24fdf04258d32f42123ce7ae - + https://github.com/dotnet/razor 67d928ffdbf8b35f24fdf04258d32f42123ce7ae diff --git a/eng/Versions.props b/eng/Versions.props index e9292a398223..aadfb7dcebfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25074.1 - 9.0.0-preview.25074.1 - 9.0.0-preview.25074.1 + 9.0.0-preview.25076.1 + 9.0.0-preview.25076.1 + 9.0.0-preview.25076.1 From c8230b0e64fbe2e1a7e5959b33b264a5f28d3d92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 27 Jan 2025 05:02:55 +0000 Subject: [PATCH 14/44] Update dependencies from https://github.com/dotnet/roslyn build 20250126.11 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-1.25075.1 -> To Version 4.14.0-1.25076.11 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44d332c1d2a1..43d591ccc407 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 7abe97c385a57f3d43941c50259e24cd90997156 - + https://github.com/dotnet/roslyn - f060a3f3c08ed0752a94d75972d5477927a003ab + 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 - + https://github.com/dotnet/roslyn - f060a3f3c08ed0752a94d75972d5477927a003ab + 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 - + https://github.com/dotnet/roslyn - f060a3f3c08ed0752a94d75972d5477927a003ab + 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 - + https://github.com/dotnet/roslyn - f060a3f3c08ed0752a94d75972d5477927a003ab + 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 - + https://github.com/dotnet/roslyn - f060a3f3c08ed0752a94d75972d5477927a003ab + 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 - + https://github.com/dotnet/roslyn - f060a3f3c08ed0752a94d75972d5477927a003ab + 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 - + https://github.com/dotnet/roslyn - f060a3f3c08ed0752a94d75972d5477927a003ab + 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 - + https://github.com/dotnet/roslyn - f060a3f3c08ed0752a94d75972d5477927a003ab + 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 - + https://github.com/dotnet/roslyn - f060a3f3c08ed0752a94d75972d5477927a003ab + 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index e9292a398223..3aa4ae44acec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.14.0-1.25075.1 - 4.14.0-1.25075.1 - 4.14.0-1.25075.1 - 4.14.0-1.25075.1 - 4.14.0-1.25075.1 - 4.14.0-1.25075.1 - 4.14.0-1.25075.1 - 4.14.0-1.25075.1 + 4.14.0-1.25076.11 + 4.14.0-1.25076.11 + 4.14.0-1.25076.11 + 4.14.0-1.25076.11 + 4.14.0-1.25076.11 + 4.14.0-1.25076.11 + 4.14.0-1.25076.11 + 4.14.0-1.25076.11 From 31e056c69e967f8b7c1c2766d1cfd4fb40d64ef8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jan 2025 05:01:27 +0000 Subject: [PATCH 15/44] Update dependencies from https://github.com/dotnet/razor build 20250127.3 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25074.1 -> To Version 9.0.0-preview.25077.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e572f9a21f8..d1f6da80eb8b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 67d928ffdbf8b35f24fdf04258d32f42123ce7ae + bad8d77ba852db9dfecea21199dcb5a526dd2d5e - + https://github.com/dotnet/razor - 67d928ffdbf8b35f24fdf04258d32f42123ce7ae + bad8d77ba852db9dfecea21199dcb5a526dd2d5e - + https://github.com/dotnet/razor - 67d928ffdbf8b35f24fdf04258d32f42123ce7ae + bad8d77ba852db9dfecea21199dcb5a526dd2d5e - + https://github.com/dotnet/razor - 67d928ffdbf8b35f24fdf04258d32f42123ce7ae + bad8d77ba852db9dfecea21199dcb5a526dd2d5e diff --git a/eng/Versions.props b/eng/Versions.props index aadfb7dcebfb..5efe673bd93a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25076.1 - 9.0.0-preview.25076.1 - 9.0.0-preview.25076.1 + 9.0.0-preview.25077.3 + 9.0.0-preview.25077.3 + 9.0.0-preview.25077.3 From edb055cf8818df91f77abe8fe0a3b0a54d94e126 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jan 2025 05:02:55 +0000 Subject: [PATCH 16/44] Update dependencies from https://github.com/dotnet/msbuild build 20250127.6 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25077-06 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44d332c1d2a1..9e6aab6b27c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 291a8108761ed347562228f2f8f25477996a5a93 + c456ec1b4fb865a15d569df5982aae6ae0fd9f82 - + https://github.com/dotnet/msbuild - 291a8108761ed347562228f2f8f25477996a5a93 + c456ec1b4fb865a15d569df5982aae6ae0fd9f82 - + https://github.com/dotnet/msbuild - 291a8108761ed347562228f2f8f25477996a5a93 + c456ec1b4fb865a15d569df5982aae6ae0fd9f82 diff --git a/eng/Versions.props b/eng/Versions.props index e9292a398223..6df1feb460f4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.0-preview-25073-02 - 17.14.0-preview-25073-02 + 17.14.0-preview-25077-06 + 17.14.0-preview-25077-06 17.11.4 17.12 From ec178a88017fef0221ceebdd9473afeb6d5919c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Jan 2025 05:03:04 +0000 Subject: [PATCH 17/44] Update dependencies from https://github.com/dotnet/roslyn build 20250127.5 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-1.25075.1 -> To Version 4.14.0-1.25077.5 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43d591ccc407..811293e5cd05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 7abe97c385a57f3d43941c50259e24cd90997156 - + https://github.com/dotnet/roslyn - 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 + 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/roslyn - 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 + 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/roslyn - 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 + 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/roslyn - 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 + 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/roslyn - 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 + 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/roslyn - 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 + 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/roslyn - 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 + 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/roslyn - 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 + 557c46c532788c16881dbe1b9bd3d938c2ed22e0 - + https://github.com/dotnet/roslyn - 7fa4d1db20d60920de6ecc0eb0bba7ecc0c23712 + 557c46c532788c16881dbe1b9bd3d938c2ed22e0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3aa4ae44acec..4b3b6851af94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.14.0-1.25076.11 - 4.14.0-1.25076.11 - 4.14.0-1.25076.11 - 4.14.0-1.25076.11 - 4.14.0-1.25076.11 - 4.14.0-1.25076.11 - 4.14.0-1.25076.11 - 4.14.0-1.25076.11 + 4.14.0-1.25077.5 + 4.14.0-1.25077.5 + 4.14.0-1.25077.5 + 4.14.0-1.25077.5 + 4.14.0-1.25077.5 + 4.14.0-1.25077.5 + 4.14.0-1.25077.5 + 4.14.0-1.25077.5 From 900d13f14ea6381eacb25d4ee41115a73589adf7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jan 2025 05:01:28 +0000 Subject: [PATCH 18/44] Update dependencies from https://github.com/dotnet/razor build 20250127.4 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25074.1 -> To Version 9.0.0-preview.25077.4 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cf3150f55c..af44df3c733c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d1f6da80eb8b..75a12d170ae2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - bad8d77ba852db9dfecea21199dcb5a526dd2d5e + 7ad7dc7264e25329c199cdc3849c2e98707fcada - + https://github.com/dotnet/razor - bad8d77ba852db9dfecea21199dcb5a526dd2d5e + 7ad7dc7264e25329c199cdc3849c2e98707fcada - + https://github.com/dotnet/razor - bad8d77ba852db9dfecea21199dcb5a526dd2d5e + 7ad7dc7264e25329c199cdc3849c2e98707fcada - + https://github.com/dotnet/razor - bad8d77ba852db9dfecea21199dcb5a526dd2d5e + 7ad7dc7264e25329c199cdc3849c2e98707fcada diff --git a/eng/Versions.props b/eng/Versions.props index 5efe673bd93a..1c5c11ae1a28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25077.3 - 9.0.0-preview.25077.3 - 9.0.0-preview.25077.3 + 9.0.0-preview.25077.4 + 9.0.0-preview.25077.4 + 9.0.0-preview.25077.4 From e1fe0de1e97fa15f302371d8748e8679024d5c2f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jan 2025 05:02:27 +0000 Subject: [PATCH 19/44] Update dependencies from https://github.com/dotnet/arcade build 20250127.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25065.2 -> To Version 9.0.0-beta.25077.4 --- NuGet.config | 1 + eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/internal/Tools.csproj | 10 ---------- global.json | 4 ++-- 5 files changed, 21 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cf3150f55c..af44df3c733c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44d332c1d2a1..c3413bbddc89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 - + https://github.com/dotnet/arcade - c4bbc67763bf0c5a868862df874079380e647d61 + bac7e1caea791275b7c3ccb4cb75fd6a04a26618 diff --git a/eng/Versions.props b/eng/Versions.props index e9292a398223..b9c596a810cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -268,10 +268,10 @@ - 9.0.0-beta.25065.2 - 9.0.0-beta.25065.2 - 9.0.0-beta.25065.2 - 9.0.0-beta.25065.2 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 + 9.0.0-beta.25077.4 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 32f79dfb3402..feaa6d20812d 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -15,16 +15,6 @@ - - - - https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; - - - $(RestoreSources); - https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; - - diff --git a/global.json b/global.json index faef1c789e0c..c827278fb4cf 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25077.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25077.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 8e37e9a66781443ceb7eb92b6e591b7aad63d61d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jan 2025 05:02:30 +0000 Subject: [PATCH 20/44] Update dependencies from https://github.com/microsoft/vstest build 20250128.2 Microsoft.SourceBuild.Intermediate.vstest , Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.12.0-release-24508-01 -> To Version 17.14.0-preview-25078-02 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cf3150f55c..af44df3c733c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac9fc5753525..c02b8bfc1d3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -208,22 +208,22 @@ https://github.com/nuget/nuget.client c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/microsoft/vstest - 88d210d6e5bc440f7defbe776ab40c3d63a3c5a6 + 06f4f131ae42e4039e48924b9e8c9dbc4e3ec1b9 - + https://github.com/microsoft/vstest - 88d210d6e5bc440f7defbe776ab40c3d63a3c5a6 + 06f4f131ae42e4039e48924b9e8c9dbc4e3ec1b9 - + https://github.com/microsoft/vstest - 88d210d6e5bc440f7defbe776ab40c3d63a3c5a6 + 06f4f131ae42e4039e48924b9e8c9dbc4e3ec1b9 - + https://github.com/microsoft/vstest - 88d210d6e5bc440f7defbe776ab40c3d63a3c5a6 + 06f4f131ae42e4039e48924b9e8c9dbc4e3ec1b9 diff --git a/eng/Versions.props b/eng/Versions.props index 3fbe610edcec..7f3fb4984e68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,9 +150,9 @@ - 17.14.0-preview-25073-07 - 17.14.0-preview-25073-07 - 17.14.0-preview-25073-07 + 17.14.0-preview-25078-02 + 17.14.0-preview-25078-02 + 17.14.0-preview-25078-02 From 737e037964185633538d229dc7db2d73838ccee4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jan 2025 05:02:32 +0000 Subject: [PATCH 21/44] Update dependencies from https://github.com/dotnet/msbuild build 20250128.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25078-04 --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cf3150f55c..af44df3c733c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e6aab6b27c5..1832b28739cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - c456ec1b4fb865a15d569df5982aae6ae0fd9f82 + f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 - + https://github.com/dotnet/msbuild - c456ec1b4fb865a15d569df5982aae6ae0fd9f82 + f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 - + https://github.com/dotnet/msbuild - c456ec1b4fb865a15d569df5982aae6ae0fd9f82 + f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 diff --git a/eng/Versions.props b/eng/Versions.props index 6df1feb460f4..52889ec4b68c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.0-preview-25077-06 - 17.14.0-preview-25077-06 + 17.14.0-preview-25078-04 + 17.14.0-preview-25078-04 17.11.4 17.12 From 6e4e98a803901e0361f210c2637fa5d50d4c2d9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 29 Jan 2025 05:02:37 +0000 Subject: [PATCH 22/44] Update dependencies from https://github.com/dotnet/roslyn build 20250128.5 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-1.25075.1 -> To Version 4.14.0-2.25078.5 --- NuGet.config | 1 + eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cf3150f55c..af44df3c733c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 811293e5cd05..20d2706abf9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 7abe97c385a57f3d43941c50259e24cd90997156 - + https://github.com/dotnet/roslyn - 557c46c532788c16881dbe1b9bd3d938c2ed22e0 + cdae681d52b70c90503e983770fb2a0f8745ef3a - + https://github.com/dotnet/roslyn - 557c46c532788c16881dbe1b9bd3d938c2ed22e0 + cdae681d52b70c90503e983770fb2a0f8745ef3a - + https://github.com/dotnet/roslyn - 557c46c532788c16881dbe1b9bd3d938c2ed22e0 + cdae681d52b70c90503e983770fb2a0f8745ef3a - + https://github.com/dotnet/roslyn - 557c46c532788c16881dbe1b9bd3d938c2ed22e0 + cdae681d52b70c90503e983770fb2a0f8745ef3a - + https://github.com/dotnet/roslyn - 557c46c532788c16881dbe1b9bd3d938c2ed22e0 + cdae681d52b70c90503e983770fb2a0f8745ef3a - + https://github.com/dotnet/roslyn - 557c46c532788c16881dbe1b9bd3d938c2ed22e0 + cdae681d52b70c90503e983770fb2a0f8745ef3a - + https://github.com/dotnet/roslyn - 557c46c532788c16881dbe1b9bd3d938c2ed22e0 + cdae681d52b70c90503e983770fb2a0f8745ef3a - + https://github.com/dotnet/roslyn - 557c46c532788c16881dbe1b9bd3d938c2ed22e0 + cdae681d52b70c90503e983770fb2a0f8745ef3a - + https://github.com/dotnet/roslyn - 557c46c532788c16881dbe1b9bd3d938c2ed22e0 + cdae681d52b70c90503e983770fb2a0f8745ef3a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 4b3b6851af94..9aa364ddbd29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.14.0-1.25077.5 - 4.14.0-1.25077.5 - 4.14.0-1.25077.5 - 4.14.0-1.25077.5 - 4.14.0-1.25077.5 - 4.14.0-1.25077.5 - 4.14.0-1.25077.5 - 4.14.0-1.25077.5 + 4.14.0-2.25078.5 + 4.14.0-2.25078.5 + 4.14.0-2.25078.5 + 4.14.0-2.25078.5 + 4.14.0-2.25078.5 + 4.14.0-2.25078.5 + 4.14.0-2.25078.5 + 4.14.0-2.25078.5 From 162414f05ea75b8d6bd5690a7870b7917143ceae Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Wed, 29 Jan 2025 13:03:45 -0800 Subject: [PATCH 23/44] Fix workload set install folder Fixes #46312 (#46351) Fixes #46312 https://github.com/dotnet/sdk/pull/46351When we installed a workload set, we'd use the current SDK's feature band as part of the path, but if it was a workload set for a different feature band (as, for instance, installed via dotnet workload update --version x), then it would assume that workload set was in the feature band folder for the current feature band. Since the resolver is fairly precise with its expectations, it rejects this workload set. In my dogfood folder, the correct location is: C:\GitHub\sdkRelease\artifacts\bin\redist\Debug\dotnet\sdk-manifests\9.0.100\workloadsets\9.0.101 But using a 9.0.2xx SDK, it would install to: C:\GitHub\sdkRelease\artifacts\bin\redist\Debug\dotnet\sdk-manifests\9.0.200\workloadsets\9.0.101 This switches to using the feature band from the workload set itself, resolving the issue. Note that this was a FileBasedInstaller-specific problem. I verified that MSI-based installs were not affected, which incidentally means this better aligns to their behavior. --- .../commands/dotnet-workload/install/FileBasedInstaller.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs index 1585c5e33f1f..93a88c16f473 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs +++ b/src/Cli/dotnet/commands/dotnet-workload/install/FileBasedInstaller.cs @@ -97,7 +97,7 @@ public WorkloadSet InstallWorkloadSet(ITransactionContext context, string worklo string workloadSetPackageVersion = WorkloadSetVersion.ToWorkloadSetPackageVersion(workloadSetVersion, out SdkFeatureBand workloadSetFeatureBand); var workloadSetPackageId = GetManifestPackageId(new ManifestId(WorkloadManifestUpdater.WorkloadSetManifestId), workloadSetFeatureBand); - var workloadSetPath = Path.Combine(_workloadRootDir, "sdk-manifests", _sdkFeatureBand.ToString(), "workloadsets", workloadSetVersion); + var workloadSetPath = Path.Combine(_workloadRootDir, "sdk-manifests", workloadSetFeatureBand.ToString(), "workloadsets", workloadSetVersion); try { From 6ed68f81bf82e9bcf721b1f44c12849c17985b8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 02:26:58 +0000 Subject: [PATCH 24/44] Update dependencies from https://github.com/dotnet/templating build 20250129.4 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 9.0.200-rtm.25062.7 -> To Version 9.0.300-preview.25079.4 --- NuGet.config | 6 +++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cf3150f55c..c99635d318e6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + @@ -22,7 +27,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44d332c1d2a1..98ecbb161e6b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - aaebde792d2641f49f42e5acc2f92cbac49d2cbc + 271dfa1dac458c92f437bd5628fca648f11a35fd - + https://github.com/dotnet/templating - aaebde792d2641f49f42e5acc2f92cbac49d2cbc + 271dfa1dac458c92f437bd5628fca648f11a35fd - + https://github.com/dotnet/templating - aaebde792d2641f49f42e5acc2f92cbac49d2cbc + 271dfa1dac458c92f437bd5628fca648f11a35fd diff --git a/eng/Versions.props b/eng/Versions.props index e9292a398223..23e824cab354 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,13 +185,13 @@ - 9.0.200 + 9.0.300-preview.25079.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.200-rtm.25062.7 + 9.0.300-preview.25079.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 938b0cd0622723bdf67a92f04df074c4fbddbbf0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 05:01:28 +0000 Subject: [PATCH 25/44] Update dependencies from https://github.com/dotnet/razor build 20250129.5 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25074.1 -> To Version 9.0.0-preview.25079.5 --- NuGet.config | 5 +++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index af44df3c733c..0d1cccba90df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75a12d170ae2..419dfb589abb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 7ad7dc7264e25329c199cdc3849c2e98707fcada + 64910d5bea47a3ff7e74bd20040abadf1ac6eaad - + https://github.com/dotnet/razor - 7ad7dc7264e25329c199cdc3849c2e98707fcada + 64910d5bea47a3ff7e74bd20040abadf1ac6eaad - + https://github.com/dotnet/razor - 7ad7dc7264e25329c199cdc3849c2e98707fcada + 64910d5bea47a3ff7e74bd20040abadf1ac6eaad - + https://github.com/dotnet/razor - 7ad7dc7264e25329c199cdc3849c2e98707fcada + 64910d5bea47a3ff7e74bd20040abadf1ac6eaad diff --git a/eng/Versions.props b/eng/Versions.props index 1c5c11ae1a28..b90ac13ea1f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25077.4 - 9.0.0-preview.25077.4 - 9.0.0-preview.25077.4 + 9.0.0-preview.25079.5 + 9.0.0-preview.25079.5 + 9.0.0-preview.25079.5 From a5fd4278defbff798d306caad256907b86473d65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 05:01:40 +0000 Subject: [PATCH 26/44] Update dependencies from https://github.com/dotnet/scenario-tests build 20250129.1 Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.25070.3 -> To Version 9.0.0-preview.25079.1 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cf3150f55c..0d1cccba90df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,12 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44d332c1d2a1..9b0d1c26f7da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -597,14 +597,14 @@ https://github.com/dotnet/arcade-services 47e3672c762970073e4282bd563233da86bcca3e - + https://github.com/dotnet/scenario-tests - 702695802459ffcd11d13cfb73f86aa7b9f6a3ea + 4d0fe09477310240ec5bcf7c7758fbb358ca02ab - + https://github.com/dotnet/scenario-tests - 702695802459ffcd11d13cfb73f86aa7b9f6a3ea + 4d0fe09477310240ec5bcf7c7758fbb358ca02ab From 3c082d3b90000fbf92820509eec048a145a64dec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 05:03:00 +0000 Subject: [PATCH 27/44] Update dependencies from https://github.com/dotnet/fsharp build 20250129.4 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 9.0.300-beta.25072.1 -> To Version 9.0.300-beta.25079.4 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cf3150f55c..0d1cccba90df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,12 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44d332c1d2a1..9e37dfe30231 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -83,14 +83,14 @@ 291a8108761ed347562228f2f8f25477996a5a93 - + https://github.com/dotnet/fsharp - 7abe97c385a57f3d43941c50259e24cd90997156 + 387f04cb6675c984036a64c9bb768ac6f00e06f9 - + https://github.com/dotnet/fsharp - 7abe97c385a57f3d43941c50259e24cd90997156 + 387f04cb6675c984036a64c9bb768ac6f00e06f9 diff --git a/eng/Versions.props b/eng/Versions.props index e9292a398223..919b24dda521 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -198,7 +198,7 @@ - 13.9.300-beta.25072.1 + 13.9.300-beta.25079.4 From 3d99c3c4e8d5f7ee4898baad209af8f6c5c658f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 05:03:02 +0000 Subject: [PATCH 28/44] Update dependencies from https://github.com/microsoft/vstest build 20250129.1 Microsoft.SourceBuild.Intermediate.vstest , Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.12.0-release-24508-01 -> To Version 17.14.0-preview-25079-01 --- NuGet.config | 5 +++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index af44df3c733c..0d1cccba90df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c02b8bfc1d3e..1950cd48397c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -208,22 +208,22 @@ https://github.com/nuget/nuget.client c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/microsoft/vstest - 06f4f131ae42e4039e48924b9e8c9dbc4e3ec1b9 + 0c76159090e0921b9cf38b95092dbccd4e59cd24 - + https://github.com/microsoft/vstest - 06f4f131ae42e4039e48924b9e8c9dbc4e3ec1b9 + 0c76159090e0921b9cf38b95092dbccd4e59cd24 - + https://github.com/microsoft/vstest - 06f4f131ae42e4039e48924b9e8c9dbc4e3ec1b9 + 0c76159090e0921b9cf38b95092dbccd4e59cd24 - + https://github.com/microsoft/vstest - 06f4f131ae42e4039e48924b9e8c9dbc4e3ec1b9 + 0c76159090e0921b9cf38b95092dbccd4e59cd24 diff --git a/eng/Versions.props b/eng/Versions.props index 7f3fb4984e68..5274986bbb9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,9 +150,9 @@ - 17.14.0-preview-25078-02 - 17.14.0-preview-25078-02 - 17.14.0-preview-25078-02 + 17.14.0-preview-25079-01 + 17.14.0-preview-25079-01 + 17.14.0-preview-25079-01 From 0a648b736ff1fc9fb1cfddd37a6014d1505f4bbe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 05:03:04 +0000 Subject: [PATCH 29/44] Update dependencies from https://github.com/dotnet/msbuild build 20250129.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25079-01 --- NuGet.config | 5 +++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index af44df3c733c..0d1cccba90df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1832b28739cb..030e113113a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 + 9be102fff64e112c1a1a6245f766022579bde988 - + https://github.com/dotnet/msbuild - f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 + 9be102fff64e112c1a1a6245f766022579bde988 - + https://github.com/dotnet/msbuild - f8af1703d7ed2bb4dd0e87c83a557eac628eb3b6 + 9be102fff64e112c1a1a6245f766022579bde988 diff --git a/eng/Versions.props b/eng/Versions.props index 52889ec4b68c..8c22ee588620 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.0-preview-25078-04 - 17.14.0-preview-25078-04 + 17.14.0-preview-25079-01 + 17.14.0-preview-25079-01 17.11.4 17.12 From b97199c53a324bdc56475d6a2181b06b1cf56752 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 30 Jan 2025 05:03:09 +0000 Subject: [PATCH 30/44] Update dependencies from https://github.com/dotnet/roslyn build 20250129.2 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-1.25075.1 -> To Version 4.14.0-2.25079.2 --- NuGet.config | 5 +++++ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index af44df3c733c..0d1cccba90df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20d2706abf9f..7874e3e2561d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 7abe97c385a57f3d43941c50259e24cd90997156 - + https://github.com/dotnet/roslyn - cdae681d52b70c90503e983770fb2a0f8745ef3a + 250065a15ef94895ef87f3e09b313b987375b5b1 - + https://github.com/dotnet/roslyn - cdae681d52b70c90503e983770fb2a0f8745ef3a + 250065a15ef94895ef87f3e09b313b987375b5b1 - + https://github.com/dotnet/roslyn - cdae681d52b70c90503e983770fb2a0f8745ef3a + 250065a15ef94895ef87f3e09b313b987375b5b1 - + https://github.com/dotnet/roslyn - cdae681d52b70c90503e983770fb2a0f8745ef3a + 250065a15ef94895ef87f3e09b313b987375b5b1 - + https://github.com/dotnet/roslyn - cdae681d52b70c90503e983770fb2a0f8745ef3a + 250065a15ef94895ef87f3e09b313b987375b5b1 - + https://github.com/dotnet/roslyn - cdae681d52b70c90503e983770fb2a0f8745ef3a + 250065a15ef94895ef87f3e09b313b987375b5b1 - + https://github.com/dotnet/roslyn - cdae681d52b70c90503e983770fb2a0f8745ef3a + 250065a15ef94895ef87f3e09b313b987375b5b1 - + https://github.com/dotnet/roslyn - cdae681d52b70c90503e983770fb2a0f8745ef3a + 250065a15ef94895ef87f3e09b313b987375b5b1 - + https://github.com/dotnet/roslyn - cdae681d52b70c90503e983770fb2a0f8745ef3a + 250065a15ef94895ef87f3e09b313b987375b5b1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9aa364ddbd29..125ffaa05b2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.14.0-2.25078.5 - 4.14.0-2.25078.5 - 4.14.0-2.25078.5 - 4.14.0-2.25078.5 - 4.14.0-2.25078.5 - 4.14.0-2.25078.5 - 4.14.0-2.25078.5 - 4.14.0-2.25078.5 + 4.14.0-2.25079.2 + 4.14.0-2.25079.2 + 4.14.0-2.25079.2 + 4.14.0-2.25079.2 + 4.14.0-2.25079.2 + 4.14.0-2.25079.2 + 4.14.0-2.25079.2 + 4.14.0-2.25079.2 From 8e363eabb4e6746d16d75173b23af85b3cff2e48 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 30 Jan 2025 16:29:06 -0800 Subject: [PATCH 31/44] Added the enableArm64Job parameter and defaulted it to false. --- .vsts-ci.yml | 6 +++++- .vsts-pr.yml | 29 ++++++++++++++++++----------- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index bec644bb0d4e..62a11dd54b0d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -22,6 +22,10 @@ parameters: displayName: Run A Test Build type: boolean default: false +- name: enableArm64Job + displayName: Enables the ARM64 job + type: boolean + default: false variables: - template: /eng/pipelines/templates/variables/sdk-defaults.yml @@ -292,7 +296,7 @@ extends: officialBuildProperties: $(_officialBuildProperties) runTests: false ### ARM64 TESTBUILD ### - - ${{ if or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if and(or(eq(parameters.runTestBuild, true), eq(variables['Build.Reason'], 'PullRequest')), eq(parameters.enableArm64Job, true)) }}: - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml@self parameters: pool: diff --git a/.vsts-pr.yml b/.vsts-pr.yml index d5b3e2428afd..ff1aff9fff82 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -9,6 +9,12 @@ pr: - release/* - internal/release/* +parameters: +- name: enableArm64Job + displayName: Enables the ARM64 job + type: boolean + default: false + variables: - template: /eng/pipelines/templates/variables/sdk-defaults.yml # Variables used: DncEngPublicBuildPool @@ -59,17 +65,18 @@ stages: os: macOS helixTargetQueue: osx.13.amd64.open ### ARM64 ### - - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml - parameters: - pool: - name: Azure Pipelines - vmImage: macOS-latest - os: macOS - helixTargetQueue: osx.13.arm64.open - macOSJobParameterSets: - - categoryName: TestBuild - buildArchitecture: arm64 - runtimeIdentifier: osx-arm64 + - ${{ if eq(parameters.enableArm64Job, true) }}: + - template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml + parameters: + pool: + name: Azure Pipelines + vmImage: macOS-latest + os: macOS + helixTargetQueue: osx.13.arm64.open + macOSJobParameterSets: + - categoryName: TestBuild + buildArchitecture: arm64 + runtimeIdentifier: osx-arm64 ############### SOURCE BUILD ############### - template: /eng/common/templates/job/source-build.yml From e591a30a3f68729d602a8d681abc98f44cb14ba6 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 30 Jan 2025 16:49:55 -0800 Subject: [PATCH 32/44] Update src/Layout/redist/targets/GenerateLayout.targets --- src/Layout/redist/targets/GenerateLayout.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets index 2f2c4bb7781f..ef80a36dd470 100644 --- a/src/Layout/redist/targets/GenerateLayout.targets +++ b/src/Layout/redist/targets/GenerateLayout.targets @@ -177,7 +177,7 @@ - net9.0 + net9.0 $(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/ From 6ffd945ec58b4db774aa141f2f8437c4fb161d0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Jan 2025 05:01:43 +0000 Subject: [PATCH 33/44] Update dependencies from https://github.com/dotnet/razor build 20250130.1 Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25079.5 -> To Version 9.0.0-preview.25080.1 --- NuGet.config | 3 +++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d1cccba90df..509a187f94c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7313032b2335..4ce58e012a96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ af22effae4069a5dfb9b0735859de48820104f5b - + https://github.com/dotnet/razor - 64910d5bea47a3ff7e74bd20040abadf1ac6eaad + 16ec5eb521fc1fe583e6353daf7f64303ef228d9 - + https://github.com/dotnet/razor - 64910d5bea47a3ff7e74bd20040abadf1ac6eaad + 16ec5eb521fc1fe583e6353daf7f64303ef228d9 - + https://github.com/dotnet/razor - 64910d5bea47a3ff7e74bd20040abadf1ac6eaad + 16ec5eb521fc1fe583e6353daf7f64303ef228d9 - + https://github.com/dotnet/razor - 64910d5bea47a3ff7e74bd20040abadf1ac6eaad + 16ec5eb521fc1fe583e6353daf7f64303ef228d9 diff --git a/eng/Versions.props b/eng/Versions.props index 3797b2347b16..f18b5e77089d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,9 +229,9 @@ - 9.0.0-preview.25079.5 - 9.0.0-preview.25079.5 - 9.0.0-preview.25079.5 + 9.0.0-preview.25080.1 + 9.0.0-preview.25080.1 + 9.0.0-preview.25080.1 From d691ff4ed1b384246bd3d9efe1a37398c83430fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Jan 2025 05:02:23 +0000 Subject: [PATCH 34/44] Update dependencies from https://github.com/dotnet/roslyn build 20250130.6 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-2.25079.2 -> To Version 4.14.0-2.25080.6 --- NuGet.config | 3 +++ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d1cccba90df..509a187f94c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7313032b2335..1fb79461a654 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 387f04cb6675c984036a64c9bb768ac6f00e06f9 - + https://github.com/dotnet/roslyn - 250065a15ef94895ef87f3e09b313b987375b5b1 + de7b08d41e1a09e4f86c17487d4b526011ada498 - + https://github.com/dotnet/roslyn - 250065a15ef94895ef87f3e09b313b987375b5b1 + de7b08d41e1a09e4f86c17487d4b526011ada498 - + https://github.com/dotnet/roslyn - 250065a15ef94895ef87f3e09b313b987375b5b1 + de7b08d41e1a09e4f86c17487d4b526011ada498 - + https://github.com/dotnet/roslyn - 250065a15ef94895ef87f3e09b313b987375b5b1 + de7b08d41e1a09e4f86c17487d4b526011ada498 - + https://github.com/dotnet/roslyn - 250065a15ef94895ef87f3e09b313b987375b5b1 + de7b08d41e1a09e4f86c17487d4b526011ada498 - + https://github.com/dotnet/roslyn - 250065a15ef94895ef87f3e09b313b987375b5b1 + de7b08d41e1a09e4f86c17487d4b526011ada498 - + https://github.com/dotnet/roslyn - 250065a15ef94895ef87f3e09b313b987375b5b1 + de7b08d41e1a09e4f86c17487d4b526011ada498 - + https://github.com/dotnet/roslyn - 250065a15ef94895ef87f3e09b313b987375b5b1 + de7b08d41e1a09e4f86c17487d4b526011ada498 - + https://github.com/dotnet/roslyn - 250065a15ef94895ef87f3e09b313b987375b5b1 + de7b08d41e1a09e4f86c17487d4b526011ada498 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 3797b2347b16..968386ed63de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.14.0-2.25079.2 - 4.14.0-2.25079.2 - 4.14.0-2.25079.2 - 4.14.0-2.25079.2 - 4.14.0-2.25079.2 - 4.14.0-2.25079.2 - 4.14.0-2.25079.2 - 4.14.0-2.25079.2 + 4.14.0-2.25080.6 + 4.14.0-2.25080.6 + 4.14.0-2.25080.6 + 4.14.0-2.25080.6 + 4.14.0-2.25080.6 + 4.14.0-2.25080.6 + 4.14.0-2.25080.6 + 4.14.0-2.25080.6 From ac44b7e0fee5cc541ace6323809bbb027c7e80ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 31 Jan 2025 05:02:25 +0000 Subject: [PATCH 35/44] Update dependencies from https://github.com/dotnet/msbuild build 20250130.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25080-01 --- NuGet.config | 3 +++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0d1cccba90df..509a187f94c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 030e113113a3..eeb66d6a7256 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - 9be102fff64e112c1a1a6245f766022579bde988 + d3297e62fe72f766db450096175951ecb2ce2146 - + https://github.com/dotnet/msbuild - 9be102fff64e112c1a1a6245f766022579bde988 + d3297e62fe72f766db450096175951ecb2ce2146 - + https://github.com/dotnet/msbuild - 9be102fff64e112c1a1a6245f766022579bde988 + d3297e62fe72f766db450096175951ecb2ce2146 diff --git a/eng/Versions.props b/eng/Versions.props index 8c22ee588620..e02b1281b523 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.0-preview-25079-01 - 17.14.0-preview-25079-01 + 17.14.0-preview-25080-01 + 17.14.0-preview-25080-01 17.11.4 17.12 From b896dbd9931ed2a341ba9610f2911dd6991fbc86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 1 Feb 2025 05:01:49 +0000 Subject: [PATCH 36/44] Update dependencies from https://github.com/dotnet/msbuild build 20250131.2 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.14.0-preview-25073-02 -> To Version 17.14.0-preview-25081-02 --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 509a187f94c7..ac7c5c98399b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eeb66d6a7256..ebf3f13407e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ 763d10a1a251be35337ee736832bfde3f9200672 - + https://github.com/dotnet/msbuild - d3297e62fe72f766db450096175951ecb2ce2146 + 7e539c169a657040eeb768e8115c44f1780e59df - + https://github.com/dotnet/msbuild - d3297e62fe72f766db450096175951ecb2ce2146 + 7e539c169a657040eeb768e8115c44f1780e59df - + https://github.com/dotnet/msbuild - d3297e62fe72f766db450096175951ecb2ce2146 + 7e539c169a657040eeb768e8115c44f1780e59df diff --git a/eng/Versions.props b/eng/Versions.props index e02b1281b523..0a7846d8837f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,8 +178,8 @@ At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. Additionally, set the MinimumVSVersion for the installer UI that's required for targeting NetCurrent --> - 17.14.0-preview-25080-01 - 17.14.0-preview-25080-01 + 17.14.0-preview-25081-02 + 17.14.0-preview-25081-02 17.11.4 17.12 From 4864dd02061a5bb1ce35cf774a645915fa450dc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 2 Feb 2025 05:02:04 +0000 Subject: [PATCH 37/44] Update dependencies from https://github.com/dotnet/roslyn build 20250131.4 Microsoft.SourceBuild.Intermediate.roslyn , 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 , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-2.25080.6 -> To Version 4.14.0-2.25081.4 --- NuGet.config | 3 +++ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f136051b469..82d963198ccb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d88c10a5231..13d9082e8750 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 387f04cb6675c984036a64c9bb768ac6f00e06f9 - + https://github.com/dotnet/roslyn - de7b08d41e1a09e4f86c17487d4b526011ada498 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - de7b08d41e1a09e4f86c17487d4b526011ada498 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - de7b08d41e1a09e4f86c17487d4b526011ada498 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - de7b08d41e1a09e4f86c17487d4b526011ada498 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - de7b08d41e1a09e4f86c17487d4b526011ada498 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - de7b08d41e1a09e4f86c17487d4b526011ada498 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - de7b08d41e1a09e4f86c17487d4b526011ada498 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - de7b08d41e1a09e4f86c17487d4b526011ada498 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - de7b08d41e1a09e4f86c17487d4b526011ada498 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 888682e966c1..80e038d00d31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -202,14 +202,14 @@ - 4.14.0-2.25080.6 - 4.14.0-2.25080.6 - 4.14.0-2.25080.6 - 4.14.0-2.25080.6 - 4.14.0-2.25080.6 - 4.14.0-2.25080.6 - 4.14.0-2.25080.6 - 4.14.0-2.25080.6 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 From 66186273b0aaff7eb6ce351b444045adba4f170e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Mon, 3 Feb 2025 09:54:08 -0800 Subject: [PATCH 38/44] Reuse browser when restarting project (#46381) --- .../dotnet-watch/Browser/BrowserConnector.cs | 23 +++++++++++++------ .../Browser/BrowserRefreshServer.cs | 16 +++++++++++-- .../dotnet-watch/HotReloadDotNetWatcher.cs | 2 +- .../Browser/BrowserConnectorTests.cs | 2 ++ .../HotReload/ApplyDeltaTests.cs | 22 ++++++++++++++++++ 5 files changed, 55 insertions(+), 10 deletions(-) diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs index 733a7abec5c5..38315cb09ca3 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs @@ -11,6 +11,8 @@ namespace Microsoft.DotNet.Watch { internal sealed partial class BrowserConnector(DotNetWatchContext context) : IAsyncDisposable, IStaticAssetChangeApplierProvider { + private readonly record struct ProjectKey(string projectPath, string targetFramework); + // This needs to be in sync with the version BrowserRefreshMiddleware is compiled against. private static readonly Version s_minimumSupportedVersion = Versions.Version6_0; @@ -23,11 +25,11 @@ internal sealed partial class BrowserConnector(DotNetWatchContext context) : IAs [GeneratedRegex(@"Login to the dashboard at (?.*)\s*$", RegexOptions.Compiled)] private static partial Regex GetAspireDashboardUrlRegex(); - private readonly object _serversGuard = new(); - private readonly Dictionary _servers = []; + private readonly Lock _serversGuard = new(); + private readonly Dictionary _servers = []; // interlocked - private ImmutableHashSet _browserLaunchAttempted = []; + private ImmutableHashSet _browserLaunchAttempted = []; public async ValueTask DisposeAsync() { @@ -48,6 +50,9 @@ await Task.WhenAll(serversToDispose.Select(async server => })); } + private static ProjectKey GetProjectKey(ProjectGraphNode projectNode) + => new(projectNode.ProjectInstance.FullPath, projectNode.GetTargetFramework()); + /// /// A single browser refresh server is created for each project that supports browser launching. /// When the project is rebuilt we reuse the same refresh server and browser instance. @@ -63,13 +68,15 @@ await Task.WhenAll(serversToDispose.Select(async server => BrowserRefreshServer? server; bool hasExistingServer; + var key = GetProjectKey(projectNode); + lock (_serversGuard) { - hasExistingServer = _servers.TryGetValue(projectNode, out server); + hasExistingServer = _servers.TryGetValue(key, out server); if (!hasExistingServer) { server = IsServerSupported(projectNode) ? new BrowserRefreshServer(context.EnvironmentOptions, context.Reporter) : null; - _servers.Add(projectNode, server); + _servers.Add(key, server); } } @@ -108,9 +115,11 @@ bool IStaticAssetChangeApplierProvider.TryGetApplier(ProjectGraphNode projectNod public bool TryGetRefreshServer(ProjectGraphNode projectNode, [NotNullWhen(true)] out BrowserRefreshServer? server) { + var key = GetProjectKey(projectNode); + lock (_serversGuard) { - return _servers.TryGetValue(projectNode, out server) && server != null; + return _servers.TryGetValue(key, out server) && server != null; } } @@ -156,7 +165,7 @@ void handler(OutputLine line) matchFound = true; if (projectOptions.IsRootProject && - ImmutableInterlocked.Update(ref _browserLaunchAttempted, static (set, projectNode) => set.Add(projectNode), projectNode)) + ImmutableInterlocked.Update(ref _browserLaunchAttempted, static (set, key) => set.Add(key), GetProjectKey(projectNode))) { // first build iteration of a root project: var launchUrl = GetLaunchUrl(launchProfile.LaunchUrl, match.Groups["url"].Value); diff --git a/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs b/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs index ec9e12e07a87..a8333af46546 100644 --- a/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs +++ b/src/BuiltInTools/dotnet-watch/Browser/BrowserRefreshServer.cs @@ -21,6 +21,7 @@ namespace Microsoft.DotNet.Watch { /// /// Communicates with aspnetcore-browser-refresh.js loaded in the browser. + /// Associated with a project instance. /// internal sealed class BrowserRefreshServer : IAsyncDisposable, IStaticAssetChangeApplier { @@ -28,6 +29,8 @@ internal sealed class BrowserRefreshServer : IAsyncDisposable, IStaticAssetChang private static readonly ReadOnlyMemory s_waitMessage = Encoding.UTF8.GetBytes("Wait"); private static readonly JsonSerializerOptions s_jsonSerializerOptions = new(JsonSerializerDefaults.Web); + private static bool? s_lazyTlsSupported; + private readonly List _activeConnections = []; private readonly RSA _rsa; private readonly IReporter _reporter; @@ -326,16 +329,25 @@ public async ValueTask SendAndReceiveAsync( private async Task SupportsTlsAsync() { + var result = s_lazyTlsSupported; + if (result.HasValue) + { + return result.Value; + } + try { using var process = Process.Start(Options.MuxerPath, "dev-certs https --check --quiet"); await process.WaitForExitAsync().WaitAsync(TimeSpan.FromSeconds(10)); - return process.ExitCode == 0; + result = process.ExitCode == 0; } catch { - return false; + result = false; } + + s_lazyTlsSupported = result; + return result.Value; } public ValueTask RefreshBrowserAsync(CancellationToken cancellationToken) diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index 228b286bdccc..cf70a94ca7c4 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -57,6 +57,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke Context.Reporter.Output(hotReloadEnabledMessage, emoji: "🔥"); } + await using var browserConnector = new BrowserConnector(Context); using var fileWatcher = new FileWatcher(Context.Reporter); for (var iteration = 0; !shutdownCancellationToken.IsCancellationRequested; iteration++) @@ -98,7 +99,6 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke Context.Reporter.Verbose("Using Aspire process launcher."); } - await using var browserConnector = new BrowserConnector(Context); var projectMap = new ProjectNodeMap(evaluationResult.ProjectGraph, Context.Reporter); compilationHandler = new CompilationHandler(Context.Reporter, Context.EnvironmentOptions, shutdownCancellationToken); var scopedCssFileHandler = new ScopedCssFileHandler(Context.Reporter, projectMap, browserConnector); diff --git a/test/dotnet-watch.Tests/Browser/BrowserConnectorTests.cs b/test/dotnet-watch.Tests/Browser/BrowserConnectorTests.cs index add6710a3010..ad53ecc7484a 100644 --- a/test/dotnet-watch.Tests/Browser/BrowserConnectorTests.cs +++ b/test/dotnet-watch.Tests/Browser/BrowserConnectorTests.cs @@ -9,11 +9,13 @@ public class BrowserConnectorTests { [Theory] [InlineData(null, "https://localhost:1234", "https://localhost:1234")] + [InlineData(null, "https://localhost:1234/", "https://localhost:1234/")] [InlineData("", "https://localhost:1234", "https://localhost:1234")] [InlineData(" ", "https://localhost:1234", "https://localhost:1234")] [InlineData("", "a/b", "a/b")] [InlineData("x/y", "a/b", "a/b")] [InlineData("a/b?X=1", "https://localhost:1234", "https://localhost:1234/a/b?X=1")] + [InlineData("https://localhost:1000/", "https://localhost:1234", "https://localhost:1000/")] [InlineData("https://localhost:1000/a/b", "https://localhost:1234", "https://localhost:1000/a/b")] [InlineData("https://localhost:1000/x/y?z=u", "https://localhost:1234/a?b=c", "https://localhost:1000/x/y?z=u")] public void GetLaunchUrl(string? profileLaunchUrl, string outputLaunchUrl, string expected) diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 138bfdb8e82b..6ac6ee3ee207 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -382,6 +382,28 @@ public async Task BlazorWasm_MSBuildWarning() await App.AssertWaitingForChanges(); } + [Fact] + public async Task BlazorWasm_Restart() + { + var testAsset = TestAssets.CopyTestAsset("WatchBlazorWasm") + .WithSource(); + + var port = TestOptions.GetTestPort(); + App.Start(testAsset, ["--urls", "http://localhost:" + port], testFlags: TestFlags.ReadKeyFromStdin | TestFlags.MockBrowser); + + await App.AssertWaitingForChanges(); + + App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); + App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); + + // Browser is launched based on blazor-devserver output "Now listening on: ...". + await App.WaitUntilOutputContains($"dotnet watch ⌚ Launching browser: http://localhost:{port}"); + + App.SendControlR(); + + await App.WaitUntilOutputContains($"dotnet watch ⌚ Reloading browser."); + } + [Fact] public async Task Razor_Component_ScopedCssAndStaticAssets() { From e6366a5c8515ac2b1ace1e8087bf211e7f125e21 Mon Sep 17 00:00:00 2001 From: Eduardo Villalpando Mello Date: Mon, 3 Feb 2025 17:45:32 -0600 Subject: [PATCH 39/44] SlnFileFactory.CreateFromFilteredSolutionFile: Refactor (#46404) --- src/Cli/dotnet/SlnFileFactory.cs | 51 ++++++++++++++------------------ 1 file changed, 23 insertions(+), 28 deletions(-) diff --git a/src/Cli/dotnet/SlnFileFactory.cs b/src/Cli/dotnet/SlnFileFactory.cs index 10a36d6d7148..a7b9b55768b2 100644 --- a/src/Cli/dotnet/SlnFileFactory.cs +++ b/src/Cli/dotnet/SlnFileFactory.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Text.Json; +using System.Text.Json.Nodes; using Microsoft.DotNet.Cli.Utils; using Microsoft.VisualStudio.SolutionPersistence; using Microsoft.VisualStudio.SolutionPersistence.Model; @@ -71,38 +72,29 @@ public static SolutionModel CreateFromFileOrDirectory(string fileOrDirectory, bo public static SolutionModel CreateFromFilteredSolutionFile(string filteredSolutionPath) { - JsonDocument jsonDocument; - JsonElement jsonElement; - JsonElement filteredSolutionJsonElement; string originalSolutionPath; string originalSolutionPathAbsolute; - string[] filteredSolutionProjectPaths; - + IEnumerable filteredSolutionProjectPaths; try { - jsonDocument = JsonDocument.Parse(File.ReadAllText(filteredSolutionPath)); - jsonElement = jsonDocument.RootElement; - filteredSolutionJsonElement = jsonElement.GetProperty("solution"); - originalSolutionPath = filteredSolutionJsonElement.GetProperty("path").GetString(); + JsonElement root = JsonDocument.Parse(File.ReadAllText(filteredSolutionPath)).RootElement; + originalSolutionPath = root.GetProperty("solution").GetProperty("path").GetString(); + filteredSolutionProjectPaths = root.GetProperty("solution").GetProperty("projects").EnumerateArray().Select(p => p.GetString()).ToArray(); originalSolutionPathAbsolute = Path.GetFullPath(originalSolutionPath, Path.GetDirectoryName(filteredSolutionPath)); - if (!File.Exists(originalSolutionPathAbsolute)) - { - throw new Exception(); - } - filteredSolutionProjectPaths = filteredSolutionJsonElement.GetProperty("projects") - .EnumerateArray() - .Select(project => project.GetString()) - .ToArray(); } - catch (Exception ex) { + catch (Exception ex) + { throw new GracefulException( CommonLocalizableStrings.InvalidSolutionFormatString, filteredSolutionPath, ex.Message); } - SolutionModel filteredSolution = new SolutionModel(); + SolutionModel filteredSolution = new(); SolutionModel originalSolution = CreateFromFileOrDirectory(originalSolutionPathAbsolute); + // Store the original solution path in the description field of the filtered solution + filteredSolution.Description = originalSolutionPathAbsolute; + foreach (var platform in originalSolution.Platforms) { filteredSolution.AddPlatform(platform); @@ -112,16 +104,19 @@ public static SolutionModel CreateFromFilteredSolutionFile(string filteredSoluti filteredSolution.AddBuildType(buildType); } - foreach (string path in filteredSolutionProjectPaths) - { - // Normalize path to use correct directory separator - string normalizedPath = path.Replace('\\', Path.DirectorySeparatorChar); - - SolutionProjectModel project = originalSolution.FindProject(normalizedPath) ?? throw new GracefulException( + IEnumerable projects = filteredSolutionProjectPaths + .Select(path => path.Replace('\\', Path.DirectorySeparatorChar)) + .Select(path => originalSolution.FindProject(path) ?? throw new GracefulException( CommonLocalizableStrings.ProjectNotFoundInTheSolution, - normalizedPath, - originalSolutionPath); - filteredSolution.AddProject(project.FilePath, project.Type, project.Parent is null ? null : filteredSolution.AddFolder(project.Parent.Path)); + path, + originalSolutionPath)); + + foreach (var project in projects) + { + _ = filteredSolution.AddProject( + project.FilePath, + project.Type, + project.Parent is null ? null : filteredSolution.AddFolder(project.Parent.Path)); } return filteredSolution; From efff89eaf71c6295f4612562401af618f770f321 Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Tue, 4 Feb 2025 10:41:33 +0100 Subject: [PATCH 40/44] Fix tests after 'WarnOnCultureOverwritten' made an opt-in --- .../GivenThatWeWantMSBuildToRespectCustomCulture.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs index 1bebbd693c4f..b52fdb9dfecc 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantMSBuildToRespectCustomCulture.cs @@ -27,9 +27,11 @@ public void SupportRespectAlreadyAssignedItemCulture_ByDefault_ForDotnet9(string new FileInfo(Path.Combine(outputDirectory, "test-2", "MSBuildCultureResourceGeneration.resources.dll")).Should().Exist(); } - [CoreMSBuildOnlyTheory] [InlineData("net7.0")] [InlineData("net6.0")] + // Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the WarnOnCultureOverwritten + // is not supported - and the build will fail copy (more details in the last test). + [CoreMSBuildOnlyTheory] public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldWarn(string targetFramework) { var testAsset = _testAssetsManager @@ -39,17 +41,18 @@ public void SupportRespectAlreadyAssignedItemCulture_IsNotSupported_BuildShouldW var buildCommand = new BuildCommand(testAsset); // Custom culture is allowed, but if set explicitly and overwritten - a warning is issued. - buildCommand.Execute().Should().Pass().And + // However the warning is explicit opt-in. + buildCommand.Execute("/p:WarnOnCultureOverwritten=true").Should().Pass().And // warning MSB3002: Explicitly set culture "test-1" for item "Resources.test-1.resx" was overwritten with inferred culture "", because 'RespectAlreadyAssignedItemCulture' property was not set. .HaveStdOutContaining("warning MSB3002:"); } - [FullMSBuildOnlyTheory] + [Theory] [InlineData("net7.0")] [InlineData("net6.0")] - // Is this Failing? Is full FW MSBuild already on 17.13? Then remove this test and remove `[CoreMSBuildOnlyTheory]` attribute on the test above + // Is this Failing? Check if WarnOnCultureOverwritten hasn't been made a default opt-in in sdk or MSBuild. // - // Until MSBuild 17.13 is merged into FullFW MSBuild in sdk tests - the test will fail, as + // Without explicit opt-in via WarnOnCultureOverwritten - the test will fail, as // proper recognition of custom cultures in RAR is not supported and hence the build will fail during copy: // // Microsoft.Common.CurrentVersion.targets(4959,5): error MSB3030: Could not copy the file "obj\Debug\net7.0\test-1\MSBuildCultureResourceGeneration.resources.dll" because it was not found. From dae2e6d2c891005d3bc59d4403b1738f3ddfdea0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Feb 2025 11:49:00 +0000 Subject: [PATCH 41/44] Update dependencies from https://github.com/dotnet/scenario-tests build 20250202.1 Microsoft.SourceBuild.Intermediate.scenario-tests , Microsoft.DotNet.ScenarioTests.SdkTemplateTests From Version 9.0.0-preview.25079.1 -> To Version 9.0.0-preview.25102.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 13d9082e8750..2e048e1332e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -597,14 +597,14 @@ https://github.com/dotnet/arcade-services 47e3672c762970073e4282bd563233da86bcca3e - + https://github.com/dotnet/scenario-tests - 4d0fe09477310240ec5bcf7c7758fbb358ca02ab + 008b3a357044b102ec30e15ac381c2e880f573af - + https://github.com/dotnet/scenario-tests - 4d0fe09477310240ec5bcf7c7758fbb358ca02ab + 008b3a357044b102ec30e15ac381c2e880f573af From 970c648486ede543ba7250e471e6fbac7e15609c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 4 Feb 2025 11:49:55 +0000 Subject: [PATCH 42/44] Update dependencies from https://github.com/microsoft/vstest build 20250203.3 Microsoft.SourceBuild.Intermediate.vstest , Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.14.0-preview-25079-01 -> To Version 17.14.0-preview-25103-03 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13d9082e8750..75d5e71987ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -208,22 +208,22 @@ https://github.com/nuget/nuget.client c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/microsoft/vstest - 0c76159090e0921b9cf38b95092dbccd4e59cd24 + 4490ff63b38a0852c7a3d28f7d6bf419f7fa3649 - + https://github.com/microsoft/vstest - 0c76159090e0921b9cf38b95092dbccd4e59cd24 + 4490ff63b38a0852c7a3d28f7d6bf419f7fa3649 - + https://github.com/microsoft/vstest - 0c76159090e0921b9cf38b95092dbccd4e59cd24 + 4490ff63b38a0852c7a3d28f7d6bf419f7fa3649 - + https://github.com/microsoft/vstest - 0c76159090e0921b9cf38b95092dbccd4e59cd24 + 4490ff63b38a0852c7a3d28f7d6bf419f7fa3649 diff --git a/eng/Versions.props b/eng/Versions.props index 80e038d00d31..347510c58c80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,9 +150,9 @@ - 17.14.0-preview-25079-01 - 17.14.0-preview-25079-01 - 17.14.0-preview-25079-01 + 17.14.0-preview-25103-03 + 17.14.0-preview-25103-03 + 17.14.0-preview-25103-03 From e368dc9e9f5019e77f9db63523751909029518d7 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Tue, 4 Feb 2025 12:16:55 -0800 Subject: [PATCH 43/44] Go up two more levels looking for dmp (#46430) --- test/UnitTests.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/UnitTests.proj b/test/UnitTests.proj index b37387594dc0..eab103182aed 100644 --- a/test/UnitTests.proj +++ b/test/UnitTests.proj @@ -122,7 +122,7 @@ . $HELIX_CORRELATION_PAYLOAD/t/RunTestsOnHelix.sh;$(HelixPreCommands) PowerShell -ExecutionPolicy ByPass "dotnet nuget locals all -l | ForEach-Object { $_.Split(' ')[1]} | Where-Object{$_ -like '*cache'} | Get-ChildItem -Recurse -File -Filter '*.dat' | Measure";$(HelixPostCommands) PowerShell -ExecutionPolicy ByPass "Get-ChildItem -Recurse -File -Filter '*hangdump.dmp' | Copy-Item -Destination $env:HELIX_WORKITEM_UPLOAD_ROOT";$(HelixPostCommands) - find "$HELIX_WORKITEM_UPLOAD_ROOT/.." -name '*hangdump.dmp' -exec cp {} "$HELIX_WORKITEM_UPLOAD_ROOT" \%3B;$(HelixPostCommands) + find "$HELIX_WORKITEM_UPLOAD_ROOT/../../.." -name '*hangdump.dmp' -exec cp {} "$HELIX_WORKITEM_UPLOAD_ROOT" \%3B;$(HelixPostCommands) $(RepoRoot)artifacts\bin\redist\$(Configuration)\dotnet $(Version) $(RepoRoot)artifacts\bin\Microsoft.DotNet.MSBuildSdkResolver From bb116e44611ff35227d02baf2728051d1805a5cc Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 4 Feb 2025 23:06:42 -0800 Subject: [PATCH 44/44] Remove the duplicate part --- .vsts-pr.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index eded1a523a6b..2e5c086a70e4 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -20,12 +20,6 @@ parameters: type: boolean default: false -parameters: -- name: enableArm64Job - displayName: Enables the ARM64 job - type: boolean - default: false - variables: - template: /eng/pipelines/templates/variables/sdk-defaults.yml # Variables used: DncEngPublicBuildPool