From 1583a16e642c22b739bfea932741d7809db48a07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Sep 2024 12:46:03 +0000 Subject: [PATCH 01/90] Update dependencies from https://github.com/dotnet/arcade build 20240911.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24460.4 -> To Version 8.0.0-beta.24461.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a992be4806be..22a5a9b4ecd8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -487,22 +487,22 @@ - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + dcb2d68022c6b515f547223ffc1837361f116534 - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + dcb2d68022c6b515f547223ffc1837361f116534 - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + dcb2d68022c6b515f547223ffc1837361f116534 - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + dcb2d68022c6b515f547223ffc1837361f116534 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2fff841a44ff..8b475b81f354 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24460.4 + 8.0.0-beta.24461.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -212,7 +212,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24460.4 + 8.0.0-beta.24461.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 6b80a4592f1c..a94d6a8f2405 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24460.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24460.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24461.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24461.1" } } From 313de996a357b00b955b1ecaf74e5a34ca570b75 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Sep 2024 13:07:14 +0000 Subject: [PATCH 02/90] Update dependencies from https://github.com/dotnet/arcade build 20240911.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24461.1 -> To Version 8.0.0-beta.24461.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1bce81721a6..bc4f6392319c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -487,22 +487,22 @@ - + https://github.com/dotnet/arcade - dcb2d68022c6b515f547223ffc1837361f116534 + 0028fccccc2181a64c5c4a283ac0baae3913284b - + https://github.com/dotnet/arcade - dcb2d68022c6b515f547223ffc1837361f116534 + 0028fccccc2181a64c5c4a283ac0baae3913284b - + https://github.com/dotnet/arcade - dcb2d68022c6b515f547223ffc1837361f116534 + 0028fccccc2181a64c5c4a283ac0baae3913284b - + https://github.com/dotnet/arcade - dcb2d68022c6b515f547223ffc1837361f116534 + 0028fccccc2181a64c5c4a283ac0baae3913284b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 068c6e79a6fe..1216831849b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.24461.1 + 8.0.0-beta.24461.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -212,7 +212,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24461.1 + 8.0.0-beta.24461.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index a94d6a8f2405..0277edd823ee 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24461.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24461.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24461.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24461.2" } } From 9142933f0ff9c5d65e5fc0b681fb1758ab9449d9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Sep 2024 13:36:47 -0700 Subject: [PATCH 03/90] Expand EOL list to include net7 6 months after it goes OOS per design --- .../targets/Microsoft.NET.EolTargetFrameworks.targets | 2 +- .../GivenThatWeWantToTargetEolFrameworks.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets index d9bd74aa368f..8608d9f77a33 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets @@ -21,7 +21,7 @@ Copyright (c) .NET Foundation. All rights reserved. receive servicing updates and security fixes. --> - <_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0" /> + <_EolNetCoreTargetFrameworkVersions Include="1.0;1.1;2.0;2.1;2.2;3.0;3.1;5.0;7.0" /> <_MinimumNonEolSupportedNetCoreTargetFramework>net6.0 diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs index 9f196512336e..6e020c0df98f 100644 --- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs +++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs @@ -15,6 +15,7 @@ public GivenThatWeWantToTargetEolFrameworks(ITestOutputHelper log) : base(log) [InlineData("netcoreapp3.0")] [InlineData("netcoreapp3.1")] [InlineData("net5.0")] + [InlineData("net7.0")] public void It_warns_that_framework_is_out_of_support(string targetFrameworks) { var testProject = new TestProject() From 13f9e6c4487d9e7f586b71d042e0272f9c7e18b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Sep 2024 13:19:49 +0000 Subject: [PATCH 04/90] Update dependencies from https://github.com/dotnet/roslyn build 20240913.9 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.12.0-3.24463.1 -> To Version 4.12.0-3.24463.9 --- 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 627880f83e9f..cd6d53177d33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 15c05bd87541c8ac023aa2c3a0d86a5da7f1b918 - + https://github.com/dotnet/roslyn - 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 + df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/roslyn - 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 + df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/roslyn - 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 + df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/roslyn - 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 + df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/roslyn - 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 + df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/roslyn - 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 + df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/roslyn - 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 + df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/roslyn - 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 + df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/roslyn - 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 + df4ae6b81013ac45367372176b9c3135a35a7e3c https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 7ecdca8cbeae..205fe641362e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,14 +235,14 @@ - 4.12.0-3.24463.1 - 4.12.0-3.24463.1 - 4.12.0-3.24463.1 - 4.12.0-3.24463.1 - 4.12.0-3.24463.1 - 4.12.0-3.24463.1 - 4.12.0-3.24463.1 - 4.12.0-3.24463.1 + 4.12.0-3.24463.9 + 4.12.0-3.24463.9 + 4.12.0-3.24463.9 + 4.12.0-3.24463.9 + 4.12.0-3.24463.9 + 4.12.0-3.24463.9 + 4.12.0-3.24463.9 + 4.12.0-3.24463.9 From 5954300e647f82a35639eb8ccd93553d22a593a9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 16 Sep 2024 10:07:10 -0700 Subject: [PATCH 05/90] Correctly handle different architectures of the SDK Update the test to ensure we have caching --- src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs | 7 ++----- test/dotnet.Tests/TelemetryCommonPropertiesTests.cs | 6 +++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs index a4afb8b13933..7a8ddaad50e4 100644 --- a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs +++ b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs @@ -39,10 +39,7 @@ private static string GetCachedDeviceId() if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { // Get device Id from Windows registry - using (var key = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) - { - deviceId = key?.GetValue("deviceid") as string; - } + deviceId = Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\DeveloperTools", "deviceid", null) as string; } else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { @@ -81,7 +78,7 @@ private static void CacheDeviceId(string deviceId) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { // Cache device Id in Windows registry - using (var key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + using (var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Default).CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) { key.SetValue("deviceid", deviceId); } diff --git a/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs b/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs index 44b132f72971..575f0f6ebd0c 100644 --- a/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs +++ b/test/dotnet.Tests/TelemetryCommonPropertiesTests.cs @@ -50,12 +50,16 @@ public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotGetMacAddress( } [Fact] - public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotDevDeviceId() + public void TelemetryCommonPropertiesShouldEnsureDevDeviceIDIsCached() { var unitUnderTest = new TelemetryCommonProperties(userLevelCacheWriter: new NothingCache()); var assignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"]; Guid.TryParse(assignedMachineId, out var _).Should().BeTrue("it should be a guid"); + var secondAssignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"]; + + Guid.TryParse(secondAssignedMachineId, out var _).Should().BeTrue("it should be a guid"); + secondAssignedMachineId.Should().Be(assignedMachineId, "it should match the previously assigned guid"); } [Fact] From 5ce116a3bcccd6fb6dfe9ec3f96ce8391fa874ad Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 16 Sep 2024 10:23:15 -0700 Subject: [PATCH 06/90] Remove 7.0 from the templating tests Disable the EOL message for two publishing tests --- .../GivenThatWeWantToPublishAnAotApp.cs | 4 ++-- test/dotnet-new.Tests/CommonTemplatesTests.cs | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 85473ebe5cd4..52ead18ac2c2 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -44,7 +44,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name)); publishCommand - .Execute($"/p:UseCurrentRuntimeIdentifier=true", "/p:SelfContained=true") + .Execute($"/p:UseCurrentRuntimeIdentifier=true", "/p:SelfContained=true", "/p:CheckEolTargetFramework=false") .Should().Pass() .And.NotHaveStdOutContaining("IL2026") .And.NotHaveStdErrContaining("NETSDK1179") @@ -88,7 +88,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_false(string t var publishCommand = new PublishCommand(testAsset); publishCommand - .Execute($"/p:RuntimeIdentifier={rid}", "/p:SelfContained=true") + .Execute($"/p:RuntimeIdentifier={rid}", "/p:SelfContained=true", "/p:CheckEolTargetFramework=false") .Should().Pass() .And.NotHaveStdOutContaining("IL2026") .And.NotHaveStdErrContaining("NETSDK1179") diff --git a/test/dotnet-new.Tests/CommonTemplatesTests.cs b/test/dotnet-new.Tests/CommonTemplatesTests.cs index 6f598250a7ef..98c86dde4016 100644 --- a/test/dotnet-new.Tests/CommonTemplatesTests.cs +++ b/test/dotnet-new.Tests/CommonTemplatesTests.cs @@ -230,8 +230,8 @@ public async Task AotVariants(string name, string language) var templatesToTest = new[] { - new { Template = consoleTemplateShortname, Frameworks = new[] { null, "net6.0", "net7.0", "net8.0" } }, - new { Template = "classlib", Frameworks = new[] { null, "net6.0", "net7.0", "net8.0", "netstandard2.0", "netstandard2.1" } } + new { Template = consoleTemplateShortname, Frameworks = new[] { null, "net6.0", "net8.0" } }, + new { Template = "classlib", Frameworks = new[] { null, "net6.0", "net8.0", "netstandard2.0", "netstandard2.1" } } }; //features: top-level statements; nullables; implicit usings; filescoped namespaces @@ -240,9 +240,9 @@ public async Task AotVariants(string name, string language) //C# 12 is not supported yet - https://github.com/dotnet/sdk/issues/29195 string?[] supportedLanguageVersions = { null, "ISO-2", "2", "3", "4", "5", "6", "7", "7.1", "7.2", "7.3", "8.0", "9.0", "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" }; - string?[] nullableSupportedInFrameworkByDefault = { null, "net6.0", "net7.0", "net8.0", "netstandard2.1" }; - string?[] implicitUsingsSupportedInFramework = { null, "net6.0", "net7.0", "net8.0" }; - string?[] fileScopedNamespacesSupportedFrameworkByDefault = { null, "net6.0", "net7.0", "net8.0" }; + string?[] nullableSupportedInFrameworkByDefault = { null, "net6.0", "net8.0", "netstandard2.1" }; + string?[] implicitUsingsSupportedInFramework = { null, "net6.0", "net8.0" }; + string?[] fileScopedNamespacesSupportedFrameworkByDefault = { null, "net6.0", "net8.0" }; string?[] nullableSupportedLanguages = { "8.0", "9.0", "10.0", "11.0", "11", /*"12",*/ "latest", "latestMajor", "default", "preview" }; string?[] topLevelStatementSupportedLanguages = { null, "9.0", "10.0", "11", "11.0", /*"12",*/ "latest", "latestMajor", "default", "preview" }; From 95498d7797863c8a171726cef75c9666fa9ba1a1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Sep 2024 20:10:16 +0000 Subject: [PATCH 07/90] Update dependencies from https://github.com/nuget/nuget.client build 6.11.1.2 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.11.0-rc.122 -> To Version 6.11.1-rc.2 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc4f6392319c..f68c9a02d38d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -119,73 +119,73 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 954f61dd38b33caa2b736c73530bd5a294174437 - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/nuget/nuget.client - c0d441fc5e99e6765c9e0b2f77de162b9866b305 + 5469bd0d9de8108f15f21644759773b85471366c https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 1216831849b3..d7f1d03db028 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,18 +85,18 @@ - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 - 6.11.0-rc.122 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) From f069be7081b71204c376f7291ff9da9b009ae4ac Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 16 Sep 2024 16:44:41 -0700 Subject: [PATCH 08/90] Fix the logic to correctly pull from the OS artchitecture so we use the 64bit hive on x64 and arm64 and the x86 hive on x86 --- src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs index 7a8ddaad50e4..f5b0986b03c5 100644 --- a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs +++ b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs @@ -38,8 +38,12 @@ private static string GetCachedDeviceId() if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - // Get device Id from Windows registry - deviceId = Registry.GetValue(@"HKEY_CURRENT_USER\SOFTWARE\Microsoft\DeveloperTools", "deviceid", null) as string; + // Get device Id from Windows registry matching the OS architecture + RegistryView registryView = Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32; + using (var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, registryView).OpenSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + { + deviceId = key?.GetValue("deviceid") as string; + } } else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) { @@ -77,10 +81,17 @@ private static void CacheDeviceId(string deviceId) { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { - // Cache device Id in Windows registry - using (var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Default).CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + // Cache device Id in Windows registry matching the OS architecture + RegistryView registryView = Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32; + using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, registryView)) { - key.SetValue("deviceid", deviceId); + using(var key = baseKey.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + { + if (key != null) + { + key.SetValue("deviceid", deviceId); + } + } } } else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) From 2a6c765bd2946eb4956902632e42f752088be0c6 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 16 Sep 2024 16:52:59 -0700 Subject: [PATCH 09/90] Unstable branding with rtm label and empty iteration --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b9be7d1671ff..0cb1b1cd12ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,10 +19,10 @@ false release - rc + rtm rtm servicing - 2 + From e3c03430f250be3a48d0179497ad72e6277118e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Sep 2024 13:05:37 +0000 Subject: [PATCH 10/90] Update dependencies from https://github.com/dotnet/roslyn build 20240916.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.12.0-3.24463.9 -> To Version 4.12.0-3.24466.4 --- 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 cd6d53177d33..a63e7c8fdc64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 15c05bd87541c8ac023aa2c3a0d86a5da7f1b918 - + https://github.com/dotnet/roslyn - df4ae6b81013ac45367372176b9c3135a35a7e3c + 7b7951aa13c50ad768538e58ed3805898b058928 - + https://github.com/dotnet/roslyn - df4ae6b81013ac45367372176b9c3135a35a7e3c + 7b7951aa13c50ad768538e58ed3805898b058928 - + https://github.com/dotnet/roslyn - df4ae6b81013ac45367372176b9c3135a35a7e3c + 7b7951aa13c50ad768538e58ed3805898b058928 - + https://github.com/dotnet/roslyn - df4ae6b81013ac45367372176b9c3135a35a7e3c + 7b7951aa13c50ad768538e58ed3805898b058928 - + https://github.com/dotnet/roslyn - df4ae6b81013ac45367372176b9c3135a35a7e3c + 7b7951aa13c50ad768538e58ed3805898b058928 - + https://github.com/dotnet/roslyn - df4ae6b81013ac45367372176b9c3135a35a7e3c + 7b7951aa13c50ad768538e58ed3805898b058928 - + https://github.com/dotnet/roslyn - df4ae6b81013ac45367372176b9c3135a35a7e3c + 7b7951aa13c50ad768538e58ed3805898b058928 - + https://github.com/dotnet/roslyn - df4ae6b81013ac45367372176b9c3135a35a7e3c + 7b7951aa13c50ad768538e58ed3805898b058928 - + https://github.com/dotnet/roslyn - df4ae6b81013ac45367372176b9c3135a35a7e3c + 7b7951aa13c50ad768538e58ed3805898b058928 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 205fe641362e..1cb95e538c07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,14 +235,14 @@ - 4.12.0-3.24463.9 - 4.12.0-3.24463.9 - 4.12.0-3.24463.9 - 4.12.0-3.24463.9 - 4.12.0-3.24463.9 - 4.12.0-3.24463.9 - 4.12.0-3.24463.9 - 4.12.0-3.24463.9 + 4.12.0-3.24466.4 + 4.12.0-3.24466.4 + 4.12.0-3.24466.4 + 4.12.0-3.24466.4 + 4.12.0-3.24466.4 + 4.12.0-3.24466.4 + 4.12.0-3.24466.4 + 4.12.0-3.24466.4 From c6e845af18a06cee41f4ac1c745b1e55c9c01831 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Sep 2024 13:11:46 +0000 Subject: [PATCH 11/90] Update dependencies from https://github.com/dotnet/runtime build 20240916.12 Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.ProtectedData , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , System.Text.Json , System.Windows.Extensions , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.0-rc.2.24463.7 -> To Version 9.0.0-rc.2.24466.12 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.0-rc.2.24455.1 -> To Version 9.0.0-rc.2.24464.3 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 70 +++++++++---------- 2 files changed, 109 insertions(+), 109 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79bf8ef13f45..c9523104a07e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ a23da1c15c737b5e121650cfa5a86805e74e34fc - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c @@ -59,14 +59,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - 6e079c23aee94577c17bae34522b52df0d646ca5 + c3d83d0ea894e5ee537bfc591fd48e06af8d9166 - + https://github.com/dotnet/emsdk - 6e079c23aee94577c17bae34522b52df0d646ca5 + c3d83d0ea894e5ee537bfc591fd48e06af8d9166 @@ -226,29 +226,29 @@ 07acde22b65497e72de145d57167b83609a7f7fb - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c https://github.com/dotnet/windowsdesktop @@ -499,89 +499,89 @@ - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c https://github.com/dotnet/aspnetcore 9b3ca0b29a32cce87ec14d6c707d406e52834412 - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c @@ -615,9 +615,9 @@ bcba6939456aa552554eae9ea9538a039cc98d96 - + https://github.com/dotnet/runtime - 46cfb747b4c22471242dee0d106f5c79cf9fd4c5 + 7832c5d3028cf206ab7faf4a889ee8ed34abee5c https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b9be7d1671ff..2f5514fb069b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -122,47 +122,47 @@ - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 8.0.0-rc.1.23414.4 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 2.1.0 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 8.0.0 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 8.0.0 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 8.0.4 - 9.0.0-rc.2.24463.7 - 9.0.0-rc.2.24463.7 + 9.0.0-rc.2.24466.12 + 9.0.0-rc.2.24466.12 @@ -360,7 +360,7 @@ 14.2.9714-net9-p6 17.2.9714-net9-p6 - 9.0.0-rc.2.24455.1 + 9.0.0-rc.2.24464.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) From 7d62d931bcba9181a7a16ed92753ada3af427de8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 17 Sep 2024 11:40:50 -0700 Subject: [PATCH 12/90] Simplify the logic to always request the 64bit hive as it'll default to 32bit when on a 32bit OS --- src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs index f5b0986b03c5..75cf861cd514 100644 --- a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs +++ b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs @@ -39,8 +39,7 @@ private static string GetCachedDeviceId() if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { // Get device Id from Windows registry matching the OS architecture - RegistryView registryView = Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32; - using (var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, registryView).OpenSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + using (var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64).OpenSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) { deviceId = key?.GetValue("deviceid") as string; } @@ -82,8 +81,7 @@ private static void CacheDeviceId(string deviceId) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { // Cache device Id in Windows registry matching the OS architecture - RegistryView registryView = Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32; - using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, registryView)) + using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64)) { using(var key = baseKey.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) { From 8f2b1692f5be0cbe4917c78e3409a45fddf767a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Sep 2024 12:57:04 +0000 Subject: [PATCH 13/90] Update dependencies from https://github.com/dotnet/roslyn build 20240917.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.12.0-3.24466.4 -> To Version 4.12.0-3.24467.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 a63e7c8fdc64..5c30b43f7789 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 15c05bd87541c8ac023aa2c3a0d86a5da7f1b918 - + https://github.com/dotnet/roslyn - 7b7951aa13c50ad768538e58ed3805898b058928 + a182892bf997a457cfcdbece5352e1a139eb2a12 - + https://github.com/dotnet/roslyn - 7b7951aa13c50ad768538e58ed3805898b058928 + a182892bf997a457cfcdbece5352e1a139eb2a12 - + https://github.com/dotnet/roslyn - 7b7951aa13c50ad768538e58ed3805898b058928 + a182892bf997a457cfcdbece5352e1a139eb2a12 - + https://github.com/dotnet/roslyn - 7b7951aa13c50ad768538e58ed3805898b058928 + a182892bf997a457cfcdbece5352e1a139eb2a12 - + https://github.com/dotnet/roslyn - 7b7951aa13c50ad768538e58ed3805898b058928 + a182892bf997a457cfcdbece5352e1a139eb2a12 - + https://github.com/dotnet/roslyn - 7b7951aa13c50ad768538e58ed3805898b058928 + a182892bf997a457cfcdbece5352e1a139eb2a12 - + https://github.com/dotnet/roslyn - 7b7951aa13c50ad768538e58ed3805898b058928 + a182892bf997a457cfcdbece5352e1a139eb2a12 - + https://github.com/dotnet/roslyn - 7b7951aa13c50ad768538e58ed3805898b058928 + a182892bf997a457cfcdbece5352e1a139eb2a12 - + https://github.com/dotnet/roslyn - 7b7951aa13c50ad768538e58ed3805898b058928 + a182892bf997a457cfcdbece5352e1a139eb2a12 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1cb95e538c07..38f035d72f57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,14 +235,14 @@ - 4.12.0-3.24466.4 - 4.12.0-3.24466.4 - 4.12.0-3.24466.4 - 4.12.0-3.24466.4 - 4.12.0-3.24466.4 - 4.12.0-3.24466.4 - 4.12.0-3.24466.4 - 4.12.0-3.24466.4 + 4.12.0-3.24467.5 + 4.12.0-3.24467.5 + 4.12.0-3.24467.5 + 4.12.0-3.24467.5 + 4.12.0-3.24467.5 + 4.12.0-3.24467.5 + 4.12.0-3.24467.5 + 4.12.0-3.24467.5 From 64d38a77173dcbc48137b3ee6321b24f4d1ce6f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Sep 2024 12:58:11 +0000 Subject: [PATCH 14/90] Update dependencies from https://github.com/dotnet/msbuild build 20240917.4 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.0-preview-24467-02 -> To Version 17.12.0-preview-24467-04 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bfcb2d9146e..695fe5bbbdf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ c3d83d0ea894e5ee537bfc591fd48e06af8d9166 - + https://github.com/dotnet/msbuild - 988196b1c64418351f46da7d3a9ff403560a4270 + 5bab860b2477f03050f170473a2563c5217d546f - + https://github.com/dotnet/msbuild - 988196b1c64418351f46da7d3a9ff403560a4270 + 5bab860b2477f03050f170473a2563c5217d546f - + https://github.com/dotnet/msbuild - 988196b1c64418351f46da7d3a9ff403560a4270 + 5bab860b2477f03050f170473a2563c5217d546f diff --git a/eng/Versions.props b/eng/Versions.props index 67031e3e6efb..93e2b97e7e51 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -212,8 +212,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.12.0-preview-24467-02 - 17.12.0-preview-24467-02 + 17.12.0-preview-24467-04 + 17.12.0-preview-24467-04 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From be377aed948eef9d5673aac2f186e0d443b0df5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Sep 2024 12:59:23 +0000 Subject: [PATCH 15/90] Update dependencies from https://github.com/dotnet/sourcelink build 20240917.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 9.0.0-beta.24466.3 -> To Version 9.0.0-beta.24467.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bfcb2d9146e..283f993605ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 1099a677155d9d4c1a81a612dffccbcf0d94f8e9 + d688f9125ef02fb8d23a5c86bd0063950de84fc4 - + https://github.com/dotnet/sourcelink - 1099a677155d9d4c1a81a612dffccbcf0d94f8e9 + d688f9125ef02fb8d23a5c86bd0063950de84fc4 - + https://github.com/dotnet/sourcelink - 1099a677155d9d4c1a81a612dffccbcf0d94f8e9 + d688f9125ef02fb8d23a5c86bd0063950de84fc4 - + https://github.com/dotnet/sourcelink - 1099a677155d9d4c1a81a612dffccbcf0d94f8e9 + d688f9125ef02fb8d23a5c86bd0063950de84fc4 - + https://github.com/dotnet/sourcelink - 1099a677155d9d4c1a81a612dffccbcf0d94f8e9 + d688f9125ef02fb8d23a5c86bd0063950de84fc4 - + https://github.com/dotnet/sourcelink - 1099a677155d9d4c1a81a612dffccbcf0d94f8e9 + d688f9125ef02fb8d23a5c86bd0063950de84fc4 - + https://github.com/dotnet/sourcelink - 1099a677155d9d4c1a81a612dffccbcf0d94f8e9 + d688f9125ef02fb8d23a5c86bd0063950de84fc4 diff --git a/eng/Versions.props b/eng/Versions.props index 67031e3e6efb..3c710f595d3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -320,12 +320,12 @@ - 9.0.0-beta.24466.3 - 9.0.0-beta.24466.3 - 9.0.0-beta.24466.3 - 9.0.0-beta.24466.3 - 9.0.0-beta.24466.3 - 9.0.0-beta.24466.3 + 9.0.0-beta.24467.2 + 9.0.0-beta.24467.2 + 9.0.0-beta.24467.2 + 9.0.0-beta.24467.2 + 9.0.0-beta.24467.2 + 9.0.0-beta.24467.2 From 9de0449a0d53f57bcfe0d8e395e4e4ae3be5ee86 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Sep 2024 12:59:45 +0000 Subject: [PATCH 16/90] Update dependencies from https://github.com/dotnet/source-build-externals build 20240917.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.24466.2 -> To Version 9.0.0-alpha.1.24467.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bfcb2d9146e..e90636984d93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -441,9 +441,9 @@ - + https://github.com/dotnet/source-build-externals - e4ddbedd151b969514f2c5b756616707c31e0bfb + 4e60131607fd144eb86fe4487f1a37da940ca990 From 955cef97e2f5d8f89aa0baedaf8b566c5dd81da5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Sep 2024 13:03:20 +0000 Subject: [PATCH 17/90] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240918.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-rtm.24467.8 -> To Version 9.0.0-rtm.24468.2 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-rtm.24467.10 -> To Version 9.0.0-rtm.24467.12 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bfcb2d9146e..2f386f27b566 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -250,26 +250,26 @@ https://github.com/dotnet/runtime 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/windowsdesktop - f37a996ae93c3aaad652c36d43a6245ad090d775 + fb2c93395fba1b7dbbac68b0c6a6d6d7f63962b0 - + https://github.com/dotnet/windowsdesktop - f37a996ae93c3aaad652c36d43a6245ad090d775 + fb2c93395fba1b7dbbac68b0c6a6d6d7f63962b0 - + https://github.com/dotnet/windowsdesktop - f37a996ae93c3aaad652c36d43a6245ad090d775 + fb2c93395fba1b7dbbac68b0c6a6d6d7f63962b0 - + https://github.com/dotnet/windowsdesktop - f37a996ae93c3aaad652c36d43a6245ad090d775 + fb2c93395fba1b7dbbac68b0c6a6d6d7f63962b0 - + https://github.com/dotnet/wpf - d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 + 68be81e2641422df4f250661d6ee244bf2ca0dc4 https://github.com/dotnet/aspnetcore @@ -386,13 +386,13 @@ - + https://github.com/dotnet/winforms - f1676f5dcec5d4a84228406113fcad5fe31025af + 7112753e467569a0f429931a18a54a97943572cf - + https://github.com/dotnet/wpf - d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 + 68be81e2641422df4f250661d6ee244bf2ca0dc4 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 67031e3e6efb..c8d4ff138877 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 9.0.0-rc.2.24466.1 + 9.0.0-rtm.24467.7 @@ -166,10 +166,10 @@ - 9.0.0-rtm.24467.8 - 9.0.0-rtm.24467.8 - 9.0.0-rtm.24467.8 - 9.0.0-rtm.24467.8 + 9.0.0-rtm.24468.2 + 9.0.0-rtm.24468.2 + 9.0.0-rtm.24468.2 + 9.0.0-rtm.24468.2 @@ -268,8 +268,8 @@ - 9.0.0-rtm.24467.10 - 9.0.0-rtm.24467.10 + 9.0.0-rtm.24467.12 + 9.0.0-rtm.24467.12 From ddf3716007baa505d45c40e5fb64cc19d7f62b2b Mon Sep 17 00:00:00 2001 From: David Lee Date: Sun, 1 Sep 2024 07:51:21 +0800 Subject: [PATCH 18/90] Fix null reference exception for full global tools update. --- .../commands/dotnet-tool/update/ToolUpdateCommand.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs index 1499142be4c0..42b9dd56417e 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs @@ -8,6 +8,7 @@ using Microsoft.DotNet.ToolManifest; using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.Tools.Tool.Common; +using Microsoft.Extensions.EnvironmentAbstractions; using CreateShellShimRepository = Microsoft.DotNet.Tools.Tool.Install.CreateShellShimRepository; namespace Microsoft.DotNet.Tools.Tool.Update @@ -43,16 +44,17 @@ public ToolUpdateCommand( localToolsResolverCache, reporter); + _global = result.GetValue(ToolInstallCommandParser.GlobalOption); + _toolPath = result.GetValue(ToolInstallCommandParser.ToolPathOption); + DirectoryPath? location = string.IsNullOrWhiteSpace(_toolPath) ? null : new DirectoryPath(_toolPath); _toolUpdateGlobalOrToolPathCommand = toolUpdateGlobalOrToolPathCommand ?? new ToolUpdateGlobalOrToolPathCommand( result, createToolPackageStoreDownloaderUninstaller, createShellShimRepository, - reporter); - - _global = result.GetValue(ToolInstallCommandParser.GlobalOption); - _toolPath = result.GetValue(ToolInstallCommandParser.ToolPathOption); + reporter, + ToolPackageFactory.CreateToolPackageStoreQuery(location)); } From 52baed10544162238f815277fe1789fbd4303e8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Wed, 18 Sep 2024 09:58:30 -0700 Subject: [PATCH 19/90] Port to 9.0.1xx: Fix processing non-public classes and generic types in AssemblyScheduler.cs (#43377) (#43534) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Alexander Köplinger --- test/HelixTasks/AssemblyScheduler.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/HelixTasks/AssemblyScheduler.cs b/test/HelixTasks/AssemblyScheduler.cs index 65c431bad35d..428d40dff3f4 100644 --- a/test/HelixTasks/AssemblyScheduler.cs +++ b/test/HelixTasks/AssemblyScheduler.cs @@ -267,13 +267,14 @@ private static List GetTypeInfoList(MetadataReader reader) /// private static bool ShouldIncludeType(MetadataReader reader, TypeDefinition type, int testMethodCount) { - // xunit only handles public, non-abstract classes + // xunit only handles public, non-abstract, non-generic classes var isPublic = - TypeAttributes.Public == (type.Attributes & TypeAttributes.Public) || - TypeAttributes.NestedPublic == (type.Attributes & TypeAttributes.NestedPublic); + TypeAttributes.Public == (type.Attributes & TypeAttributes.VisibilityMask) || + TypeAttributes.NestedPublic == (type.Attributes & TypeAttributes.VisibilityMask); if (!isPublic || TypeAttributes.Abstract == (type.Attributes & TypeAttributes.Abstract) || - TypeAttributes.Class != (type.Attributes & TypeAttributes.Class)) + type.GetGenericParameters().Count != 0 || + TypeAttributes.Class != (type.Attributes & TypeAttributes.ClassSemanticsMask)) { return false; } From 83ea1c97c5229888032a8f62e7f92738e30fabbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 16:11:26 -0500 Subject: [PATCH 20/90] [release/9.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#43510) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Michael Simons --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bfcb2d9146e..2864b06ff1e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -447,9 +447,9 @@ - + https://github.com/dotnet/source-build-reference-packages - 46174fbca16412ddabc1e881f6281192924e4ed3 + 6a1e86367923914589bda2244eb2321b97523c33 From d9680b2d361bdc62f3c0c9e6ccb6672c00ab8cb9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Sep 2024 21:12:19 +0000 Subject: [PATCH 21/90] Update dependencies from https://github.com/dotnet/aspnetcore build 20240918.6 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.0-rtm.24466.12 -> To Version 9.0.0-rtm.24468.6 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2864b06ff1e4..4009f16938a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn 5a39d0ad691ee88dcf163808d9ed7a46b168a1c9 - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d https://github.com/nuget/nuget.client @@ -271,54 +271,54 @@ https://github.com/dotnet/wpf d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d @@ -339,21 +339,21 @@ 4b3e4096e8b7aa647340e9f1cc21720741c35f86 - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d https://github.com/dotnet/test-templates @@ -535,9 +535,9 @@ https://github.com/dotnet/runtime 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/aspnetcore - 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 + d962763e8e7d1efb409f9688d6dd7c87aab93b3d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 67031e3e6efb..f5635661a56c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -246,19 +246,19 @@ - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 - 9.0.0-rtm.24466.12 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 + 9.0.0-rtm.24468.6 From 2025cc8ca69a1f3b18da8221d6d5027fa9cd44c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Wed, 18 Sep 2024 15:59:30 -0700 Subject: [PATCH 22/90] Add Aspire service tests (#43515) --- sdk.sln | 8 + .../AspireService/AspireServerService.cs | 6 - .../AspireService/Helpers/CertGenerator.cs | 5 +- .../AspireServerServiceTests.cs | 532 ++++++++++++++++++ ...rosoft.WebTools.AspireService.Tests.csproj | 18 + .../Mocks/Helpers.cs | 181 ++++++ .../Mocks/IAspireServerEventsMock.cs | 46 ++ .../Mocks/IServiceProviderMock.cs | 21 + .../Mocks/MockFactory.cs | 36 ++ .../Mocks/Mocks.cs | 38 ++ .../Properties/AssemblyInfo.cs | 6 + .../Properties/launchSettings.json | 12 + .../RunSessionRequestTests.cs | 46 ++ 13 files changed, 948 insertions(+), 7 deletions(-) create mode 100644 test/Microsoft.WebTools.AspireService.Tests/AspireServerServiceTests.cs create mode 100644 test/Microsoft.WebTools.AspireService.Tests/Microsoft.WebTools.AspireService.Tests.csproj create mode 100644 test/Microsoft.WebTools.AspireService.Tests/Mocks/Helpers.cs create mode 100644 test/Microsoft.WebTools.AspireService.Tests/Mocks/IAspireServerEventsMock.cs create mode 100644 test/Microsoft.WebTools.AspireService.Tests/Mocks/IServiceProviderMock.cs create mode 100644 test/Microsoft.WebTools.AspireService.Tests/Mocks/MockFactory.cs create mode 100644 test/Microsoft.WebTools.AspireService.Tests/Mocks/Mocks.cs create mode 100644 test/Microsoft.WebTools.AspireService.Tests/Properties/AssemblyInfo.cs create mode 100644 test/Microsoft.WebTools.AspireService.Tests/Properties/launchSettings.json create mode 100644 test/Microsoft.WebTools.AspireService.Tests/RunSessionRequestTests.cs diff --git a/sdk.sln b/sdk.sln index c57d23959f8c..1e3a6f52e474 100644 --- a/sdk.sln +++ b/sdk.sln @@ -507,6 +507,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Microsoft.WebTools.AspireSe EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Net.Sdk.Compilers.Toolset", "src\Microsoft.Net.Sdk.Compilers.Toolset\Microsoft.Net.Sdk.Compilers.Toolset.csproj", "{FA579C03-2EB4-4D47-88EE-BFF339E96FAF}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.WebTools.AspireService.Tests", "test\Microsoft.WebTools.AspireService.Tests\Microsoft.WebTools.AspireService.Tests.csproj", "{1F0B4B3C-DC88-4740-B04F-1707102E9930}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -965,6 +967,10 @@ Global {FA579C03-2EB4-4D47-88EE-BFF339E96FAF}.Debug|Any CPU.Build.0 = Debug|Any CPU {FA579C03-2EB4-4D47-88EE-BFF339E96FAF}.Release|Any CPU.ActiveCfg = Release|Any CPU {FA579C03-2EB4-4D47-88EE-BFF339E96FAF}.Release|Any CPU.Build.0 = Release|Any CPU + {1F0B4B3C-DC88-4740-B04F-1707102E9930}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1F0B4B3C-DC88-4740-B04F-1707102E9930}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1F0B4B3C-DC88-4740-B04F-1707102E9930}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1F0B4B3C-DC88-4740-B04F-1707102E9930}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1143,6 +1149,7 @@ Global {19014C60-F87C-4CC7-AC0F-C41B6126EBCE} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} {94C8526E-DCC2-442F-9868-3DD0BA2688BE} = {71A9F549-0EB6-41F9-BC16-4A6C5007FC91} {FA579C03-2EB4-4D47-88EE-BFF339E96FAF} = {22AB674F-ED91-4FBC-BFEE-8A1E82F9F05E} + {1F0B4B3C-DC88-4740-B04F-1707102E9930} = {580D1AE7-AA8F-4912-8B76-105594E00B3B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6} @@ -1150,6 +1157,7 @@ Global GlobalSection(SharedMSBuildProjectFiles) = preSolution src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{03c5a84a-982b-4f38-ac73-ab832c645c4a}*SharedItemsImports = 5 src\Compatibility\ApiCompat\Microsoft.DotNet.ApiCompat.Shared\Microsoft.DotNet.ApiCompat.Shared.projitems*{0a3c9afd-f6e6-4a5d-83fb-93bf66732696}*SharedItemsImports = 5 + src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems*{1f0b4b3c-dc88-4740-b04f-1707102e9930}*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/AspireService/AspireServerService.cs b/src/BuiltInTools/AspireService/AspireServerService.cs index d777ce951154..3b620131f73f 100644 --- a/src/BuiltInTools/AspireService/AspireServerService.cs +++ b/src/BuiltInTools/AspireService/AspireServerService.cs @@ -1,18 +1,12 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Collections.Generic; -using System.Diagnostics; using System.Net; using System.Net.WebSockets; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; -using System.Text; using System.Text.Json; using System.Text.Json.Serialization; -using System.Threading; -using System.Threading.Tasks; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Http; diff --git a/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs b/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs index 189a88c48ed5..a0b0f7766d48 100644 --- a/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs +++ b/src/BuiltInTools/AspireService/Helpers/CertGenerator.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; @@ -35,7 +34,11 @@ public static X509Certificate2 GenerateCert() // The file will be automatically generated by the following call and disposed when the returned cert is disposed. using (cert) { +#if NET9_0_OR_GREATER + return X509CertificateLoader.LoadPkcs12(cert.Export(X509ContentType.Pfx), password: null, X509KeyStorageFlags.UserKeySet); +#else return new X509Certificate2(cert.Export(X509ContentType.Pfx), "", X509KeyStorageFlags.UserKeySet); +#endif } } else diff --git a/test/Microsoft.WebTools.AspireService.Tests/AspireServerServiceTests.cs b/test/Microsoft.WebTools.AspireService.Tests/AspireServerServiceTests.cs new file mode 100644 index 000000000000..69d06b8c0479 --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/AspireServerServiceTests.cs @@ -0,0 +1,532 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#nullable disable + +using System.Net; +using System.Net.Http.Headers; +using System.Net.WebSockets; +using System.Security.Cryptography.X509Certificates; +using System.Text.Json; +using Microsoft.WebTools.AspireServer.Helpers; +using Microsoft.WebTools.AspireServer.Models; + +namespace Microsoft.WebTools.AspireServer.UnitTests; + +public class AspireServerServiceTests +{ + private const string Project1Path = @"c:\test\Projects\project1.csproj"; + private const int ProcessId = 34213; + private const string DcpId = "myid"; + private const string SpecificProfileName = "SpecificProfile"; + private const string VersionedSessionUrl = $"{RunSessionRequest.Url}?{RunSessionRequest.VersionQuery}={RunSessionRequest.OurProtocolVersion}"; + + private static readonly TestRunSessionRequest Project1SessionRequest = new TestRunSessionRequest(Project1Path, debugging: false, launchProfile: null, disableLaunchProfile: false) + { + args = new List { "--project1Arg" }, + env = new List { new EnvVar { Name = "var1", Value = "value1" } } + }; + + [Fact] + public async Task SessionStarted_Test() + { + var mocks = new Mocks(); + + var server = await GetAspireServer(mocks); + + // Start listening + TaskCompletionSource connected = new(); + + TaskCompletionSource notificationTask = new(); + _ = listenForSessionUpdatesAsync(server, connected, (sn) => + { + notificationTask.SetResult((SessionChangeNotification)sn); + }); + + await connected.Task; + + await server.SessionStartedAsync(DcpId,"1", ProcessId, CancellationToken.None); + + var result = await notificationTask.Task; + + Assert.Equal(ProcessId, result.PID); + Assert.Equal("1", result.SessionId); + + await server.DisposeAsync(); + + mocks.Verify(); + } + + [Fact] + public async Task SessionEndedAsync_Test() + { + var mocks = new Mocks(); + + var server = await GetAspireServer(mocks); + + // Start listening + TaskCompletionSource connected = new(); + TaskCompletionSource sessionEndNotificationTask = new(); + _ = listenForSessionUpdatesAsync(server, connected, (sn) => + { + if (sn.NotificationType == NotificationType.SessionTerminated) + { + sessionEndNotificationTask.SetResult((SessionChangeNotification)sn); + } + }); + + await connected.Task; + + await server.SessionEndedAsync(DcpId, "1", ProcessId, 130, CancellationToken.None); + + var result = await sessionEndNotificationTask.Task; + Assert.Equal(ProcessId, result.PID); + Assert.Equal("1", result.SessionId); + Assert.Equal(130, result.ExitCode); + + await server.DisposeAsync(); + + mocks.Verify(); + } + + [Fact] + public async Task LaunchProject_Success() + { + var mocks = new Mocks(); + + mocks.GetOrCreate() + .ImplementStartProjectAsync(DcpId, "2"); + + var server = await GetAspireServer(mocks); + var tokens = await server.GetServerVariablesAsync(); + + using HttpClient client = GetHttpClient(tokens); + + HttpResponseMessage response; + response = await client.PutAsJsonAsync(VersionedSessionUrl, Project1SessionRequest); + + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + Assert.Equal($"{client.BaseAddress}run_session/2", response.Headers.Location.AbsoluteUri); + + await server.DisposeAsync(); + + mocks.Verify(); + } + + [Fact] + public async Task LaunchProject_Success_ThenStopProcessRequest() + { + var mocks = new Mocks(); + + mocks.GetOrCreate() + .ImplementStartProjectAsync(DcpId, "2") + .ImplementStopSessionAsync(DcpId, "2", exists: true) + .ImplementStopSessionAsync(DcpId, "3", exists: false); + + var server = await GetAspireServer(mocks); + var tokens = await server.GetServerVariablesAsync(); + + using HttpClient client = GetHttpClient(tokens); + + var response = await client.PutAsJsonAsync(VersionedSessionUrl, Project1SessionRequest); + Assert.Equal(HttpStatusCode.Created, response.StatusCode); + + // Now send a stop session + response = await client.DeleteAsync(RunSessionRequest.Url + "/2"); + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + // Validate NoContent response if session not found + response = await client.DeleteAsync(RunSessionRequest.Url + "/3"); + Assert.Equal(HttpStatusCode.NoContent, response.StatusCode); + + await server.DisposeAsync(); + + mocks.Verify(); + } + + [Fact] + public async Task LaunchProject_FailedToLaunchProject() + { + var mocks = new Mocks(); + + mocks.GetOrCreate() + .ImplementStartProjectAsync(DcpId, "2", new Exception("Launch project failed")); + + var server = await GetAspireServer(mocks); + + var tokens = await server.GetServerVariablesAsync(); + using HttpClient client = GetHttpClient(tokens); + + var response = await client.PutAsJsonAsync(VersionedSessionUrl, Project1SessionRequest); + + Assert.Equal(HttpStatusCode.InternalServerError, response.StatusCode); + Assert.Equal("application/json; charset=utf-8", response.Content.Headers.ContentType.ToString()); + Assert.Equal("{\"error\":{\"message\":\"Launch project failed\"}}", await response.Content.ReadAsStringAsync()); + + await server.DisposeAsync(); + mocks.Verify(); + } + + [Fact] + public async Task LaunchProject_FailNoBearerToken() + { + var mocks = new Mocks(); + + var server = await GetAspireServer(mocks); + + var tokens = await server.GetServerVariablesAsync(); + using HttpClient client = GetHttpClient(tokens); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", "badToken"); + + var response = await client.PutAsJsonAsync(VersionedSessionUrl, Project1SessionRequest); + + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + + await server.DisposeAsync(); + mocks.Verify(); + } + + [Fact] + public async Task LaunchProject_FailWrongUrl() + { + var mocks = new Mocks(); + + var server = await GetAspireServer(mocks); + + var tokens = await server.GetServerVariablesAsync(); + using HttpClient client = GetHttpClient(tokens); + + var response = await client.PutAsJsonAsync("/run_badurl", Project1SessionRequest); + + Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); + + await server.DisposeAsync(); + + mocks.Verify(); + } + + [Fact] + public async Task LaunchProject_NotAPUTRequest() + { + var mocks = new Mocks(); + + var aspireServer = await GetAspireServer(mocks); + + var tokens = await aspireServer.GetServerVariablesAsync(); + using HttpClient client = GetHttpClient(tokens); + + var response = await client.PostAsJsonAsync(VersionedSessionUrl, Project1SessionRequest); + + Assert.Equal(HttpStatusCode.MethodNotAllowed, response.StatusCode); + + await aspireServer.DisposeAsync(); + + mocks.Verify(); + } + + [Fact] + public async Task StopSession_FailNoBearerToken() + { + var mocks = new Mocks(); + + var server = await GetAspireServer(mocks); + + var tokens = await server.GetServerVariablesAsync(); + using HttpClient client = GetHttpClient(tokens); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", "badToken"); + + var response = await client.DeleteAsync(RunSessionRequest.Url + "/2"); + + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + + await server.DisposeAsync(); + mocks.Verify(); + } + + [Fact] + public async Task Info_Success() + { + var mocks = new Mocks(); + + var server = await GetAspireServer(mocks); + + var tokens = await server.GetServerVariablesAsync(); + using HttpClient client = GetHttpClient(tokens); + + var response = await client.GetAsync(InfoResponse.Url); + + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + await server.DisposeAsync(); + mocks.Verify(); + } + + [Fact] + public async Task Info_FailNoBearerToken() + { + var mocks = new Mocks(); + + var server = await GetAspireServer(mocks); + + var tokens = await server.GetServerVariablesAsync(); + using HttpClient client = GetHttpClient(tokens); + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", "badToken"); + + var response = await client.GetAsync(InfoResponse.Url); + + Assert.Equal(HttpStatusCode.Unauthorized, response.StatusCode); + + await server.DisposeAsync(); + mocks.Verify(); + } + + [Fact] + public async Task SendLogMessageAsync_Test() + { + var mocks = new Mocks(); + + var aspireServer = await GetAspireServer(mocks); + + + // Start listening + TaskCompletionSource connected = new(); + TaskCompletionSource notificationTask = new(); + _ = listenForSessionUpdatesAsync(aspireServer, connected, (sn) => + { + notificationTask.SetResult((SessionLogsNotification)sn); + }); + + await connected.Task; + + await aspireServer.SendLogMessageAsync(DcpId, "1", isStdErr: false, "My Message", CancellationToken.None); + + var result = await notificationTask.Task; + + Assert.Equal("My Message", result.LogMessage); + Assert.False(result.IsStdErr); + await aspireServer.DisposeAsync(); + + mocks.Verify(); + } + + [Fact] + public async Task GetEnvironmentForOrchestrator_Tests() + { + var mocks = new Mocks(); + + var server = await GetAspireServer(mocks, waitForListening: false); + + // First time should create a key + var envVars = await server.GetServerConnectionEnvironmentAsync(CancellationToken.None); + + Assert.Equal(3, envVars.Count); + var token = envVars[1]; + Assert.NotNull(token.Value); + + // Should return the same + envVars = await server.GetServerConnectionEnvironmentAsync(CancellationToken.None); + Assert.Equal(token, envVars[1]); + + mocks.Verify(); + } + + private async Task listenForSessionUpdatesAsync(AspireServerService aspireServer, TaskCompletionSource connected, Action callback) + { + var tokens = await aspireServer.GetServerVariablesAsync(); + using var httpClient = GetHttpClient(tokens); + + using var ws = new ClientWebSocket(); + ws.Options.SetRequestHeader("Authorization", $"Bearer {tokens.bearerToken}"); + try + { + await ws.ConnectAsync(new Uri($"wss://{tokens.serverAddress}{RunSessionRequest.Url}{SessionNotificationBase.Url}"), httpClient, CancellationToken.None); + } + catch (Exception ex) + { + Assert.Fail("Could not connect to session update endpoint: " + ex.ToString()); + connected.SetResult(false); + return; + } + + connected.SetResult(true); + + while (ws.State == WebSocketState.Open) + { + try + { + var (message, messageType) = await GetSocketMsgAsync(ws); + + if (messageType == WebSocketMessageType.Close) + { + await ws.CloseAsync(WebSocketCloseStatus.NormalClosure, null, CancellationToken.None); + return; + } + else + { + var notificationBase = JsonSerializer.Deserialize(message, AspireServerService.JsonSerializerOptions); + if (notificationBase is null) + { + Console.WriteLine("Unexpected null SessionNotificationBase message"); + } + else if (notificationBase.NotificationType == NotificationType.ProcessRestarted || notificationBase.NotificationType == NotificationType.SessionTerminated) + { + var scn = JsonSerializer.Deserialize(message, AspireServerService.JsonSerializerOptions); + if (scn is null) + { + Assert.Fail("Unexpected null SessionChangeNotification message"); + } + else + { + callback.Invoke(scn); + } + } + else if (notificationBase.NotificationType == NotificationType.ServiceLogs) + { + var sessionLogs = JsonSerializer.Deserialize(message, AspireServerService.JsonSerializerOptions); + if (sessionLogs is null) + { + Assert.Fail("Unexpected null SessionLogsNotification message"); + } + else + { + callback.Invoke(sessionLogs); + } + } + } + } + catch + { + // This is expected if the connection is closed + return; + } + } + } + + private static HttpClient GetHttpClient((string serverAddress, string bearerToken, string certToken) tokens) + { + HttpClient client; + var serverCert = X509CertificateLoader.LoadCertificate(Convert.FromBase64String(tokens.certToken)); + var clientHandler = new HttpClientHandler() + { + ClientCertificateOptions = ClientCertificateOption.Manual, + SslProtocols = System.Security.Authentication.SslProtocols.None, + ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => + { + return cert?.Thumbprint == serverCert.Thumbprint; + } + }; + + client = new HttpClient(clientHandler); + client.BaseAddress = new Uri($"https://{tokens.serverAddress}"); + + client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", tokens.bearerToken); + client.DefaultRequestHeaders.Add(HttpContextExtensions.DCPInstanceIDHeader, DcpId); + + return client; + } + + private async Task<(string, WebSocketMessageType)> GetSocketMsgAsync(ClientWebSocket client) + { + var rcvBuffer = new ArraySegment(new byte[2048]); + WebSocketReceiveResult rcvResult = await client.ReceiveAsync(rcvBuffer, CancellationToken.None); + if (rcvResult.MessageType == WebSocketMessageType.Text) + { + byte[] msgBytes = rcvBuffer.Skip(rcvBuffer.Offset).Take(rcvResult.Count).ToArray(); + return (Encoding.UTF8.GetString(msgBytes), rcvResult.MessageType); + } + + return (null, rcvResult.MessageType); + } + + private async Task GetAspireServer(Mocks mocks, bool waitForListening = true) + { + var ase = mocks.GetOrCreate(); + + var aspireServer = new AspireServerService(ase.Object, displayName: "Test server", Console.WriteLine); + + if (waitForListening) + { + await aspireServer.WaitForListeningAsync(); + } + + return aspireServer; + } + +#pragma warning disable IDE1006 // Naming Styles + internal class TestRunSessionRequestP4 + { + public string project_path { get; set; } = string.Empty; + public bool debug { get; set; } + public List env { get; set; } = new List(); + public List args { get; set; } = new List(); + public string launch_profile { get; set; } + public bool disable_launch_profile { get; set; } + } + + internal class TestRunSessionRequest + { + public TestRunSessionRequest(string projectPath, bool debugging, string launchProfile, bool disableLaunchProfile) + { + launch_configurations = new TestLaunchConfiguration[] + { + new() { + project_path = projectPath, + type = RunSessionRequest.ProjectLaunchConfigurationType, + mode= debugging? RunSessionRequest.DebugLaunchMode : RunSessionRequest.NoDebugLaunchMode, + launch_profile = launchProfile, + disable_launch_profile = disableLaunchProfile + } + }; + } + public TestLaunchConfiguration[] launch_configurations { get; set; } + public List env { get; set; } = new List(); + public List args { get; set; } = new List(); + + public TestRunSessionRequestP4 ToTestRunSessionRequestP4() + { + var launchConfig = launch_configurations[0]; + return new TestRunSessionRequestP4() + { + project_path = launchConfig.project_path, + debug = string.Equals(launchConfig.mode, RunSessionRequest.DebugLaunchMode, StringComparison.OrdinalIgnoreCase), + args = args, + env = env, + launch_profile = launchConfig.launch_profile, + disable_launch_profile = launchConfig.disable_launch_profile + }; + } + } + + internal class TestLaunchConfiguration + { + public string type { get; set; } = string.Empty; + public string project_path { get; set; } = string.Empty; + public string launch_profile { get; set; } + public bool disable_launch_profile { get; set; } + public string mode { get; set; } = string.Empty; + } + + internal class TestStopSessionRequest + { + public string session_id { get; set; } = string.Empty; + } +#pragma warning restore IDE1006 // Naming Styles +} + +internal static class AspireServerServiceExtensions +{ + public static async Task WaitForListeningAsync(this AspireServerService aspireServer) + { + string serverAddress = (await aspireServer.GetServerVariablesAsync()).serverAddress; + + // We need to wait on the port being available + await Helpers.CanConnectToPortAsync(new Uri($"http://{serverAddress}"), 5000, CancellationToken.None); + + } + + public static async Task<(string serverAddress, string bearerToken, string certToken)> GetServerVariablesAsync(this AspireServerService aspireServer) + { + var enVars = await aspireServer.GetServerConnectionEnvironmentAsync(CancellationToken.None); + return (enVars[0].Value, enVars[1].Value, enVars[2].Value); + } +} diff --git a/test/Microsoft.WebTools.AspireService.Tests/Microsoft.WebTools.AspireService.Tests.csproj b/test/Microsoft.WebTools.AspireService.Tests/Microsoft.WebTools.AspireService.Tests.csproj new file mode 100644 index 000000000000..927652b1cd10 --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/Microsoft.WebTools.AspireService.Tests.csproj @@ -0,0 +1,18 @@ + + + + $(SdkTargetFramework) + Microsoft.WebTools.AspireServer.UnitTests + enable + Exe + false + + + + + + + + + + diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/Helpers.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/Helpers.cs new file mode 100644 index 000000000000..19f6d17f15c3 --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/Helpers.cs @@ -0,0 +1,181 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Collections; +using System.Net; +using System.Net.Sockets; + +namespace Microsoft.WebTools.AspireServer.UnitTests; + +public static class Helpers +{ + public static async Task CanConnectToPortAsync(Uri url, uint msToWait, CancellationToken cancelToken) + { + bool connected = false; + Socket? ipv4Socket = null; + Socket? ipv6Socket = null; + + // Create a "client" socket on any available port + try + { + TimeoutSpan timeout = new(msToWait); + if (Socket.OSSupportsIPv4) + { + try + { + ipv4Socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp); + ipv4Socket.Bind(new IPEndPoint(IPAddress.Any, 0)); + } + catch (SocketException) + { + if (ipv4Socket != null) + { + ipv4Socket.Close(); + ipv4Socket = null; + } + } + } + if (Socket.OSSupportsIPv6) + { + try + { + ipv6Socket = new Socket(AddressFamily.InterNetworkV6, SocketType.Stream, ProtocolType.Tcp); + ipv6Socket.Bind(new IPEndPoint(IPAddress.IPv6Any, 0)); + } + catch (SocketException) + { + if (ipv6Socket != null) + { + ipv6Socket.Close(); + ipv6Socket = null; + } + } + } + + // No sockets means we aren't connected + if (ipv6Socket == null && ipv4Socket == null) + { + return false; + } + + // If we have an IP address we use that otherwise assume loopback + IPEndPoint ipv4ServerEndPoint; + IPEndPoint ipv6ServerEndPoint; + if (IPAddress.TryParse(url.Host, out var ipAddress)) + { + ipv4ServerEndPoint = new IPEndPoint(ipAddress.AddressFamily == AddressFamily.InterNetwork ? ipAddress : IPAddress.Loopback, url.Port); + ipv6ServerEndPoint = new IPEndPoint(ipAddress.AddressFamily == AddressFamily.InterNetworkV6 ? ipAddress : IPAddress.IPv6Loopback, url.Port); + } + else + { + ipv4ServerEndPoint = new IPEndPoint(IPAddress.Loopback, url.Port); + ipv6ServerEndPoint = new IPEndPoint(IPAddress.IPv6Loopback, url.Port); + } + + // If a process is passed in, we bail if it has exited + while (!connected && !timeout.Expired) + { + cancelToken.ThrowIfCancellationRequested(); + if (ipv4Socket != null) + { + try + { + // Now use IOControl to set the calls non blocking + ipv4Socket.Blocking = false; + // Since we are non-blocking, the Connect should throw an error indicating + // it needs time to connect + ipv4Socket.Connect(ipv4ServerEndPoint); + } + catch (SocketException) + { + // Now ping retry and block for a millisecond timeout + ArrayList connectList = new ArrayList() {ipv4Socket}; + Socket.Select(null, connectList, null, 1000 /*microSecond -- in here, 1 milli-second*/); + if (connectList.Count == 1) + { + connected = true; + break; + } + } + finally + { + // TODO: why do we set the sockets back to blocking? + ipv4Socket.Blocking = true; + } + } + + // Now try IPV6 + if (ipv6Socket != null) + { + // Couldn't connect with IPV4, so try IPV6 + try + { + ipv6Socket.Blocking = false; + ipv6Socket.Connect(ipv6ServerEndPoint); + } + catch (SocketException) + { + // Ping retry + ArrayList connectList = new ArrayList() {ipv6Socket}; + Socket.Select(null, connectList, null, 1000 /*microSecond -- in here, 1 milli-second*/); + if (connectList.Count == 1) + { + connected = true; + break; + } + } + finally + { + // TODO: why do we set the sockets back to blocking? + ipv6Socket.Blocking = true; + } + } + + // Wait a bit and try again + await Task.Delay(20, cancelToken); + } + + } + finally + { + if (ipv4Socket != null) + { + ipv4Socket.Close(); + } + + if (ipv6Socket != null) + { + ipv6Socket.Close(); + } + } + + return connected; + } +} + +internal class TimeoutSpan +{ + private readonly long _duration; + private long _startingTickCount; + + public TimeoutSpan(long durationInMilliseconds) + { + // There are 10000 ticks in a millisecond so need to adjust accordingly + _duration = durationInMilliseconds * 10000; + Reset(); + } + + public bool Expired + { + get + { + return _duration != 0 && (DateTime.UtcNow.Ticks - _startingTickCount) > _duration; + } + } + + public void Reset() + { + // DateTime.UtcNow is way more efficient than DateTime.Now since it doesn't have to deal with locale, DST, etc + _startingTickCount = DateTime.UtcNow.Ticks; + } +} diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/IAspireServerEventsMock.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/IAspireServerEventsMock.cs new file mode 100644 index 000000000000..3c805871fdf4 --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/IAspireServerEventsMock.cs @@ -0,0 +1,46 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. + +using Microsoft.WebTools.AspireServer.Contracts; +using Moq; + +namespace Microsoft.WebTools.AspireServer.UnitTests; + +internal class IAspireServerEventsMock : MockFactory +{ + public IAspireServerEventsMock(Mocks mocks, MockBehavior? mockBehavior = null) + : base(mocks, mockBehavior) + { + } + + public IAspireServerEventsMock ImplementStartProjectAsync(string dcpId, string sessionId, Exception? ex = null) + { + MockObject.Setup(x => x.StartProjectAsync(dcpId, It.IsAny(), It.IsAny())) + .Returns(() => + { + if (ex is not null) + { + throw ex; + } + + return new ValueTask(sessionId); + }) + .Verifiable(); + return this; + } + + public IAspireServerEventsMock ImplementStopSessionAsync(string dcpId, string sessionId, bool exists, Exception? ex = null) + { + MockObject.Setup(x => x.StopSessionAsync(dcpId, sessionId, It.IsAny())) + .Returns(() => + { + if (ex is not null) + { + throw ex; + } + + return new ValueTask(exists); + }) + .Verifiable(); + return this; + } +} diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/IServiceProviderMock.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/IServiceProviderMock.cs new file mode 100644 index 000000000000..c975028c392f --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/IServiceProviderMock.cs @@ -0,0 +1,21 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Moq; + +namespace Microsoft.WebTools.AspireServer.UnitTests; + +internal class IServiceProviderMock : MockFactory +{ + public IServiceProviderMock(Mocks mocks, MockBehavior? mockBehavior = null) + : base(mocks, mockBehavior) + { + } + + public IServiceProviderMock ImplementService(Type type, object service) + { + MockObject.Setup(x => x.GetService(type)).Returns(service); + + return this; + } +} diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/MockFactory.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/MockFactory.cs new file mode 100644 index 000000000000..ef9f4467013c --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/MockFactory.cs @@ -0,0 +1,36 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Moq; + +namespace Microsoft.WebTools.AspireServer.UnitTests; + +public interface IMockFactory +{ + void Verify(); + object GetObject(); +} + +public class MockFactory : IMockFactory where T : class +{ + public MockFactory(Mocks mocks, MockBehavior? mockBehavior) + { + AllMocks = mocks; + MockObject = new Mock(mockBehavior ?? MockBehavior.Strict); + } + + protected Mocks AllMocks { get; } + public Mock MockObject { get; } + + public T Object => MockObject.Object; + + public virtual void Verify() + { + MockObject.VerifyAll(); + } + + public object GetObject() + { + return Object; + } +} diff --git a/test/Microsoft.WebTools.AspireService.Tests/Mocks/Mocks.cs b/test/Microsoft.WebTools.AspireService.Tests/Mocks/Mocks.cs new file mode 100644 index 000000000000..0b546ad5b20e --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/Mocks/Mocks.cs @@ -0,0 +1,38 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Diagnostics; +using Moq; + +namespace Microsoft.WebTools.AspireServer.UnitTests; + +public class Mocks +{ + private readonly Dictionary _mockFactories = new(); + + public void Add(IMockFactory factory) + { + _mockFactories.Add(factory.GetType(), factory); + } + + public T GetOrCreate(MockBehavior? mockBehavior = null) where T : IMockFactory + { + if (_mockFactories.TryGetValue(typeof(T), out var factory)) + { + return (T)factory; + } + + var newMock = (IMockFactory?)Activator.CreateInstance(typeof(T), this, mockBehavior); + Debug.Assert(newMock != null); + Add(newMock); + return (T)newMock; + } + + public virtual void Verify() + { + foreach (var factory in _mockFactories) + { + factory.Value.Verify(); + } + } +} diff --git a/test/Microsoft.WebTools.AspireService.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.WebTools.AspireService.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 000000000000..8b7c37cd90c4 --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,6 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] diff --git a/test/Microsoft.WebTools.AspireService.Tests/Properties/launchSettings.json b/test/Microsoft.WebTools.AspireService.Tests/Properties/launchSettings.json new file mode 100644 index 000000000000..2d63805b76a3 --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "Microsoft.WebTools.AspireServer.Test": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:61653;http://localhost:61654" + } + } +} \ No newline at end of file diff --git a/test/Microsoft.WebTools.AspireService.Tests/RunSessionRequestTests.cs b/test/Microsoft.WebTools.AspireService.Tests/RunSessionRequestTests.cs new file mode 100644 index 000000000000..4012d02bf10c --- /dev/null +++ b/test/Microsoft.WebTools.AspireService.Tests/RunSessionRequestTests.cs @@ -0,0 +1,46 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#nullable disable + +using Microsoft.WebTools.AspireServer.Models; + +namespace Microsoft.WebTools.AspireServer.UnitTests; + +public class RunSessionRequestTests +{ + [Fact] + public void RunSessionRequest_ToProjectLaunchRequest() + { + var runSessionReq = new RunSessionRequest() + { + Arguments = new string[] { "--someArg" }, + Environment = new EnvVar[] + { + new EnvVar { Name = "var1", Value = "value1"}, + new EnvVar { Name = "var2", Value = "value2"}, + }, + LaunchConfigurations = new LaunchConfiguration[] + { + new() { + ProjectPath = @"c:\test\Projects\project1.csproj", + LaunchType = RunSessionRequest.ProjectLaunchConfigurationType, + LaunchMode= RunSessionRequest.DebugLaunchMode, + LaunchProfile = "specificProfileName", + DisableLaunchProfile = true + } + } + }; + + var projectReq = runSessionReq.ToProjectLaunchInformation(); + + Assert.Equal(runSessionReq.Arguments[0], projectReq.Arguments.First()); + Assert.Equal(runSessionReq.Environment.Length, projectReq.Environment.Count()); + Assert.Equal(runSessionReq.Environment[0].Name, projectReq.Environment.First().Key); + Assert.Equal(runSessionReq.Environment[0].Value, projectReq.Environment.First().Value); + Assert.Equal(runSessionReq.LaunchConfigurations[0].ProjectPath, projectReq.ProjectPath); + Assert.True(projectReq.Debug); + Assert.Equal(runSessionReq.LaunchConfigurations[0].LaunchProfile, projectReq.LaunchProfile); + Assert.Equal(runSessionReq.LaunchConfigurations[0].DisableLaunchProfile, projectReq.DisableLaunchProfile); + } +} From b48e3b9b5c59df3282e7853eedb1332483bb66c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Sep 2024 00:38:03 +0000 Subject: [PATCH 23/90] Update dependencies from https://github.com/dotnet/roslyn build 20240918.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.12.0-3.24467.5 -> To Version 4.12.0-3.24468.2 --- 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 5c30b43f7789..051ae950fea4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 15c05bd87541c8ac023aa2c3a0d86a5da7f1b918 - + https://github.com/dotnet/roslyn - a182892bf997a457cfcdbece5352e1a139eb2a12 + 9fe9c65088bdd2151de6782c1da9145d48d7686d - + https://github.com/dotnet/roslyn - a182892bf997a457cfcdbece5352e1a139eb2a12 + 9fe9c65088bdd2151de6782c1da9145d48d7686d - + https://github.com/dotnet/roslyn - a182892bf997a457cfcdbece5352e1a139eb2a12 + 9fe9c65088bdd2151de6782c1da9145d48d7686d - + https://github.com/dotnet/roslyn - a182892bf997a457cfcdbece5352e1a139eb2a12 + 9fe9c65088bdd2151de6782c1da9145d48d7686d - + https://github.com/dotnet/roslyn - a182892bf997a457cfcdbece5352e1a139eb2a12 + 9fe9c65088bdd2151de6782c1da9145d48d7686d - + https://github.com/dotnet/roslyn - a182892bf997a457cfcdbece5352e1a139eb2a12 + 9fe9c65088bdd2151de6782c1da9145d48d7686d - + https://github.com/dotnet/roslyn - a182892bf997a457cfcdbece5352e1a139eb2a12 + 9fe9c65088bdd2151de6782c1da9145d48d7686d - + https://github.com/dotnet/roslyn - a182892bf997a457cfcdbece5352e1a139eb2a12 + 9fe9c65088bdd2151de6782c1da9145d48d7686d - + https://github.com/dotnet/roslyn - a182892bf997a457cfcdbece5352e1a139eb2a12 + 9fe9c65088bdd2151de6782c1da9145d48d7686d https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 38f035d72f57..1da88e447655 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,14 +235,14 @@ - 4.12.0-3.24467.5 - 4.12.0-3.24467.5 - 4.12.0-3.24467.5 - 4.12.0-3.24467.5 - 4.12.0-3.24467.5 - 4.12.0-3.24467.5 - 4.12.0-3.24467.5 - 4.12.0-3.24467.5 + 4.12.0-3.24468.2 + 4.12.0-3.24468.2 + 4.12.0-3.24468.2 + 4.12.0-3.24468.2 + 4.12.0-3.24468.2 + 4.12.0-3.24468.2 + 4.12.0-3.24468.2 + 4.12.0-3.24468.2 From 1ed9b030673eebf4ee54a22e7e72f464eed527c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Sep 2024 00:44:59 +0000 Subject: [PATCH 24/90] Update dependencies from https://github.com/dotnet/razor build 20240918.2 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.24467.4 -> To Version 9.0.0-preview.24468.2 --- 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 7a4bc51bc42d..52e4566383af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 - + https://github.com/dotnet/razor - 4b3e4096e8b7aa647340e9f1cc21720741c35f86 + 020f8e75429365596663f29153fc172ace67540b - + https://github.com/dotnet/razor - 4b3e4096e8b7aa647340e9f1cc21720741c35f86 + 020f8e75429365596663f29153fc172ace67540b - + https://github.com/dotnet/razor - 4b3e4096e8b7aa647340e9f1cc21720741c35f86 + 020f8e75429365596663f29153fc172ace67540b - + https://github.com/dotnet/razor - 4b3e4096e8b7aa647340e9f1cc21720741c35f86 + 020f8e75429365596663f29153fc172ace67540b diff --git a/eng/Versions.props b/eng/Versions.props index 67031e3e6efb..9998d2b890e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -262,9 +262,9 @@ - 9.0.0-preview.24467.4 - 9.0.0-preview.24467.4 - 9.0.0-preview.24467.4 + 9.0.0-preview.24468.2 + 9.0.0-preview.24468.2 + 9.0.0-preview.24468.2 From b6599bed4f2ffaa9546345de9a285c2a6cc3093d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Sep 2024 03:08:28 +0000 Subject: [PATCH 25/90] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240918.9 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-rtm.24468.2 -> To Version 9.0.0-rtm.24468.9 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-rtm.24467.12 -> To Version 9.0.0-rtm.24468.5 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 12 ++++++------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f386f27b566..712f08beb25d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -250,26 +250,26 @@ https://github.com/dotnet/runtime 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/windowsdesktop - fb2c93395fba1b7dbbac68b0c6a6d6d7f63962b0 + 0c58459e895f6cebce7605ac5ecaad6ee554fac9 - + https://github.com/dotnet/windowsdesktop - fb2c93395fba1b7dbbac68b0c6a6d6d7f63962b0 + 0c58459e895f6cebce7605ac5ecaad6ee554fac9 - + https://github.com/dotnet/windowsdesktop - fb2c93395fba1b7dbbac68b0c6a6d6d7f63962b0 + 0c58459e895f6cebce7605ac5ecaad6ee554fac9 - + https://github.com/dotnet/windowsdesktop - fb2c93395fba1b7dbbac68b0c6a6d6d7f63962b0 + 0c58459e895f6cebce7605ac5ecaad6ee554fac9 - + https://github.com/dotnet/wpf - 68be81e2641422df4f250661d6ee244bf2ca0dc4 + 192c01a0784ef654572533a741308aed4e374c54 https://github.com/dotnet/aspnetcore @@ -390,9 +390,9 @@ https://github.com/dotnet/winforms 7112753e467569a0f429931a18a54a97943572cf - + https://github.com/dotnet/wpf - 68be81e2641422df4f250661d6ee244bf2ca0dc4 + 192c01a0784ef654572533a741308aed4e374c54 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c8d4ff138877..6e3e65d55e3d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ - 9.0.0-rtm.24468.2 - 9.0.0-rtm.24468.2 - 9.0.0-rtm.24468.2 - 9.0.0-rtm.24468.2 + 9.0.0-rtm.24468.9 + 9.0.0-rtm.24468.9 + 9.0.0-rtm.24468.9 + 9.0.0-rtm.24468.9 @@ -268,8 +268,8 @@ - 9.0.0-rtm.24467.12 - 9.0.0-rtm.24467.12 + 9.0.0-rtm.24468.5 + 9.0.0-rtm.24468.5 From d16a2c76c2c3d64120ad579733d706cbd6d01df9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Sep 2024 08:37:37 +0000 Subject: [PATCH 26/90] Update dependencies from https://github.com/dotnet/razor build 20240919.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.24468.2 -> To Version 9.0.0-preview.24469.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 52e4566383af..b14e104e5519 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ 0d72ad5e4c5b1394e9708f47ed81e9748e4fd819 - + https://github.com/dotnet/razor - 020f8e75429365596663f29153fc172ace67540b + c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e - + https://github.com/dotnet/razor - 020f8e75429365596663f29153fc172ace67540b + c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e - + https://github.com/dotnet/razor - 020f8e75429365596663f29153fc172ace67540b + c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e - + https://github.com/dotnet/razor - 020f8e75429365596663f29153fc172ace67540b + c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e diff --git a/eng/Versions.props b/eng/Versions.props index 9998d2b890e9..58ce2704614c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -262,9 +262,9 @@ - 9.0.0-preview.24468.2 - 9.0.0-preview.24468.2 - 9.0.0-preview.24468.2 + 9.0.0-preview.24469.1 + 9.0.0-preview.24469.1 + 9.0.0-preview.24469.1 From d4e3ffe217409236b0dfe50af3645af5d96073aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Sep 2024 12:14:20 +0000 Subject: [PATCH 27/90] Update dependencies from https://github.com/dotnet/roslyn build 20240919.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.12.0-3.24468.2 -> To Version 4.12.0-3.24469.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 051ae950fea4..46c784ecd0df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 15c05bd87541c8ac023aa2c3a0d86a5da7f1b918 - + https://github.com/dotnet/roslyn - 9fe9c65088bdd2151de6782c1da9145d48d7686d + f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/roslyn - 9fe9c65088bdd2151de6782c1da9145d48d7686d + f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/roslyn - 9fe9c65088bdd2151de6782c1da9145d48d7686d + f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/roslyn - 9fe9c65088bdd2151de6782c1da9145d48d7686d + f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/roslyn - 9fe9c65088bdd2151de6782c1da9145d48d7686d + f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/roslyn - 9fe9c65088bdd2151de6782c1da9145d48d7686d + f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/roslyn - 9fe9c65088bdd2151de6782c1da9145d48d7686d + f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/roslyn - 9fe9c65088bdd2151de6782c1da9145d48d7686d + f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/roslyn - 9fe9c65088bdd2151de6782c1da9145d48d7686d + f869d0f8a872875a46ba9fe23c67b04eb5519c2e https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 1da88e447655..da8fe34c2fec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,14 +235,14 @@ - 4.12.0-3.24468.2 - 4.12.0-3.24468.2 - 4.12.0-3.24468.2 - 4.12.0-3.24468.2 - 4.12.0-3.24468.2 - 4.12.0-3.24468.2 - 4.12.0-3.24468.2 - 4.12.0-3.24468.2 + 4.12.0-3.24469.1 + 4.12.0-3.24469.1 + 4.12.0-3.24469.1 + 4.12.0-3.24469.1 + 4.12.0-3.24469.1 + 4.12.0-3.24469.1 + 4.12.0-3.24469.1 + 4.12.0-3.24469.1 From 5d575004e45b2808cc5aa28c304fce881b511eb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Sep 2024 12:15:43 +0000 Subject: [PATCH 28/90] Update dependencies from https://github.com/dotnet/msbuild build 20240919.1 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.0-preview-24467-04 -> To Version 17.12.0-preview-24469-01 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba19617b9e33..0f099802c564 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ c3d83d0ea894e5ee537bfc591fd48e06af8d9166 - + https://github.com/dotnet/msbuild - 5bab860b2477f03050f170473a2563c5217d546f + d9969c69af69f62d628a263b82e3aa637776a4c3 - + https://github.com/dotnet/msbuild - 5bab860b2477f03050f170473a2563c5217d546f + d9969c69af69f62d628a263b82e3aa637776a4c3 - + https://github.com/dotnet/msbuild - 5bab860b2477f03050f170473a2563c5217d546f + d9969c69af69f62d628a263b82e3aa637776a4c3 diff --git a/eng/Versions.props b/eng/Versions.props index 93e2b97e7e51..60d2a0224f90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -212,8 +212,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.12.0-preview-24467-04 - 17.12.0-preview-24467-04 + 17.12.0-preview-24469-01 + 17.12.0-preview-24469-01 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From f55a87f0bf355ea6a66ae3bd5c06497cd84b7b9a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Sep 2024 12:16:20 +0000 Subject: [PATCH 29/90] Update dependencies from https://github.com/dotnet/sourcelink build 20240918.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 9.0.0-beta.24467.2 -> To Version 9.0.0-beta.24468.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b67d7a8ee2c8..ec1dfdcdfdff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - d688f9125ef02fb8d23a5c86bd0063950de84fc4 + 662c0bb1272e078747775d549bbf45e27faa9030 - + https://github.com/dotnet/sourcelink - d688f9125ef02fb8d23a5c86bd0063950de84fc4 + 662c0bb1272e078747775d549bbf45e27faa9030 - + https://github.com/dotnet/sourcelink - d688f9125ef02fb8d23a5c86bd0063950de84fc4 + 662c0bb1272e078747775d549bbf45e27faa9030 - + https://github.com/dotnet/sourcelink - d688f9125ef02fb8d23a5c86bd0063950de84fc4 + 662c0bb1272e078747775d549bbf45e27faa9030 - + https://github.com/dotnet/sourcelink - d688f9125ef02fb8d23a5c86bd0063950de84fc4 + 662c0bb1272e078747775d549bbf45e27faa9030 - + https://github.com/dotnet/sourcelink - d688f9125ef02fb8d23a5c86bd0063950de84fc4 + 662c0bb1272e078747775d549bbf45e27faa9030 - + https://github.com/dotnet/sourcelink - d688f9125ef02fb8d23a5c86bd0063950de84fc4 + 662c0bb1272e078747775d549bbf45e27faa9030 diff --git a/eng/Versions.props b/eng/Versions.props index 3c710f595d3e..c8dbe4d07b3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -320,12 +320,12 @@ - 9.0.0-beta.24467.2 - 9.0.0-beta.24467.2 - 9.0.0-beta.24467.2 - 9.0.0-beta.24467.2 - 9.0.0-beta.24467.2 - 9.0.0-beta.24467.2 + 9.0.0-beta.24468.2 + 9.0.0-beta.24468.2 + 9.0.0-beta.24468.2 + 9.0.0-beta.24468.2 + 9.0.0-beta.24468.2 + 9.0.0-beta.24468.2 From cf9d94aabb2593d41ac6fca90908842619062288 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 19 Sep 2024 13:02:03 +0000 Subject: [PATCH 30/90] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240919.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-rtm.24468.9 -> To Version 9.0.0-rtm.24469.2 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-rtm.24468.5 -> To Version 9.0.0-rtm.24468.13 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 712f08beb25d..865a096fe34e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -250,26 +250,26 @@ https://github.com/dotnet/runtime 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/windowsdesktop - 0c58459e895f6cebce7605ac5ecaad6ee554fac9 + 5e06552d5318ab7b40f822b961fb31f842ca1a25 - + https://github.com/dotnet/windowsdesktop - 0c58459e895f6cebce7605ac5ecaad6ee554fac9 + 5e06552d5318ab7b40f822b961fb31f842ca1a25 - + https://github.com/dotnet/windowsdesktop - 0c58459e895f6cebce7605ac5ecaad6ee554fac9 + 5e06552d5318ab7b40f822b961fb31f842ca1a25 - + https://github.com/dotnet/windowsdesktop - 0c58459e895f6cebce7605ac5ecaad6ee554fac9 + 5e06552d5318ab7b40f822b961fb31f842ca1a25 - + https://github.com/dotnet/wpf - 192c01a0784ef654572533a741308aed4e374c54 + a33e61012e2a56f01c67a981968d566d5ef459b1 https://github.com/dotnet/aspnetcore @@ -386,13 +386,13 @@ - + https://github.com/dotnet/winforms - 7112753e467569a0f429931a18a54a97943572cf + 06f1d0a449929d172946782fd187e3b4591a855b - + https://github.com/dotnet/wpf - 192c01a0784ef654572533a741308aed4e374c54 + a33e61012e2a56f01c67a981968d566d5ef459b1 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 6e3e65d55e3d..79db4e97bd48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 9.0.0-rtm.24467.7 + 9.0.0-rtm.24468.6 @@ -166,10 +166,10 @@ - 9.0.0-rtm.24468.9 - 9.0.0-rtm.24468.9 - 9.0.0-rtm.24468.9 - 9.0.0-rtm.24468.9 + 9.0.0-rtm.24469.2 + 9.0.0-rtm.24469.2 + 9.0.0-rtm.24469.2 + 9.0.0-rtm.24469.2 @@ -268,8 +268,8 @@ - 9.0.0-rtm.24468.5 - 9.0.0-rtm.24468.5 + 9.0.0-rtm.24468.13 + 9.0.0-rtm.24468.13 From 9674d0646e9b6c9fa4d23beee14f2de877131116 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Thu, 19 Sep 2024 12:01:23 -0700 Subject: [PATCH 31/90] Hot Reload: Handle file deletions correctly (#43368) --- .../DotNetDeltaApplier/StartupHook.cs | 6 +- .../dotnet-watch/DotNetWatcher.cs | 10 +- src/BuiltInTools/dotnet-watch/FileItem.cs | 6 +- .../dotnet-watch/Filters/BuildEvaluator.cs | 4 +- .../HotReload/IncrementalMSBuildWorkspace.cs | 36 ++-- .../HotReload/ScopedCssFileHandler.cs | 5 +- .../HotReload/StaticFileHandler.cs | 5 +- .../dotnet-watch/HotReloadDotNetWatcher.cs | 47 ++++-- .../dotnet-watch/Internal/FileWatcher.cs | 16 +- .../Internal/FileWatcher/ChangeKind.cs | 13 ++ .../Internal/FileWatcher/DotnetFileWatcher.cs | 39 +++-- .../FileWatcher/IFileSystemWatcher.cs | 2 +- .../FileWatcher/PollingFileWatcher.cs | 40 +++-- .../Internal/HotReloadFileSetWatcher.cs | 65 +++++--- test/dotnet-watch.Tests/FileWatcherTests.cs | 157 ++++++++++++------ .../HotReload/ApplyDeltaTests.cs | 107 ++++++++++++ .../MSBuildEvaluationFilterTest.cs | 9 +- 17 files changed, 406 insertions(+), 161 deletions(-) create mode 100644 src/BuiltInTools/dotnet-watch/Internal/FileWatcher/ChangeKind.cs diff --git a/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs b/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs index 0941b5b89621..1968f7d21aa3 100644 --- a/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs +++ b/src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs @@ -26,9 +26,11 @@ public static void Initialize() // When launching the application process dotnet-watch sets Hot Reload environment variables via CLI environment directives (dotnet [env:X=Y] run). // Currently, the CLI parser sets the env variables to the dotnet.exe process itself, rather then to the target process. // This may cause the dotnet.exe process to connect to the named pipe and break it for the target process. - if (Path.ChangeExtension(processPath, ".exe") != Path.ChangeExtension(s_targetProcessPath, ".exe")) + var processExe = Path.ChangeExtension(processPath, ".exe"); + var expectedExe = Path.ChangeExtension(s_targetProcessPath, ".exe"); + if (!string.Equals(processExe, expectedExe, Path.DirectorySeparatorChar == '\\' ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal)) { - Log($"Ignoring process '{processPath}', expecting '{s_targetProcessPath}'"); + Log($"Ignoring process '{processExe}', expecting '{expectedExe}'"); return; } diff --git a/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs index 785219c3879e..d2f57ce7eb34 100644 --- a/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/DotNetWatcher.cs @@ -27,7 +27,7 @@ public override async Task WatchAsync(CancellationToken cancellationToken) var environmentBuilder = EnvironmentVariablesBuilder.FromCurrentEnvironment(); - FileItem? changedFile = null; + ChangedFile? changedFile = null; var buildEvaluator = new BuildEvaluator(Context, RootFileSetFactory); await using var browserConnector = new BrowserConnector(Context); @@ -86,7 +86,7 @@ public override async Task WatchAsync(CancellationToken cancellationToken) var processTask = ProcessRunner.RunAsync(processSpec, Context.Reporter, isUserApplication: true, processExitedSource: null, combinedCancellationSource.Token); - Task fileSetTask; + Task fileSetTask; Task finishedTask; while (true) @@ -94,9 +94,9 @@ public override async Task WatchAsync(CancellationToken cancellationToken) fileSetTask = fileSetWatcher.GetChangedFileAsync(startedWatching: null, combinedCancellationSource.Token); finishedTask = await Task.WhenAny(processTask, fileSetTask, cancelledTaskSource.Task); - if (staticFileHandler != null && finishedTask == fileSetTask && fileSetTask.Result is FileItem fileItem) + if (staticFileHandler != null && finishedTask == fileSetTask && fileSetTask.Result.HasValue) { - if (await staticFileHandler.HandleFileChangesAsync([fileItem], combinedCancellationSource.Token)) + if (await staticFileHandler.HandleFileChangesAsync([fileSetTask.Result.Value], combinedCancellationSource.Token)) { // We're able to handle the file change event without doing a full-rebuild. continue; @@ -131,7 +131,7 @@ public override async Task WatchAsync(CancellationToken cancellationToken) Debug.Assert(finishedTask == fileSetTask); changedFile = fileSetTask.Result; Debug.Assert(changedFile != null, "ChangedFile should only be null when cancelled"); - Context.Reporter.Output($"File changed: {changedFile.Value.FilePath}"); + Context.Reporter.Output($"File changed: {changedFile.Value.Item.FilePath}"); } } } diff --git a/src/BuiltInTools/dotnet-watch/FileItem.cs b/src/BuiltInTools/dotnet-watch/FileItem.cs index 71779898168a..7fc91cd6fa1c 100644 --- a/src/BuiltInTools/dotnet-watch/FileItem.cs +++ b/src/BuiltInTools/dotnet-watch/FileItem.cs @@ -1,9 +1,11 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.DotNet.Watcher.Internal; + namespace Microsoft.DotNet.Watcher { - internal readonly struct FileItem + internal readonly record struct FileItem { public string FilePath { get; init; } @@ -14,7 +16,7 @@ internal readonly struct FileItem public string? StaticWebAssetPath { get; init; } - public bool IsNewFile { get; init; } + public ChangeKind Change { get; init; } public bool IsStaticFile => StaticWebAssetPath != null; } diff --git a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs index ad7599378ee2..0025fbbbcbf5 100644 --- a/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs +++ b/src/BuiltInTools/dotnet-watch/Filters/BuildEvaluator.cs @@ -46,7 +46,7 @@ public IReadOnlyList GetProcessArguments(int iteration) return [context.RootProjectOptions.Command, .. context.RootProjectOptions.CommandArguments]; } - public async ValueTask EvaluateAsync(FileItem? changedFile, CancellationToken cancellationToken) + public async ValueTask EvaluateAsync(ChangedFile? changedFile, CancellationToken cancellationToken) { if (context.EnvironmentOptions.SuppressMSBuildIncrementalism) { @@ -54,7 +54,7 @@ public async ValueTask EvaluateAsync(FileItem? changedFile, Ca return _evaluationResult = await CreateEvaluationResult(cancellationToken); } - if (_evaluationResult == null || RequiresMSBuildRevaluation(changedFile)) + if (_evaluationResult == null || RequiresMSBuildRevaluation(changedFile?.Item)) { RequiresRevaluation = true; } diff --git a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs index 17e4c6d27cd8..09871a21655c 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/IncrementalMSBuildWorkspace.cs @@ -1,20 +1,15 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.Collections.Generic; +using System.Collections.Immutable; using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using Microsoft.CodeAnalysis; -using Microsoft.CodeAnalysis.Host; +using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; using Microsoft.CodeAnalysis.Host.Mef; using Microsoft.CodeAnalysis.MSBuild; -using Microsoft.Extensions.Tools.Internal; -using Microsoft.CodeAnalysis.ExternalAccess.Watch.Api; -using System.Collections.Immutable; using Microsoft.CodeAnalysis.Text; +using Microsoft.DotNet.Watcher.Internal; +using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher.Tools; @@ -106,13 +101,24 @@ ImmutableArray MapDocuments(ProjectId mappedProjectId, IReadOnlyLi }).ToImmutableArray(); } - public async ValueTask UpdateFileContentAsync(IEnumerable changedFiles, CancellationToken cancellationToken) + public async ValueTask UpdateFileContentAsync(IEnumerable changedFiles, CancellationToken cancellationToken) { var updatedSolution = CurrentSolution; - foreach (var changedFile in changedFiles) + var documentsToRemove = new List(); + + foreach (var (changedFile, change) in changedFiles) { + // when a file is added we reevaluate the project: + Debug.Assert(change != ChangeKind.Add); + var documentIds = updatedSolution.GetDocumentIdsWithFilePath(changedFile.FilePath); + if (change == ChangeKind.Delete) + { + documentsToRemove.AddRange(documentIds); + continue; + } + foreach (var documentId in documentIds) { var textDocument = updatedSolution.GetDocument(documentId) @@ -140,9 +146,17 @@ public async ValueTask UpdateFileContentAsync(IEnumerable changedFiles } } + updatedSolution = RemoveDocuments(updatedSolution, documentsToRemove); + await ReportSolutionFilesAsync(SetCurrentSolution(updatedSolution), cancellationToken); } + private static Solution RemoveDocuments(Solution solution, IEnumerable ids) + => solution + .RemoveDocuments(ids.Where(id => solution.GetDocument(id) != null).ToImmutableArray()) + .RemoveAdditionalDocuments(ids.Where(id => solution.GetAdditionalDocument(id) != null).ToImmutableArray()) + .RemoveAnalyzerConfigDocuments(ids.Where(id => solution.GetAnalyzerConfigDocument(id) != null).ToImmutableArray()); + private static async ValueTask GetSourceTextAsync(string filePath, CancellationToken cancellationToken) { var zeroLengthRetryPerformed = false; diff --git a/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs index dfe625075227..3a6961854987 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/ScopedCssFileHandler.cs @@ -5,6 +5,7 @@ using System.Collections; using System.Diagnostics; using Microsoft.Build.Graph; +using Microsoft.DotNet.Watcher.Internal; using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher.Tools @@ -13,14 +14,14 @@ internal sealed class ScopedCssFileHandler(IReporter reporter, ProjectNodeMap pr { private const string BuildTargetName = "GenerateComputedBuildStaticWebAssets"; - public async ValueTask HandleFileChangesAsync(IReadOnlyList files, CancellationToken cancellationToken) + public async ValueTask HandleFileChangesAsync(IReadOnlyList files, CancellationToken cancellationToken) { var projectsToRefresh = new HashSet(); var hasApplicableFiles = false; for (int i = 0; i < files.Count; i++) { - var file = files[i]; + var file = files[i].Item; if (!file.FilePath.EndsWith(".razor.css", StringComparison.Ordinal) && !file.FilePath.EndsWith(".cshtml.css", StringComparison.Ordinal)) diff --git a/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs b/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs index f8d9b8bffd12..ce53bc8a7ce3 100644 --- a/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs +++ b/src/BuiltInTools/dotnet-watch/HotReload/StaticFileHandler.cs @@ -7,6 +7,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using Microsoft.CodeAnalysis.StackTraceExplorer; +using Microsoft.DotNet.Watcher.Internal; using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher.Tools @@ -18,13 +19,13 @@ internal sealed class StaticFileHandler(IReporter reporter, ProjectNodeMap proje DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull }; - public async ValueTask HandleFileChangesAsync(IReadOnlyList files, CancellationToken cancellationToken) + public async ValueTask HandleFileChangesAsync(IReadOnlyList files, CancellationToken cancellationToken) { var allFilesHandled = true; var refreshRequests = new Dictionary>(); for (int i = 0; i < files.Count; i++) { - var file = files[i]; + var file = files[i].Item; if (file.StaticWebAssetPath is null) { diff --git a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs index ee09b3c257df..24b543ebd9b3 100644 --- a/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/HotReloadDotNetWatcher.cs @@ -74,7 +74,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke HotReloadFileSetWatcher? fileSetWatcher = null; EvaluationResult? evaluationResult = null; RunningProject? rootRunningProject = null; - Task? fileSetWatcherTask = null; + Task? fileSetWatcherTask = null; try { @@ -178,7 +178,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke // When a new file is added we need to run design-time build to find out // what kind of the file it is and which project(s) does it belong to (can be linked, web asset, etc.). // We don't need to rebuild and restart the application though. - if (changedFiles.Any(f => f.IsNewFile)) + if (changedFiles.Any(f => f.Change is ChangeKind.Add)) { Context.Reporter.Verbose("File addition triggered re-evaluation."); @@ -195,9 +195,9 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke // update files in the change set with new evaluation info: for (int i = 0; i < changedFiles.Length; i++) { - if (evaluationResult.Files.TryGetValue(changedFiles[i].FilePath, out var evaluatedFile)) + if (evaluationResult.Files.TryGetValue(changedFiles[i].Item.FilePath, out var evaluatedFile)) { - changedFiles[i] = evaluatedFile; + changedFiles[i] = changedFiles[i] with { Item = evaluatedFile }; } } @@ -336,24 +336,43 @@ await Task.WhenAll( } } - private void ReportFileChanges(IReadOnlyList fileItems) + private void ReportFileChanges(IReadOnlyList changedFiles) { - Report(added: true); - Report(added: false); + Report(kind: ChangeKind.Add); + Report(kind: ChangeKind.Update); + Report(kind: ChangeKind.Delete); - void Report(bool added) + void Report(ChangeKind kind) { - var items = fileItems.Where(item => item.IsNewFile == added).ToArray(); + var items = changedFiles.Where(item => item.Change == kind).ToArray(); if (items is not []) { - Context.Reporter.Output(GetMessage(items, added)); + Context.Reporter.Output(GetMessage(items, kind)); } } - string GetMessage(IReadOnlyList items, bool added) - => items is [var item] - ? (added ? "File added: " : "File changed: ") + GetRelativeFilePath(item.FilePath) - : (added ? "Files added: " : "Files changed: ") + string.Join(", ", items.Select(f => GetRelativeFilePath(f.FilePath))); + string GetMessage(IReadOnlyList items, ChangeKind kind) + => items is [{Item: var item }] + ? GetSingularMessage(kind) + ": " + GetRelativeFilePath(item.FilePath) + : GetPluralMessage(kind) + ": " + string.Join(", ", items.Select(f => GetRelativeFilePath(f.Item.FilePath))); + + static string GetSingularMessage(ChangeKind kind) + => kind switch + { + ChangeKind.Update => "File updated", + ChangeKind.Add => "File added", + ChangeKind.Delete => "File deleted", + _ => throw new InvalidOperationException() + }; + + static string GetPluralMessage(ChangeKind kind) + => kind switch + { + ChangeKind.Update => "Files updated", + ChangeKind.Add => "Files added", + ChangeKind.Delete => "Files deleted", + _ => throw new InvalidOperationException() + }; } private async ValueTask EvaluateRootProjectAsync(CancellationToken cancellationToken) diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs index b844f8da4fa8..3a339bf63fb1 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher.cs @@ -10,7 +10,7 @@ internal sealed class FileWatcher(IReadOnlyDictionary fileSet, private readonly Dictionary _watchers = []; private bool _disposed; - public event Action? OnFileChange; + public event Action? OnFileChange; public void Dispose() { @@ -73,9 +73,9 @@ private void WatcherErrorHandler(object? sender, Exception error) } } - private void WatcherChangedHandler(object? sender, (string changedPath, bool newFile) args) + private void WatcherChangedHandler(object? sender, (string changedPath, ChangeKind kind) args) { - OnFileChange?.Invoke(args.changedPath, args.newFile); + OnFileChange?.Invoke(args.changedPath, args.kind); } private void DisposeWatcher(string directory) @@ -101,22 +101,22 @@ private void EnsureNotDisposed() private static string EnsureTrailingSlash(string path) => (path is [.., var last] && last != Path.DirectorySeparatorChar) ? path + Path.DirectorySeparatorChar : path; - public async Task GetChangedFileAsync(Action? startedWatching, CancellationToken cancellationToken) + public async Task GetChangedFileAsync(Action? startedWatching, CancellationToken cancellationToken) { StartWatching(); - var fileChangedSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); + var fileChangedSource = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); cancellationToken.Register(() => fileChangedSource.TrySetResult(null)); - void FileChangedCallback(string path, bool newFile) + void FileChangedCallback(string path, ChangeKind kind) { if (fileSet.TryGetValue(path, out var fileItem)) { - fileChangedSource.TrySetResult(fileItem); + fileChangedSource.TrySetResult(new ChangedFile(fileItem, kind)); } } - FileItem? changedFile; + ChangedFile? changedFile; OnFileChange += FileChangedCallback; try diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/ChangeKind.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/ChangeKind.cs new file mode 100644 index 000000000000..5fef3b698624 --- /dev/null +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/ChangeKind.cs @@ -0,0 +1,13 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.DotNet.Watcher.Internal; + +internal enum ChangeKind +{ + Update, + Add, + Delete +} + +internal readonly record struct ChangedFile(FileItem Item, ChangeKind Change); diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/DotnetFileWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/DotnetFileWatcher.cs index ca622206e933..7040fe1a0763 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/DotnetFileWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/DotnetFileWatcher.cs @@ -33,7 +33,7 @@ internal DotnetFileWatcher(string watchedDirectory, Func? OnFileChange; + public event EventHandler<(string filePath, ChangeKind kind)>? OnFileChange; public event EventHandler? OnError; @@ -78,10 +78,10 @@ private void WatcherRenameHandler(object sender, RenamedEventArgs e) return; } - Logger?.Invoke("Rename"); + Logger?.Invoke($"Renamed '{e.OldFullPath}' to '{e.FullPath}'."); - NotifyChange(e.OldFullPath, newFile: false); - NotifyChange(e.FullPath, newFile: true); + NotifyChange(e.OldFullPath, ChangeKind.Delete); + NotifyChange(e.FullPath, ChangeKind.Add); if (Directory.Exists(e.FullPath)) { @@ -89,12 +89,23 @@ private void WatcherRenameHandler(object sender, RenamedEventArgs e) { // Calculated previous path of this moved item. var oldLocation = Path.Combine(e.OldFullPath, newLocation.Substring(e.FullPath.Length + 1)); - NotifyChange(oldLocation, newFile: false); - NotifyChange(newLocation, newFile: true); + NotifyChange(oldLocation, ChangeKind.Delete); + NotifyChange(newLocation, ChangeKind.Add); } } } + private void WatcherDeletedHandler(object sender, FileSystemEventArgs e) + { + if (_disposed) + { + return; + } + + Logger?.Invoke($"Deleted '{e.FullPath}'."); + NotifyChange(e.FullPath, ChangeKind.Delete); + } + private void WatcherChangeHandler(object sender, FileSystemEventArgs e) { if (_disposed) @@ -102,8 +113,8 @@ private void WatcherChangeHandler(object sender, FileSystemEventArgs e) return; } - Logger?.Invoke("Change"); - NotifyChange(e.FullPath, newFile: false); + Logger?.Invoke($"Updated '{e.FullPath}'."); + NotifyChange(e.FullPath, ChangeKind.Update); } private void WatcherAddedHandler(object sender, FileSystemEventArgs e) @@ -113,14 +124,14 @@ private void WatcherAddedHandler(object sender, FileSystemEventArgs e) return; } - Logger?.Invoke("Added"); - NotifyChange(e.FullPath, newFile: true); + Logger?.Invoke($"Added '{e.FullPath}'."); + NotifyChange(e.FullPath, ChangeKind.Add); } - private void NotifyChange(string fullPath, bool newFile) + private void NotifyChange(string fullPath, ChangeKind kind) { // Only report file changes - OnFileChange?.Invoke(this, (fullPath, newFile)); + OnFileChange?.Invoke(this, (fullPath, kind)); } private void CreateFileSystemWatcher() @@ -140,7 +151,7 @@ private void CreateFileSystemWatcher() _fileSystemWatcher.IncludeSubdirectories = true; _fileSystemWatcher.Created += WatcherAddedHandler; - _fileSystemWatcher.Deleted += WatcherChangeHandler; + _fileSystemWatcher.Deleted += WatcherDeletedHandler; _fileSystemWatcher.Changed += WatcherChangeHandler; _fileSystemWatcher.Renamed += WatcherRenameHandler; _fileSystemWatcher.Error += WatcherErrorHandler; @@ -156,7 +167,7 @@ private void DisposeInnerWatcher() _fileSystemWatcher.EnableRaisingEvents = false; _fileSystemWatcher.Created -= WatcherAddedHandler; - _fileSystemWatcher.Deleted -= WatcherChangeHandler; + _fileSystemWatcher.Deleted -= WatcherDeletedHandler; _fileSystemWatcher.Changed -= WatcherChangeHandler; _fileSystemWatcher.Renamed -= WatcherRenameHandler; _fileSystemWatcher.Error -= WatcherErrorHandler; diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IFileSystemWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IFileSystemWatcher.cs index f75c7e3e1481..ebdef49913ff 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IFileSystemWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/IFileSystemWatcher.cs @@ -5,7 +5,7 @@ namespace Microsoft.DotNet.Watcher.Internal { internal interface IFileSystemWatcher : IDisposable { - event EventHandler<(string filePath, bool newFile)> OnFileChange; + event EventHandler<(string filePath, ChangeKind kind)> OnFileChange; event EventHandler OnError; diff --git a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs index da7630b71eb8..2df2004ee84b 100644 --- a/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs +++ b/src/BuiltInTools/dotnet-watch/Internal/FileWatcher/PollingFileWatcher.cs @@ -15,7 +15,7 @@ internal class PollingFileWatcher : IFileSystemWatcher private Dictionary _knownEntities = new(); private Dictionary _tempDictionary = new(); - private Dictionary _changes = new(); + private Dictionary _changes = new(); private Thread _pollingThread; private bool _raiseEvents; @@ -40,7 +40,7 @@ public PollingFileWatcher(string watchedDirectory) _pollingThread.Start(); } - public event EventHandler<(string filePath, bool newFile)>? OnFileChange; + public event EventHandler<(string filePath, ChangeKind kind)>? OnFileChange; #pragma warning disable CS0067 // not used public event EventHandler? OnError; @@ -106,8 +106,8 @@ private void CheckForChangedFiles() if (!_knownEntities.ContainsKey(fullFilePath)) { - // New file - RecordChange(f, isNewFile: true); + // New file or directory + RecordChange(f, ChangeKind.Add); } else { @@ -115,10 +115,11 @@ private void CheckForChangedFiles() try { - if (fileMeta.FileInfo.LastWriteTime != f.LastWriteTime) + if (!fileMeta.FileInfo.Attributes.HasFlag(FileAttributes.Directory) && + fileMeta.FileInfo.LastWriteTime != f.LastWriteTime) { // File changed - RecordChange(f, isNewFile: false); + RecordChange(f, ChangeKind.Update); } _knownEntities[fullFilePath] = new FileMeta(fileMeta.FileInfo, foundAgain: true); @@ -136,8 +137,8 @@ private void CheckForChangedFiles() { if (!file.Value.FoundAgain) { - // File deleted - RecordChange(file.Value.FileInfo, isNewFile: false); + // File or directory deleted + RecordChange(file.Value.FileInfo, ChangeKind.Delete); } } @@ -148,7 +149,7 @@ private void CheckForChangedFiles() _tempDictionary.Clear(); } - private void RecordChange(FileSystemInfo fileInfo, bool isNewFile) + private void RecordChange(FileSystemInfo fileInfo, ChangeKind kind) { if (_changes.ContainsKey(fileInfo.FullName) || fileInfo.FullName.Equals(_watchedDirectory.FullName, StringComparison.Ordinal)) @@ -156,18 +157,15 @@ private void RecordChange(FileSystemInfo fileInfo, bool isNewFile) return; } - _changes.Add(fileInfo.FullName, isNewFile); + _changes.Add(fileInfo.FullName, kind); - if (fileInfo.FullName != _watchedDirectory.FullName) + if (fileInfo is FileInfo { Directory: { } directory }) { - if (fileInfo is FileInfo { Directory: { } directory }) - { - RecordChange(directory, isNewFile: false); - } - else if (fileInfo is DirectoryInfo { Parent: { } parent }) - { - RecordChange(parent, isNewFile: false); - } + RecordChange(directory, ChangeKind.Update); + } + else if (fileInfo is DirectoryInfo { Parent: { } parent }) + { + RecordChange(parent, ChangeKind.Update); } } @@ -202,14 +200,14 @@ private static void ForeachEntityInDirectory(DirectoryInfo dirInfo, Action fileSet, DateTime buildCompletionTime, IReporter reporter) : IDisposable { private static readonly TimeSpan s_debounceInterval = TimeSpan.FromMilliseconds(50); + private static readonly DateTime s_fileNotExistFileTime = DateTime.FromFileTime(0); private readonly FileWatcher _fileWatcher = new(fileSet, reporter); private readonly object _changedFilesLock = new(); - private readonly ConcurrentDictionary _changedFiles = new(StringComparer.Ordinal); + private readonly ConcurrentDictionary _changedFiles = new(StringComparer.Ordinal); - private TaskCompletionSource? _tcs; + private TaskCompletionSource? _tcs; private bool _initialized; private bool _disposed; @@ -65,7 +67,7 @@ private void EnsureInitialized() continue; } - FileItem[] changedFiles; + ChangedFile[] changedFiles; lock (_changedFilesLock) { changedFiles = _changedFiles.Values.ToArray(); @@ -82,7 +84,7 @@ private void EnsureInitialized() }, default, TaskCreationOptions.LongRunning, TaskScheduler.Default); - void FileChangedCallback(string path, bool newFile) + void FileChangedCallback(string path, ChangeKind kind) { // only handle file changes: if (Directory.Exists(path)) @@ -90,43 +92,66 @@ void FileChangedCallback(string path, bool newFile) return; } - try + if (kind != ChangeKind.Delete) { - // TODO: Deleted files will be ignored https://github.com/dotnet/sdk/issues/42535 - - // Do not report changes to files that happened during build: - var creationTime = File.GetCreationTimeUtc(path); - var writeTime = File.GetLastWriteTimeUtc(path); - if (creationTime.Ticks < buildCompletionTime.Ticks && writeTime.Ticks < buildCompletionTime.Ticks) + try + { + // Do not report changes to files that happened during build: + var creationTime = File.GetCreationTimeUtc(path); + var writeTime = File.GetLastWriteTimeUtc(path); + + if (creationTime == s_fileNotExistFileTime || writeTime == s_fileNotExistFileTime) + { + // file might have been deleted since we received the event + kind = ChangeKind.Delete; + } + else if (creationTime.Ticks < buildCompletionTime.Ticks && writeTime.Ticks < buildCompletionTime.Ticks) + { + reporter.Verbose( + $"Ignoring file change during build: {kind} '{path}' " + + $"(created {FormatTimestamp(creationTime)} and written {FormatTimestamp(writeTime)} before {FormatTimestamp(buildCompletionTime)})."); + + return; + } + else if (writeTime > creationTime) + { + reporter.Verbose($"File change: {kind} '{path}' (written {FormatTimestamp(writeTime)} after {FormatTimestamp(buildCompletionTime)})."); + } + else + { + reporter.Verbose($"File change: {kind} '{path}' (created {FormatTimestamp(creationTime)} after {FormatTimestamp(buildCompletionTime)})."); + } + } + catch (Exception e) { - reporter.Verbose($"Ignoring file updated during build: '{path}' ({FormatTimestamp(creationTime)},{FormatTimestamp(writeTime)} < {FormatTimestamp(buildCompletionTime)})."); + reporter.Verbose($"Ignoring file '{path}' due to access error: {e.Message}."); return; } } - catch (Exception e) + + if (kind == ChangeKind.Delete) { - reporter.Verbose($"Ignoring file '{path}' due to access error: {e.Message}."); - return; + reporter.Verbose($"File '{path}' deleted after {FormatTimestamp(buildCompletionTime)}."); } - if (newFile) + if (kind == ChangeKind.Add) { lock (_changedFilesLock) { - _changedFiles.TryAdd(path, new FileItem { FilePath = path, IsNewFile = newFile }); + _changedFiles.TryAdd(path, new ChangedFile(new FileItem { FilePath = path }, kind)); } } else if (fileSet.TryGetValue(path, out var fileItem)) { lock (_changedFilesLock) { - _changedFiles.TryAdd(path, fileItem); + _changedFiles.TryAdd(path, new ChangedFile(fileItem, kind)); } } } } - public Task GetChangedFilesAsync(CancellationToken cancellationToken, bool forceWaitForNewUpdate = false) + public Task GetChangedFilesAsync(CancellationToken cancellationToken, bool forceWaitForNewUpdate = false) { EnsureInitialized(); @@ -142,6 +167,6 @@ void FileChangedCallback(string path, bool newFile) } internal static string FormatTimestamp(DateTime time) - => time.ToString("yyyy-MM-dd HH:mm:ss.fffffff"); + => time.ToString("HH:mm:ss.fffffff"); } } diff --git a/test/dotnet-watch.Tests/FileWatcherTests.cs b/test/dotnet-watch.Tests/FileWatcherTests.cs index 03afa158fb79..eeadd08ceefd 100644 --- a/test/dotnet-watch.Tests/FileWatcherTests.cs +++ b/test/dotnet-watch.Tests/FileWatcherTests.cs @@ -1,53 +1,43 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System.Runtime.CompilerServices; using Microsoft.AspNetCore.Testing; using Microsoft.DotNet.Watcher.Internal; namespace Microsoft.DotNet.Watcher.Tools { - public class FileWatcherTests + public class FileWatcherTests(ITestOutputHelper output) { - public FileWatcherTests(ITestOutputHelper output) - { - _output = output; - _testAssetManager = new TestAssetsManager(output); - } - private readonly TimeSpan DefaultTimeout = TimeSpan.FromSeconds(60); private readonly TimeSpan NegativeTimeout = TimeSpan.FromSeconds(5); - private readonly ITestOutputHelper _output; - private readonly TestAssetsManager _testAssetManager; + private readonly TestAssetsManager _testAssetManager = new TestAssetsManager(output); private async Task TestOperation( string dir, - (string, bool)[] expectedChanges, + (string path, ChangeKind kind)[] expectedChanges, bool usePolling, Action operation) { - // On Unix the native file watcher may surface events from - // the recent past. Delay to avoid those. - // On Unix the file write time is in 1s increments; - // if we don't wait, there's a chance that the polling - // watcher will not detect the change - await Task.Delay(1250); - using var watcher = FileWatcherFactory.CreateWatcher(dir, usePolling); if (watcher is DotnetFileWatcher dotnetWatcher) { - dotnetWatcher.Logger = m => _output.WriteLine(m); + dotnetWatcher.Logger = m => output.WriteLine(m); } var changedEv = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); - var filesChanged = new HashSet<(string, bool)>(); + var filesChanged = new HashSet<(string path, ChangeKind kind)>(); - var testFileFullPath = Path.Combine(dir, "foo"); - - EventHandler<(string path, bool newFile)> handler = null; + EventHandler<(string path, ChangeKind kind)> handler = null; handler = (_, f) => { - filesChanged.Add(f); + if (filesChanged.Add(f)) + { + output.WriteLine($"Observed new {f.kind}: '{f.path}' ({filesChanged.Count} out of {expectedChanges.Length})"); + } + else + { + output.WriteLine($"Already seen {f.kind}: '{f.path}'"); + } if (filesChanged.Count == expectedChanges.Length) { @@ -88,17 +78,48 @@ await TestOperation( expectedChanges: !RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && !usePolling ? new[] { - (testFileFullPath, false), - (testFileFullPath, true), + (testFileFullPath, ChangeKind.Update), + (testFileFullPath, ChangeKind.Add), } : new[] { - (testFileFullPath, true), + (testFileFullPath, ChangeKind.Add), }, usePolling, () => File.WriteAllText(testFileFullPath, string.Empty)); } + [Theory] + [InlineData(true)] + [InlineData(false)] + public async Task NewFileInNewDirectory(bool usePolling) + { + var dir = _testAssetManager.CreateTestDirectory(identifier: usePolling.ToString()).Path; + + var newDir = Path.Combine(dir, "Dir"); + var newFile = Path.Combine(newDir, "foo"); + + await TestOperation( + dir, + expectedChanges: RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && !usePolling + ? new[] + { + (newDir, ChangeKind.Add), + (newFile, ChangeKind.Update), + (newFile, ChangeKind.Add), + } + : new[] + { + (newDir, ChangeKind.Add), + }, + usePolling, + () => + { + Directory.CreateDirectory(newDir); + File.WriteAllText(newFile, string.Empty); + }); + } + [Theory] [InlineData(true)] [InlineData(false)] @@ -111,14 +132,13 @@ public async Task ChangeFile(bool usePolling) await TestOperation( dir, - expectedChanges: [(testFileFullPath, false)], + expectedChanges: [(testFileFullPath, ChangeKind.Update)], usePolling, () => File.WriteAllText(testFileFullPath, string.Empty)); } [Theory] - [InlineData(true)] - [InlineData(false)] + [CombinatorialData] public async Task MoveFile(bool usePolling) { var dir = _testAssetManager.CreateTestDirectory(identifier: usePolling.ToString()).Path; @@ -129,18 +149,19 @@ public async Task MoveFile(bool usePolling) await TestOperation( dir, - expectedChanges: RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && !usePolling - ? new[] - { - (srcFile, false), - (srcFile, true), - (dstFile, true), - } - : new[] - { - (srcFile, false), - (dstFile, true), - }, + expectedChanges: RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && !usePolling ? + [ + // On OSX events from before we started observing are reported as well. + (srcFile, ChangeKind.Update), + (srcFile, ChangeKind.Add), + (srcFile, ChangeKind.Delete), + (dstFile, ChangeKind.Add), + ] + : + [ + (srcFile, ChangeKind.Delete), + (dstFile, ChangeKind.Add), + ], usePolling, () => File.Move(srcFile, dstFile)); @@ -160,8 +181,8 @@ public async Task FileInSubdirectory() await TestOperation( dir, expectedChanges: [ - (subdir, false), - (testFileFullPath, false) + (subdir, ChangeKind.Update), + (testFileFullPath, ChangeKind.Update) ], usePolling: true, () => File.WriteAllText(testFileFullPath, string.Empty)); @@ -246,7 +267,7 @@ public async Task MultipleFiles(bool usePolling) await TestOperation( dir, - expectedChanges: [(testFileFullPath, false)], + expectedChanges: [(testFileFullPath, ChangeKind.Update)], usePolling: true, () => File.WriteAllText(testFileFullPath, string.Empty)); } @@ -274,9 +295,9 @@ private async Task AssertFileChangeRaisesEvent(string directory, IFileSystemWatc { var changedEv = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); var expectedPath = Path.Combine(directory, Path.GetRandomFileName()); - EventHandler<(string, bool)> handler = (_, f) => + EventHandler<(string, ChangeKind)> handler = (_, f) => { - _output.WriteLine("File changed: " + f); + output.WriteLine("File changed: " + f); try { if (string.Equals(f.Item1, expectedPath, StringComparison.OrdinalIgnoreCase)) @@ -331,13 +352,43 @@ public async Task DeleteSubfolder(bool usePolling) await TestOperation( dir, - expectedChanges: [ - (subdir, false), - (f1, false), - (f2, false), - (f3, false), + expectedChanges: usePolling ? + [ + (subdir, ChangeKind.Delete), + (f1, ChangeKind.Delete), + (f2, ChangeKind.Delete), + (f3, ChangeKind.Delete), + ] + : RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? + [ + (subdir, ChangeKind.Add), + (subdir, ChangeKind.Delete), + (f1, ChangeKind.Update), + (f1, ChangeKind.Add), + (f1, ChangeKind.Delete), + (f2, ChangeKind.Update), + (f2, ChangeKind.Add), + (f2, ChangeKind.Delete), + (f3, ChangeKind.Update), + (f3, ChangeKind.Add), + (f3, ChangeKind.Delete), + ] + : RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? + [ + (subdir, ChangeKind.Update), + (subdir, ChangeKind.Delete), + (f1, ChangeKind.Delete), + (f2, ChangeKind.Delete), + (f3, ChangeKind.Delete), + ] + : + [ + (subdir, ChangeKind.Delete), + (f1, ChangeKind.Delete), + (f2, ChangeKind.Delete), + (f3, ChangeKind.Delete), ], - usePolling: true, + usePolling, () => Directory.Delete(subdir, recursive: true)); } } diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index b98819b8993c..d7e86fbfd97a 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -157,5 +157,112 @@ public static void Print() await App.AssertOutputLineStartsWith("Updated types: Printer"); } + + [Theory] + [InlineData(true, Skip = "https://github.com/dotnet/sdk/issues/43320")] + [InlineData(false)] + public async Task RenameSourceFile(bool useMove) + { + Logger.WriteLine("RenameSourceFile started"); + + var testAsset = TestAssets.CopyTestAsset("WatchAppWithProjectDeps") + .WithSource(); + + var dependencyDir = Path.Combine(testAsset.Path, "Dependency"); + var oldFilePath = Path.Combine(dependencyDir, "Foo.cs"); + var newFilePath = Path.Combine(dependencyDir, "Renamed.cs"); + + var source = """ + using System; + using System.IO; + using System.Runtime.CompilerServices; + + public class Lib + { + public static void Print() => PrintFileName(); + + public static void PrintFileName([CallerFilePathAttribute] string filePath = null) + { + Console.WriteLine($"> {Path.GetFileName(filePath)}"); + } + } + """; + + File.WriteAllText(oldFilePath, source); + + App.Start(testAsset, [], "AppWithDeps"); + + await App.AssertWaitingForChanges(); + + // rename the file: + if (useMove) + { + File.Move(oldFilePath, newFilePath); + } + else + { + File.Delete(oldFilePath); + File.WriteAllText(newFilePath, source); + } + + Logger.WriteLine($"Renamed '{oldFilePath}' to '{newFilePath}'."); + + await App.AssertOutputLineStartsWith("> Renamed.cs"); + } + + [Theory] + [InlineData(true, Skip = "https://github.com/dotnet/sdk/issues/43320")] + [InlineData(false)] + public async Task RenameDirectory(bool useMove) + { + Logger.WriteLine("RenameSourceFile started"); + + var testAsset = TestAssets.CopyTestAsset("WatchAppWithProjectDeps") + .WithSource(); + + var dependencyDir = Path.Combine(testAsset.Path, "Dependency"); + var oldSubdir = Path.Combine(dependencyDir, "Subdir"); + var newSubdir = Path.Combine(dependencyDir, "NewSubdir"); + + var source = """ + using System; + using System.IO; + using System.Runtime.CompilerServices; + + public class Lib + { + public static void Print() => PrintDirectoryName(); + + public static void PrintDirectoryName([CallerFilePathAttribute] string filePath = null) + { + Console.WriteLine($"> {Path.GetFileName(Path.GetDirectoryName(filePath))}"); + } + } + """; + + File.Delete(Path.Combine(dependencyDir, "Foo.cs")); + Directory.CreateDirectory(oldSubdir); + File.WriteAllText(Path.Combine(oldSubdir, "Foo.cs"), source); + + App.Start(testAsset, [], "AppWithDeps"); + + await App.AssertWaitingForChanges(); + + // rename the directory: + if (useMove) + { + Directory.Move(oldSubdir, newSubdir); + } + else + { + Directory.Delete(oldSubdir, recursive: true); + Directory.CreateDirectory(newSubdir); + File.WriteAllText(Path.Combine(newSubdir, "Foo.cs"), source); + } + + Logger.WriteLine($"Renamed '{oldSubdir}' to '{newSubdir}'."); + + await App.AssertOutputLineStartsWith("> NewSubdir"); + } } } diff --git a/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs b/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs index 0a64ca3f0c33..6b0aa27c851a 100644 --- a/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs +++ b/test/dotnet-watch.Tests/MSBuildEvaluationFilterTest.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using Microsoft.DotNet.Watcher.Internal; using Microsoft.Extensions.Tools.Internal; namespace Microsoft.DotNet.Watcher.Tools @@ -27,7 +28,7 @@ public async Task ProcessAsync_EvaluatesFileSetIfProjFileChanges() evaluator.RequiresRevaluation = false; - await evaluator.EvaluateAsync(changedFile: new() { FilePath = "Test.csproj" }, CancellationToken.None); + await evaluator.EvaluateAsync(changedFile: new(new() { FilePath = "Test.csproj" }, ChangeKind.Update), CancellationToken.None); Assert.True(evaluator.RequiresRevaluation); } @@ -51,7 +52,7 @@ public async Task ProcessAsync_DoesNotEvaluateFileSetIfNonProjFileChanges() evaluator.RequiresRevaluation = false; - await evaluator.EvaluateAsync(changedFile: new() { FilePath = "Controller.cs" }, CancellationToken.None); + await evaluator.EvaluateAsync(changedFile: new(new() { FilePath = "Controller.cs" }, ChangeKind.Update), CancellationToken.None); Assert.False(evaluator.RequiresRevaluation); Assert.Equal(1, counter); @@ -77,7 +78,7 @@ public async Task ProcessAsync_EvaluateFileSetOnEveryChangeIfOptimizationIsSuppr evaluator.RequiresRevaluation = false; - await evaluator.EvaluateAsync(changedFile: new() { FilePath = "Controller.cs" }, CancellationToken.None); + await evaluator.EvaluateAsync(changedFile: new(new() { FilePath = "Controller.cs" }, ChangeKind.Update), CancellationToken.None); Assert.True(evaluator.RequiresRevaluation); Assert.Equal(2, counter); @@ -118,7 +119,7 @@ public async Task ProcessAsync_SetsEvaluationRequired_IfMSBuildFileChanges_ButIs evaluator.RequiresRevaluation = false; evaluator.Timestamps["Proj.csproj"] = new DateTime(1007); - await evaluator.EvaluateAsync(new() { FilePath = "Controller.cs" }, CancellationToken.None); + await evaluator.EvaluateAsync(new(new() { FilePath = "Controller.cs" }, ChangeKind.Update), CancellationToken.None); Assert.True(evaluator.RequiresRevaluation); } From 749e468b7af7beecd3789d67e0ae3be2d8e16431 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Sep 2024 11:21:17 +0000 Subject: [PATCH 32/90] Update dependencies from https://github.com/nuget/nuget.client build 6.12.0.110 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.12.0-rc.108 -> To Version 6.12.0-rc.110 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a1096fe8ab4..322565a8b6f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://github.com/dotnet/aspnetcore d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 - + https://github.com/nuget/nuget.client - e082545cbba30ec8dc9b759f2d9beea8aabc6215 + c36ca8ffc76879296441df65ab90adbcdfddfae1 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 5303f4a9636a..e651ea19e677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,18 +173,18 @@ - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 - 6.12.0-rc.108 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 + 6.12.0-rc.110 From 1491d1964ab6163ba652f76ae90c388d58ad0a4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Sep 2024 12:08:35 +0000 Subject: [PATCH 33/90] Update dependencies from https://github.com/dotnet/roslyn build 20240919.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.12.0-3.24469.1 -> To Version 4.12.0-3.24469.4 --- 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 2a1096fe8ab4..17647fed3fdd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3044166cd923167204853d1d9f975bc26864f86f - + https://github.com/dotnet/roslyn - f869d0f8a872875a46ba9fe23c67b04eb5519c2e + 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 - + https://github.com/dotnet/roslyn - f869d0f8a872875a46ba9fe23c67b04eb5519c2e + 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 - + https://github.com/dotnet/roslyn - f869d0f8a872875a46ba9fe23c67b04eb5519c2e + 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 - + https://github.com/dotnet/roslyn - f869d0f8a872875a46ba9fe23c67b04eb5519c2e + 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 - + https://github.com/dotnet/roslyn - f869d0f8a872875a46ba9fe23c67b04eb5519c2e + 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 - + https://github.com/dotnet/roslyn - f869d0f8a872875a46ba9fe23c67b04eb5519c2e + 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 - + https://github.com/dotnet/roslyn - f869d0f8a872875a46ba9fe23c67b04eb5519c2e + 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 - + https://github.com/dotnet/roslyn - f869d0f8a872875a46ba9fe23c67b04eb5519c2e + 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 - + https://github.com/dotnet/roslyn - f869d0f8a872875a46ba9fe23c67b04eb5519c2e + 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5303f4a9636a..05ae8f1d565f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,14 +235,14 @@ - 4.12.0-3.24469.1 - 4.12.0-3.24469.1 - 4.12.0-3.24469.1 - 4.12.0-3.24469.1 - 4.12.0-3.24469.1 - 4.12.0-3.24469.1 - 4.12.0-3.24469.1 - 4.12.0-3.24469.1 + 4.12.0-3.24469.4 + 4.12.0-3.24469.4 + 4.12.0-3.24469.4 + 4.12.0-3.24469.4 + 4.12.0-3.24469.4 + 4.12.0-3.24469.4 + 4.12.0-3.24469.4 + 4.12.0-3.24469.4 From 42a91ebd567733601cce92804103a7af1f1ac3a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Sep 2024 12:09:06 +0000 Subject: [PATCH 34/90] Update dependencies from https://github.com/dotnet/msbuild build 20240919.5 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.12.0-preview-24469-01 -> To Version 17.12.0-preview-24469-05 --- 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 e903b0cac557..3dd1d5ae15da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ c3d83d0ea894e5ee537bfc591fd48e06af8d9166 - + https://github.com/dotnet/msbuild - d9969c69af69f62d628a263b82e3aa637776a4c3 + fea15fbd1fdb509ee69db79420c6cc10044b6b09 - + https://github.com/dotnet/msbuild - d9969c69af69f62d628a263b82e3aa637776a4c3 + fea15fbd1fdb509ee69db79420c6cc10044b6b09 - + https://github.com/dotnet/msbuild - d9969c69af69f62d628a263b82e3aa637776a4c3 + fea15fbd1fdb509ee69db79420c6cc10044b6b09 diff --git a/eng/Versions.props b/eng/Versions.props index d8fe9b2c8ede..227435340831 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -212,8 +212,8 @@ then use that in Directory.Packages.props. At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. --> - 17.12.0-preview-24469-01 - 17.12.0-preview-24469-01 + 17.12.0-preview-24469-05 + 17.12.0-preview-24469-05 $([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim()) From 26517b3bfc214a8fcd229c296f4c6800c59378e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 20 Sep 2024 17:54:45 +0000 Subject: [PATCH 35/90] Update dependencies from https://github.com/dotnet/aspnetcore build 20240920.3 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.0-rtm.24468.6 -> To Version 9.0.0-rtm.24470.3 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a1096fe8ab4..e8fcc5f6f207 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 https://github.com/nuget/nuget.client @@ -271,54 +271,54 @@ https://github.com/dotnet/wpf d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 @@ -339,21 +339,21 @@ c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 https://github.com/dotnet/test-templates @@ -535,9 +535,9 @@ https://github.com/dotnet/runtime 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/aspnetcore - d962763e8e7d1efb409f9688d6dd7c87aab93b3d + c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5303f4a9636a..21b554b1e8d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -246,19 +246,19 @@ - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 - 9.0.0-rtm.24468.6 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 + 9.0.0-rtm.24470.3 From edb6817b0e7a0c4f89c9a413ee8366ea0118faca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Sep 2024 11:26:36 +0000 Subject: [PATCH 36/90] Update dependencies from https://github.com/nuget/nuget.client build 6.12.0.112 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.12.0-rc.110 -> To Version 6.12.0-rc.112 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 322565a8b6f9..33df6a8b3177 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://github.com/dotnet/aspnetcore d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc - + https://github.com/nuget/nuget.client - c36ca8ffc76879296441df65ab90adbcdfddfae1 + 502e691d67590946d0a4765a25f1da2b6d6c32fc https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index e651ea19e677..1081121eae50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,18 +173,18 @@ - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 - 6.12.0-rc.110 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 + 6.12.0-rc.112 From 2e0387bd71764bc87fd76af42fd230e63577d135 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Sep 2024 12:07:17 +0000 Subject: [PATCH 37/90] Update dependencies from https://github.com/dotnet/roslyn build 20240920.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.12.0-3.24469.4 -> To Version 4.12.0-3.24470.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 17647fed3fdd..a3f3ce38e4b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3044166cd923167204853d1d9f975bc26864f86f - + https://github.com/dotnet/roslyn - 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 + 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/roslyn - 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 + 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/roslyn - 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 + 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/roslyn - 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 + 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/roslyn - 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 + 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/roslyn - 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 + 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/roslyn - 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 + 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/roslyn - 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 + 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/roslyn - 37ba9eef6e1c2c30541cd3351ad62b1bb25b24a8 + 54fd790788b03c256f736c917fc368daf0a643db https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 05ae8f1d565f..32102a295e0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,14 +235,14 @@ - 4.12.0-3.24469.4 - 4.12.0-3.24469.4 - 4.12.0-3.24469.4 - 4.12.0-3.24469.4 - 4.12.0-3.24469.4 - 4.12.0-3.24469.4 - 4.12.0-3.24469.4 - 4.12.0-3.24469.4 + 4.12.0-3.24470.11 + 4.12.0-3.24470.11 + 4.12.0-3.24470.11 + 4.12.0-3.24470.11 + 4.12.0-3.24470.11 + 4.12.0-3.24470.11 + 4.12.0-3.24470.11 + 4.12.0-3.24470.11 From 89b5486a2ccf04cb9c602ba0fdd13aaafa4a2bb6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2024 13:08:08 +0000 Subject: [PATCH 38/90] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240923.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-rtm.24469.2 -> To Version 9.0.0-rtm.24473.2 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-rtm.24468.13 -> To Version 9.0.0-rtm.24472.2 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49cb034bb341..480446f537ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -250,26 +250,26 @@ https://github.com/dotnet/runtime 7832c5d3028cf206ab7faf4a889ee8ed34abee5c - + https://github.com/dotnet/windowsdesktop - 5e06552d5318ab7b40f822b961fb31f842ca1a25 + 888714c37e6d148775045771bd5c976ed1964b37 - + https://github.com/dotnet/windowsdesktop - 5e06552d5318ab7b40f822b961fb31f842ca1a25 + 888714c37e6d148775045771bd5c976ed1964b37 - + https://github.com/dotnet/windowsdesktop - 5e06552d5318ab7b40f822b961fb31f842ca1a25 + 888714c37e6d148775045771bd5c976ed1964b37 - + https://github.com/dotnet/windowsdesktop - 5e06552d5318ab7b40f822b961fb31f842ca1a25 + 888714c37e6d148775045771bd5c976ed1964b37 - + https://github.com/dotnet/wpf - a33e61012e2a56f01c67a981968d566d5ef459b1 + bf7ad4568c301e555ae022768f1b6c820c9d74bc https://github.com/dotnet/aspnetcore @@ -386,13 +386,13 @@ - + https://github.com/dotnet/winforms - 06f1d0a449929d172946782fd187e3b4591a855b + ed3e6c60a08cae482f78e5f31e87393a995bfbd4 - + https://github.com/dotnet/wpf - a33e61012e2a56f01c67a981968d566d5ef459b1 + bf7ad4568c301e555ae022768f1b6c820c9d74bc https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 118f74af2857..747af2e695a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 9.0.0-rtm.24468.6 + 9.0.0-rtm.24472.2 @@ -166,10 +166,10 @@ - 9.0.0-rtm.24469.2 - 9.0.0-rtm.24469.2 - 9.0.0-rtm.24469.2 - 9.0.0-rtm.24469.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 @@ -268,8 +268,8 @@ - 9.0.0-rtm.24468.13 - 9.0.0-rtm.24468.13 + 9.0.0-rtm.24472.2 + 9.0.0-rtm.24472.2 From a08a0b26df2193c0d94339c8d10ef5206a4468be Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 23 Sep 2024 09:13:09 -0500 Subject: [PATCH 39/90] Exclude false positive license ref for fsharp patch (#43623) --- .../assets/LicenseScanTests/LicenseExclusions.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt index 5e81d8c2fbaf..b324bfeab7a7 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/LicenseScanTests/LicenseExclusions.txt @@ -172,6 +172,7 @@ src/runtime/src/libraries/System.Text.Json/roadmap/images/higher-level-component # False positive src/sdk/THIRD-PARTY-NOTICES.TXT|unknown-license-reference +src/sdk/src/SourceBuild/patches/fsharp/0001-Fix17713-Reverting-PR-17649-Make-the-interaction-bet.patch|unknown-license-reference # Configuration, doesn't apply to source directly src/sdk/src/VirtualMonoRepo/THIRD-PARTY-NOTICES.template.txt From 2f3930ba723b65b3792d737f80ae7fe3081eccdb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2024 19:19:20 +0000 Subject: [PATCH 40/90] Update dependencies from https://github.com/dotnet/razor build 20240923.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.24469.1 -> To Version 9.0.0-preview.24473.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 e008511c8d90..437ff5b0ee1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/razor - c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e + fb7807621221702c10cfe6c2071b50c9294ae2e7 - + https://github.com/dotnet/razor - c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e + fb7807621221702c10cfe6c2071b50c9294ae2e7 - + https://github.com/dotnet/razor - c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e + fb7807621221702c10cfe6c2071b50c9294ae2e7 - + https://github.com/dotnet/razor - c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e + fb7807621221702c10cfe6c2071b50c9294ae2e7 diff --git a/eng/Versions.props b/eng/Versions.props index 7418f4bf550f..02175c6e0b65 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -262,9 +262,9 @@ - 9.0.0-preview.24469.1 - 9.0.0-preview.24469.1 - 9.0.0-preview.24469.1 + 9.0.0-preview.24473.1 + 9.0.0-preview.24473.1 + 9.0.0-preview.24473.1 From d2d9f340da63411e8387782c5567212767fd7a1c Mon Sep 17 00:00:00 2001 From: Wenwen <53243232+Winniexu01@users.noreply.github.com> Date: Mon, 23 Sep 2024 20:52:29 +0000 Subject: [PATCH 41/90] [release/9.0.1xx] Publish prebuilt reports for each repo (#43595) --- src/SourceBuild/content/Directory.Build.props | 3 ++- .../content/repo-projects/Directory.Build.targets | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 9b9e79c842f9..8ed26023229b 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -171,7 +171,8 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'prebuilt-report')) $([MSBuild]::NormalizeDirectory('$(PackageReportDir)', 'prebuilt-packages')) - + $([MSBuild]::NormalizeDirectory('$(PackageReportDir)', '$(MSBuildProjectName)')) + $([MSBuild]::NormalizeDirectory('$(SrcDir)', 'source-build-reference-packages', 'src')) $([MSBuild]::NormalizeDirectory('$(PrereqsPackagesDir)', 'reference')) Private.SourceBuilt.Artifacts diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index ccb25f46dcf8..e95aefe47f4c 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -511,6 +511,19 @@ Condition="'@(_InnerPackageCacheFiles)' != ''" /> + + + + + + + + + From db0ab23fc78391d60d7757b52e553c0b0e933e4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2024 20:52:46 +0000 Subject: [PATCH 42/90] Update dependencies from https://github.com/dotnet/razor build 20240923.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.24473.1 -> To Version 9.0.0-preview.24473.5 --- 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 437ff5b0ee1a..ed03594668cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/razor - fb7807621221702c10cfe6c2071b50c9294ae2e7 + f499c03e66f267eed2742a2e9c3a29e6cc18bcf9 - + https://github.com/dotnet/razor - fb7807621221702c10cfe6c2071b50c9294ae2e7 + f499c03e66f267eed2742a2e9c3a29e6cc18bcf9 - + https://github.com/dotnet/razor - fb7807621221702c10cfe6c2071b50c9294ae2e7 + f499c03e66f267eed2742a2e9c3a29e6cc18bcf9 - + https://github.com/dotnet/razor - fb7807621221702c10cfe6c2071b50c9294ae2e7 + f499c03e66f267eed2742a2e9c3a29e6cc18bcf9 diff --git a/eng/Versions.props b/eng/Versions.props index 02175c6e0b65..b66e1aad0c6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -262,9 +262,9 @@ - 9.0.0-preview.24473.1 - 9.0.0-preview.24473.1 - 9.0.0-preview.24473.1 + 9.0.0-preview.24473.5 + 9.0.0-preview.24473.5 + 9.0.0-preview.24473.5 From 4a0b003ca0f2bf357898ed2bcec5f04c3b57e646 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Sep 2024 22:24:31 +0000 Subject: [PATCH 43/90] Update dependencies from https://github.com/dotnet/razor build 20240923.6 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.24473.5 -> To Version 9.0.0-preview.24473.6 --- 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 ed03594668cc..26c50585e4f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/razor - f499c03e66f267eed2742a2e9c3a29e6cc18bcf9 + 3e0da42f82553178744daf61795b51326084251f - + https://github.com/dotnet/razor - f499c03e66f267eed2742a2e9c3a29e6cc18bcf9 + 3e0da42f82553178744daf61795b51326084251f - + https://github.com/dotnet/razor - f499c03e66f267eed2742a2e9c3a29e6cc18bcf9 + 3e0da42f82553178744daf61795b51326084251f - + https://github.com/dotnet/razor - f499c03e66f267eed2742a2e9c3a29e6cc18bcf9 + 3e0da42f82553178744daf61795b51326084251f diff --git a/eng/Versions.props b/eng/Versions.props index b66e1aad0c6c..55b0d501af98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -262,9 +262,9 @@ - 9.0.0-preview.24473.5 - 9.0.0-preview.24473.5 - 9.0.0-preview.24473.5 + 9.0.0-preview.24473.6 + 9.0.0-preview.24473.6 + 9.0.0-preview.24473.6 From 253cceaca80abdafff35fcb99dbcb4a75ad79426 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Sep 2024 23:47:02 +0000 Subject: [PATCH 44/90] [release/9.0.1xx] Update dependencies from dotnet/runtime (#43554) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Larry Ewing --- eng/Version.Details.xml | 148 ++++++++++++++++++++-------------------- eng/Versions.props | 74 ++++++++++---------- 2 files changed, 111 insertions(+), 111 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e008511c8d90..53986c298b9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ a23da1c15c737b5e121650cfa5a86805e74e34fc - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 @@ -59,14 +59,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - c3d83d0ea894e5ee537bfc591fd48e06af8d9166 + 8e660ff41e91879977e3a9d837e068bd72234c26 - + https://github.com/dotnet/emsdk - c3d83d0ea894e5ee537bfc591fd48e06af8d9166 + 8e660ff41e91879977e3a9d837e068bd72234c26 @@ -226,29 +226,29 @@ 07acde22b65497e72de145d57167b83609a7f7fb - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 https://github.com/dotnet/windowsdesktop @@ -499,89 +499,89 @@ - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 https://github.com/dotnet/aspnetcore c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 @@ -615,9 +615,9 @@ 04b9022eba9c184a8036328af513c22e6949e8b6 - + https://github.com/dotnet/runtime - 7832c5d3028cf206ab7faf4a889ee8ed34abee5c + 3d9da91a9720f7bda3e4cef127b8195441fb2580 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 7418f4bf550f..b770b42c0f90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -122,47 +122,47 @@ - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 8.0.0-rc.1.23414.4 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 2.1.0 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24473.2 8.0.0 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 8.0.0 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 8.0.4 - 9.0.0-rc.2.24466.12 - 9.0.0-rc.2.24466.12 + 9.0.0-rtm.24473.2 + 9.0.0-rtm.24473.2 @@ -360,14 +360,14 @@ 14.2.9714-net9-p6 17.2.9714-net9-p6 - 9.0.0-rc.2.24464.3 + 9.0.0-rtm.24469.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportPackageVersion) - 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) $(MicrosoftNETCoreAppRefPackageVersion) - 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-[A-z]*[\.]*\d*`)) + 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 876f6c0481f84a9f41d6c2876f5aee63a425ef11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Sep 2024 01:35:13 +0000 Subject: [PATCH 45/90] Update dependencies from https://github.com/nuget/nuget.client build 6.12.0.115 Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning From Version 6.12.0-rc.112 -> To Version 6.12.0-rc.115 --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33df6a8b3177..62ad402c43d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -139,74 +139,74 @@ https://github.com/dotnet/aspnetcore d962763e8e7d1efb409f9688d6dd7c87aab93b3d - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 - + https://github.com/nuget/nuget.client - 502e691d67590946d0a4765a25f1da2b6d6c32fc + 378e8d0ac789cb47df720849986bb26ce6690c66 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 1081121eae50..f6a13d4e5618 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -173,18 +173,18 @@ - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 - 6.12.0-rc.112 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 + 6.12.0-rc.115 From 0ff915e5b936ef2182ef5ece5580f23841f76996 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 04:01:21 +0000 Subject: [PATCH 46/90] [release/9.0.1xx] Update dependencies from dotnet/aspnetcore (#43630) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Larry Ewing --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53986c298b9c..c70c720b9491 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn f869d0f8a872875a46ba9fe23c67b04eb5519c2e - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 https://github.com/nuget/nuget.client @@ -271,54 +271,54 @@ https://github.com/dotnet/wpf d8b93d9e0c5ca81cfae3ff691824c3cdef74f5b3 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 @@ -339,21 +339,21 @@ c2bff15ca1c61c9859b88cf455944dd6f5a3ab1e - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 https://github.com/dotnet/test-templates @@ -535,9 +535,9 @@ https://github.com/dotnet/runtime 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/aspnetcore - c68cfd0f718c3991e3c38b6f913f17f4b8d0b169 + 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b770b42c0f90..8d20787c3feb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -246,19 +246,19 @@ - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 - 9.0.0-rtm.24470.3 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.4 From bc1fef7f42f639463e2256e2f735667ffa34950f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Sep 2024 06:25:10 +0000 Subject: [PATCH 47/90] Update dependencies from https://github.com/dotnet/aspnetcore build 20240923.16 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.0-rtm.24473.4 -> To Version 9.0.0-rtm.24473.16 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0203251d6943..040958ee0695 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 https://github.com/nuget/nuget.client @@ -271,54 +271,54 @@ https://github.com/dotnet/wpf bf7ad4568c301e555ae022768f1b6c820c9d74bc - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 @@ -339,21 +339,21 @@ 3e0da42f82553178744daf61795b51326084251f - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 https://github.com/dotnet/test-templates @@ -535,9 +535,9 @@ https://github.com/dotnet/runtime 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/aspnetcore - 6bbc4f132a46f0ad5ec931708badb9b1256ecb51 + 91ef755ae08f27b395d73be00d245d8095f90143 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c7915a1d826f..6d13da9ea161 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -246,19 +246,19 @@ - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 - 9.0.0-rtm.24473.4 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 + 9.0.0-rtm.24473.16 From af906b0cf1d5a507b662bedeca1d26ae0b53ea11 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 24 Sep 2024 08:48:19 +0000 Subject: [PATCH 48/90] [release/9.0.1xx] Update dependencies from dotnet/aspire (#43632) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Larry Ewing --- NuGet.config | 4 ++-- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index a419e73e558e..b20333c22218 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 040958ee0695..8b46618476eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -646,14 +646,14 @@ aren't shipping, or those extensions packages depend on aspnetcore packages that won't ship. However, given the cost of maintaining this coherency path is high. This being toolset means that aspire is responsible for its own coherency. --> - + https://github.com/dotnet/aspire - 75fdcff28495bdd643f6323133a7d411df71ab70 + 137e8dcae0a7b22c05f48c4e7a5d36fe3f00a8d7 - + https://github.com/dotnet/aspire - 75fdcff28495bdd643f6323133a7d411df71ab70 + 137e8dcae0a7b22c05f48c4e7a5d36fe3f00a8d7 diff --git a/eng/Versions.props b/eng/Versions.props index 6d13da9ea161..3b0bf7a06ff9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -351,7 +351,7 @@ 8.0.100 - 8.2.0 + 8.2.1 9.0.100-preview.6 9.0.0-preview.6.24327.7 34.99.0-preview.6.340 From fff5caf258b368db0f5d80380783954641f91eae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Sep 2024 09:40:31 +0000 Subject: [PATCH 49/90] Update dependencies from https://github.com/dotnet/test-templates build 20240924.1 Microsoft.SourceBuild.Intermediate.test-templates , Microsoft.DotNet.Test.ProjectTemplates.9.0 From Version 1.1.0-rc.24463.2 -> To Version 1.1.0-rc.24474.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 8b46618476eb..02835807dfc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -375,14 +375,14 @@ https://github.com/dotnet/test-templates 49c9ad01f057b3c6352bbec12b117acc2224493c - + https://github.com/dotnet/test-templates - 2b8a55f3d3f380ae10d2c2f4d0974c92727ccc22 + 743a517a123a8616389eb6726ec9835a3a1a3876 - + https://github.com/dotnet/test-templates - 2b8a55f3d3f380ae10d2c2f4d0974c92727ccc22 + 743a517a123a8616389eb6726ec9835a3a1a3876 diff --git a/eng/Versions.props b/eng/Versions.props index 3b0bf7a06ff9..b02a30b69119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -118,7 +118,7 @@ 1.1.0-rc.24069.1 1.1.0-rc.24202.1 - 1.1.0-rc.24463.2 + 1.1.0-rc.24474.1 From 650ce5c55f2161d26f217a39bc23dadd0a7d7c1f Mon Sep 17 00:00:00 2001 From: ".NET Source-Build Bot" <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 24 Sep 2024 07:39:51 -0500 Subject: [PATCH 50/90] Update Source-Build SDK Diff Tests Baselines and Exclusions (#43646) --- .../assets/SdkContentTests/MsftToSbSdkFiles.diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/MsftToSbSdkFiles.diff index 8cd6f6c82125..75b77d3c30c3 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/MsftToSbSdkFiles.diff @@ -45,7 +45,7 @@ index ------------ ./packs/Microsoft.NETCore.App.Ref/x.y.z/ ./packs/Microsoft.NETCore.App.Ref/x.y.z/analyzers/ @@ ------------ @@ - ./sdk-manifests/ + ./sdk-manifests/x.y.z/ ./sdk-manifests/x.y.z/ ./sdk-manifests/x.y.z/ -./sdk-manifests/x.y.z/ From a701099b835d571b14b08cfd99db2484dd99bf87 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Sep 2024 13:06:30 +0000 Subject: [PATCH 51/90] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240924.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-rtm.24473.2 -> To Version 9.0.0-rtm.24474.3 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-rtm.24472.2 -> To Version 9.0.0-rtm.24474.2 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f820031b7a15..a539c6de0281 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -250,26 +250,26 @@ https://github.com/dotnet/runtime 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/windowsdesktop - 888714c37e6d148775045771bd5c976ed1964b37 + 57551fefff8b0b52e85d7f58df6d8b5d3c0b27b4 - + https://github.com/dotnet/windowsdesktop - 888714c37e6d148775045771bd5c976ed1964b37 + 57551fefff8b0b52e85d7f58df6d8b5d3c0b27b4 - + https://github.com/dotnet/windowsdesktop - 888714c37e6d148775045771bd5c976ed1964b37 + 57551fefff8b0b52e85d7f58df6d8b5d3c0b27b4 - + https://github.com/dotnet/windowsdesktop - 888714c37e6d148775045771bd5c976ed1964b37 + 57551fefff8b0b52e85d7f58df6d8b5d3c0b27b4 - + https://github.com/dotnet/wpf - bf7ad4568c301e555ae022768f1b6c820c9d74bc + 72a11989cac5121368087ae8bfac9c09d0a167d5 https://github.com/dotnet/aspnetcore @@ -386,13 +386,13 @@ - + https://github.com/dotnet/winforms - ed3e6c60a08cae482f78e5f31e87393a995bfbd4 + aad987c286a32e55b00ffc62387a2774f0f9fc3e - + https://github.com/dotnet/wpf - bf7ad4568c301e555ae022768f1b6c820c9d74bc + 72a11989cac5121368087ae8bfac9c09d0a167d5 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 005764dbb769..79fc2ce6625b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 9.0.0-rtm.24472.2 + 9.0.0-rtm.24473.2 @@ -166,10 +166,10 @@ - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 - 9.0.0-rtm.24473.2 + 9.0.0-rtm.24474.3 + 9.0.0-rtm.24474.3 + 9.0.0-rtm.24474.3 + 9.0.0-rtm.24474.3 @@ -268,8 +268,8 @@ - 9.0.0-rtm.24472.2 - 9.0.0-rtm.24472.2 + 9.0.0-rtm.24474.2 + 9.0.0-rtm.24474.2 From 7c4b69a43f7ed81cba134f4bb5401f141faaf505 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Sep 2024 13:30:32 +0000 Subject: [PATCH 52/90] Update dependencies from https://github.com/dotnet/roslyn build 20240923.3 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.12.0-3.24470.11 -> To Version 4.12.0-3.24473.3 --- 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 f820031b7a15..35fa167c070d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 3044166cd923167204853d1d9f975bc26864f86f - + https://github.com/dotnet/roslyn - 54fd790788b03c256f736c917fc368daf0a643db + 5ef52ae33a88c3ae0d3a037054cb66ea7eaaf902 - + https://github.com/dotnet/roslyn - 54fd790788b03c256f736c917fc368daf0a643db + 5ef52ae33a88c3ae0d3a037054cb66ea7eaaf902 - + https://github.com/dotnet/roslyn - 54fd790788b03c256f736c917fc368daf0a643db + 5ef52ae33a88c3ae0d3a037054cb66ea7eaaf902 - + https://github.com/dotnet/roslyn - 54fd790788b03c256f736c917fc368daf0a643db + 5ef52ae33a88c3ae0d3a037054cb66ea7eaaf902 - + https://github.com/dotnet/roslyn - 54fd790788b03c256f736c917fc368daf0a643db + 5ef52ae33a88c3ae0d3a037054cb66ea7eaaf902 - + https://github.com/dotnet/roslyn - 54fd790788b03c256f736c917fc368daf0a643db + 5ef52ae33a88c3ae0d3a037054cb66ea7eaaf902 - + https://github.com/dotnet/roslyn - 54fd790788b03c256f736c917fc368daf0a643db + 5ef52ae33a88c3ae0d3a037054cb66ea7eaaf902 - + https://github.com/dotnet/roslyn - 54fd790788b03c256f736c917fc368daf0a643db + 5ef52ae33a88c3ae0d3a037054cb66ea7eaaf902 - + https://github.com/dotnet/roslyn - 54fd790788b03c256f736c917fc368daf0a643db + 5ef52ae33a88c3ae0d3a037054cb66ea7eaaf902 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 005764dbb769..c841c193f6b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,14 +235,14 @@ - 4.12.0-3.24470.11 - 4.12.0-3.24470.11 - 4.12.0-3.24470.11 - 4.12.0-3.24470.11 - 4.12.0-3.24470.11 - 4.12.0-3.24470.11 - 4.12.0-3.24470.11 - 4.12.0-3.24470.11 + 4.12.0-3.24473.3 + 4.12.0-3.24473.3 + 4.12.0-3.24473.3 + 4.12.0-3.24473.3 + 4.12.0-3.24473.3 + 4.12.0-3.24473.3 + 4.12.0-3.24473.3 + 4.12.0-3.24473.3 From 176534d73cfd89cbdba146e3569a48b864e786d8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Sep 2024 13:32:49 +0000 Subject: [PATCH 53/90] Update dependencies from https://github.com/dotnet/sourcelink build 20240923.2 Microsoft.SourceBuild.Intermediate.sourcelink , Microsoft.Build.Tasks.Git , Microsoft.SourceLink.AzureRepos.Git , Microsoft.SourceLink.Bitbucket.Git , Microsoft.SourceLink.Common , Microsoft.SourceLink.GitHub , Microsoft.SourceLink.GitLab From Version 9.0.0-beta.24468.2 -> To Version 9.0.0-beta.24473.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f820031b7a15..3b99c7c9f4e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -456,34 +456,34 @@ https://github.com/dotnet/deployment-tools 7871ee378dce87b64d930d4f33dca9c888f4034d - + https://github.com/dotnet/sourcelink - 662c0bb1272e078747775d549bbf45e27faa9030 + 402965a6a951fd19f0055ba8174deb3d0c17501f - + https://github.com/dotnet/sourcelink - 662c0bb1272e078747775d549bbf45e27faa9030 + 402965a6a951fd19f0055ba8174deb3d0c17501f - + https://github.com/dotnet/sourcelink - 662c0bb1272e078747775d549bbf45e27faa9030 + 402965a6a951fd19f0055ba8174deb3d0c17501f - + https://github.com/dotnet/sourcelink - 662c0bb1272e078747775d549bbf45e27faa9030 + 402965a6a951fd19f0055ba8174deb3d0c17501f - + https://github.com/dotnet/sourcelink - 662c0bb1272e078747775d549bbf45e27faa9030 + 402965a6a951fd19f0055ba8174deb3d0c17501f - + https://github.com/dotnet/sourcelink - 662c0bb1272e078747775d549bbf45e27faa9030 + 402965a6a951fd19f0055ba8174deb3d0c17501f - + https://github.com/dotnet/sourcelink - 662c0bb1272e078747775d549bbf45e27faa9030 + 402965a6a951fd19f0055ba8174deb3d0c17501f diff --git a/eng/Versions.props b/eng/Versions.props index 005764dbb769..c338f2c866fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -320,12 +320,12 @@ - 9.0.0-beta.24468.2 - 9.0.0-beta.24468.2 - 9.0.0-beta.24468.2 - 9.0.0-beta.24468.2 - 9.0.0-beta.24468.2 - 9.0.0-beta.24468.2 + 9.0.0-beta.24473.2 + 9.0.0-beta.24473.2 + 9.0.0-beta.24473.2 + 9.0.0-beta.24473.2 + 9.0.0-beta.24473.2 + 9.0.0-beta.24473.2 From b73e17cf90633927ba38d323c8325e4b6cbf6ed5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Sep 2024 13:42:37 +0000 Subject: [PATCH 54/90] Update dependencies from https://github.com/dotnet/arcade build 20240923.1 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.24466.2 -> To Version 9.0.0-beta.24473.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f820031b7a15..f37a478a4733 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -585,34 +585,34 @@ - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 - + https://github.com/dotnet/arcade - 04b9022eba9c184a8036328af513c22e6949e8b6 + 1230437de1ab7b3e15fe7cdfe7ffce2f65449959 diff --git a/eng/Versions.props b/eng/Versions.props index 005764dbb769..1b4a6c263773 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -313,10 +313,10 @@ - 9.0.0-beta.24466.2 - 9.0.0-beta.24466.2 - 9.0.0-beta.24466.2 - 9.0.0-beta.24466.2 + 9.0.0-beta.24473.1 + 9.0.0-beta.24473.1 + 9.0.0-beta.24473.1 + 9.0.0-beta.24473.1 diff --git a/global.json b/global.json index c2dd7c515dd0..3581b41bfa75 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24466.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24473.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24473.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 664e08a66a22608c800c591faeca3805e20967a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Sep 2024 14:53:33 +0000 Subject: [PATCH 55/90] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240924.6 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-rtm.24474.3 -> To Version 9.0.0-rtm.24474.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a539c6de0281..3a332f326ad6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -250,22 +250,22 @@ https://github.com/dotnet/runtime 3d9da91a9720f7bda3e4cef127b8195441fb2580 - + https://github.com/dotnet/windowsdesktop - 57551fefff8b0b52e85d7f58df6d8b5d3c0b27b4 + 8d5fdbe583bf7242d461de79b659d5e4d3140587 - + https://github.com/dotnet/windowsdesktop - 57551fefff8b0b52e85d7f58df6d8b5d3c0b27b4 + 8d5fdbe583bf7242d461de79b659d5e4d3140587 - + https://github.com/dotnet/windowsdesktop - 57551fefff8b0b52e85d7f58df6d8b5d3c0b27b4 + 8d5fdbe583bf7242d461de79b659d5e4d3140587 - + https://github.com/dotnet/windowsdesktop - 57551fefff8b0b52e85d7f58df6d8b5d3c0b27b4 + 8d5fdbe583bf7242d461de79b659d5e4d3140587 https://github.com/dotnet/wpf diff --git a/eng/Versions.props b/eng/Versions.props index 79fc2ce6625b..30524e0fcfdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,10 +166,10 @@ - 9.0.0-rtm.24474.3 - 9.0.0-rtm.24474.3 - 9.0.0-rtm.24474.3 - 9.0.0-rtm.24474.3 + 9.0.0-rtm.24474.6 + 9.0.0-rtm.24474.6 + 9.0.0-rtm.24474.6 + 9.0.0-rtm.24474.6 From a1b2cf8e2f855ebedeba0cabde38de1fc788a571 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Sep 2024 19:16:37 +0000 Subject: [PATCH 56/90] Update dependencies from https://github.com/dotnet/aspnetcore build 20240924.5 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.0-rtm.24473.16 -> To Version 9.0.0-rtm.24474.5 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f820031b7a15..b6ac65da1326 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn 54fd790788b03c256f736c917fc368daf0a643db - + https://github.com/dotnet/aspnetcore - 91ef755ae08f27b395d73be00d245d8095f90143 + 3ec8cf70d221a16a7a3b0b4eb5da54f75ad2d75a - + https://github.com/dotnet/aspnetcore - 91ef755ae08f27b395d73be00d245d8095f90143 + 3ec8cf70d221a16a7a3b0b4eb5da54f75ad2d75a https://github.com/nuget/nuget.client @@ -271,54 +271,54 @@ https://github.com/dotnet/wpf bf7ad4568c301e555ae022768f1b6c820c9d74bc - + https://github.com/dotnet/aspnetcore - 91ef755ae08f27b395d73be00d245d8095f90143 + 3ec8cf70d221a16a7a3b0b4eb5da54f75ad2d75a - + https://github.com/dotnet/aspnetcore - 91ef755ae08f27b395d73be00d245d8095f90143 + 3ec8cf70d221a16a7a3b0b4eb5da54f75ad2d75a - + https://github.com/dotnet/aspnetcore - 91ef755ae08f27b395d73be00d245d8095f90143 + 3ec8cf70d221a16a7a3b0b4eb5da54f75ad2d75a - + https://github.com/dotnet/aspnetcore - 91ef755ae08f27b395d73be00d245d8095f90143 + 3ec8cf70d221a16a7a3b0b4eb5da54f75ad2d75a - + - + - + -