From 9129bca2607ca649ffd8aabf7e07e21acb10dc5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Sep 2023 18:56:08 +0000 Subject: [PATCH 01/13] Update dependencies from https://github.com/dotnet/roslyn build 20230915.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23465.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a72c009e8d58d..d5933059969687 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -362,18 +362,18 @@ https://github.com/dotnet/runtime-assets b7d8e946c831e79435054f65e49c2eebb74b55c6 - + https://github.com/dotnet/roslyn - 1b7a6f807cb8ce709048debae6b771f4705a697a + 8501bd1c28033be002cedd983cf1ff29186749a3 - + https://github.com/dotnet/roslyn - 1b7a6f807cb8ce709048debae6b771f4705a697a + 8501bd1c28033be002cedd983cf1ff29186749a3 - + https://github.com/dotnet/roslyn - 1b7a6f807cb8ce709048debae6b771f4705a697a + 8501bd1c28033be002cedd983cf1ff29186749a3 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 956305d19c0fcc..628f51400703ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,9 +39,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.8.0-3.23462.10 - 4.8.0-3.23462.10 - 4.8.0-3.23462.10 + 4.8.0-3.23465.1 + 4.8.0-3.23465.1 + 4.8.0-3.23465.1 - 4.8.0-3.23465.1 - 4.8.0-3.23465.1 - 4.8.0-3.23465.1 + 4.8.0-3.23465.2 + 4.8.0-3.23465.2 + 4.8.0-3.23465.2 - 4.8.0-3.23465.2 - 4.8.0-3.23465.2 - 4.8.0-3.23465.2 + 4.8.0-3.23465.4 + 4.8.0-3.23465.4 + 4.8.0-3.23465.4 - 4.8.0-3.23465.4 - 4.8.0-3.23465.4 - 4.8.0-3.23465.4 + 4.8.0-3.23465.5 + 4.8.0-3.23465.5 + 4.8.0-3.23465.5 SYSLIB1100,SYSLIB1101 - $(Features);InterceptorsPreview + $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index a1c067c26033bb..6a47f428ea7e5d 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -3,7 +3,7 @@ $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true - $(Features);InterceptorsPreview + $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true true Configuration support for Microsoft.Extensions.Logging. diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index 7f1d6e569eee97..b2a074bfbb539f 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -7,7 +7,7 @@ $(DefineConstants);NO_SUPPRESS_GC_TRANSITION true true - $(Features);InterceptorsPreview + $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true true Console logger provider implementation for Microsoft.Extensions.Logging. diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj index f08d2bd649bc3f..e5f19ac31e2698 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj @@ -3,7 +3,7 @@ enable $(NetCoreAppCurrent);$(NetFrameworkMinimum) $(DefineConstants);BUILDING_SOURCE_GENERATOR_TESTS;ROSLYN4_0_OR_GREATER;ROSLYN4_4_OR_GREATER - $(Features);InterceptorsPreview + $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true true From beb3824e3579c426b36be58ef2cc053d19778634 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Sep 2023 20:55:51 +0000 Subject: [PATCH 06/13] Update dependencies from https://github.com/dotnet/roslyn build 20230918.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23468.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5e9b074122a8e..0f6346f132dd1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -362,18 +362,18 @@ https://github.com/dotnet/runtime-assets b7d8e946c831e79435054f65e49c2eebb74b55c6 - + https://github.com/dotnet/roslyn - dc3d0694a4b31b8e27038431888cd4e8dd5b6cb6 + ce677a52cd2093e772c83a92ffd1ee1cb7975c2e - + https://github.com/dotnet/roslyn - dc3d0694a4b31b8e27038431888cd4e8dd5b6cb6 + ce677a52cd2093e772c83a92ffd1ee1cb7975c2e - + https://github.com/dotnet/roslyn - dc3d0694a4b31b8e27038431888cd4e8dd5b6cb6 + ce677a52cd2093e772c83a92ffd1ee1cb7975c2e https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 3ca38d0f8a3d77..41f29c238df840 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,9 +39,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.8.0-3.23465.5 - 4.8.0-3.23465.5 - 4.8.0-3.23465.5 + 4.8.0-3.23468.1 + 4.8.0-3.23468.1 + 4.8.0-3.23468.1 SYSLIB1100,SYSLIB1101 + $(Features);InterceptorsPreview $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index 6a47f428ea7e5d..df24b0d8d8014e 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -3,6 +3,7 @@ $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true + $(Features);InterceptorsPreview $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true true diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index b2a074bfbb539f..bfd7573ebf9007 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -7,6 +7,7 @@ $(DefineConstants);NO_SUPPRESS_GC_TRANSITION true true + $(Features);InterceptorsPreview $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true true diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj index e5f19ac31e2698..01d1ca91ed122c 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj @@ -3,6 +3,7 @@ enable $(NetCoreAppCurrent);$(NetFrameworkMinimum) $(DefineConstants);BUILDING_SOURCE_GENERATOR_TESTS;ROSLYN4_0_OR_GREATER;ROSLYN4_4_OR_GREATER + $(Features);InterceptorsPreview $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true true From b9d9ecc710db9750ba9d0557ea7739f124f68a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:19:52 -0700 Subject: [PATCH 10/13] Add CSharpParseOption InterceptorsPreviewNamespaces feature to GeneratorTests.Helpers.cs --- .../tests/SourceGenerationTests/GeneratorTests.Helpers.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Helpers.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Helpers.cs index c7b3b3a3281760..7079d933b53354 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Helpers.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.Helpers.cs @@ -132,7 +132,10 @@ private static async Task VerifyAgainstBaselineUsingFile( IEnumerable? references = null) { using var workspace = RoslynTestUtils.CreateTestWorkspace(); - CSharpParseOptions parseOptions = new CSharpParseOptions(langVersion).WithFeatures(new[] { new KeyValuePair("InterceptorsPreview", "") }); + CSharpParseOptions parseOptions = new CSharpParseOptions(langVersion).WithFeatures(new[] { + new KeyValuePair("InterceptorsPreview", ""), + new KeyValuePair("InterceptorsPreviewNamespaces", "Microsoft.Extensions.Configuration.Binder.SourceGeneration") + }); Project proj = RoslynTestUtils.CreateTestProject(workspace, references ?? s_compilationAssemblyRefs, langVersion: langVersion) .WithCompilationOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary).WithNullableContextOptions(NullableContextOptions.Annotations)) From 6013e07d6179e5083c9001d76f55beeac2a62a6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20S=C3=A1nchez=20L=C3=B3pez?= <1175054+carlossanlop@users.noreply.github.com> Date: Mon, 18 Sep 2023 16:29:17 -0700 Subject: [PATCH 11/13] Add TODO comment to remove feature --- ...Extensions.Configuration.Binder.SourceGeneration.Tests.csproj | 1 + .../src/Microsoft.Extensions.Logging.Configuration.csproj | 1 + .../src/Microsoft.Extensions.Logging.Console.csproj | 1 + ...Options.ConfigurationExtensions.SourceGeneration.Tests.csproj | 1 + 4 files changed, 4 insertions(+) diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj index 71dfad6bfd2635..fc8db157eddeea 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Microsoft.Extensions.Configuration.Binder.SourceGeneration.Tests.csproj @@ -5,6 +5,7 @@ SYSLIB1100,SYSLIB1101 $(Features);InterceptorsPreview + $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true diff --git a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj index df24b0d8d8014e..42a9022b55cc50 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Configuration/src/Microsoft.Extensions.Logging.Configuration.csproj @@ -4,6 +4,7 @@ $(NetCoreAppCurrent);$(NetCoreAppPrevious);$(NetCoreAppMinimum);netstandard2.0;$(NetFrameworkMinimum) true $(Features);InterceptorsPreview + $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true true diff --git a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj index bfd7573ebf9007..8ae9d3eaa61cf4 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Console/src/Microsoft.Extensions.Logging.Console.csproj @@ -8,6 +8,7 @@ true true $(Features);InterceptorsPreview + $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true true diff --git a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj index 01d1ca91ed122c..2bdacc95ff39e6 100644 --- a/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Options.ConfigurationExtensions/tests/SourceGenerationTests/Microsoft.Extensions.Options.ConfigurationExtensions.SourceGeneration.Tests.csproj @@ -4,6 +4,7 @@ $(NetCoreAppCurrent);$(NetFrameworkMinimum) $(DefineConstants);BUILDING_SOURCE_GENERATOR_TESTS;ROSLYN4_0_OR_GREATER;ROSLYN4_4_OR_GREATER $(Features);InterceptorsPreview + $(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration true true From b95fdc9275544dac5482e107412da91fc4ff515c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Sep 2023 01:48:53 +0000 Subject: [PATCH 12/13] Update dependencies from https://github.com/dotnet/roslyn build 20230918.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.Net.Compilers.Toolset From Version 4.8.0-3.23462.10 -> To Version 4.8.0-3.23468.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f6346f132dd1b..dbfccc9380f0e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -362,18 +362,18 @@ https://github.com/dotnet/runtime-assets b7d8e946c831e79435054f65e49c2eebb74b55c6 - + https://github.com/dotnet/roslyn - ce677a52cd2093e772c83a92ffd1ee1cb7975c2e + 944af087e39c306bfea2b9f86a8e789370d3a088 - + https://github.com/dotnet/roslyn - ce677a52cd2093e772c83a92ffd1ee1cb7975c2e + 944af087e39c306bfea2b9f86a8e789370d3a088 - + https://github.com/dotnet/roslyn - ce677a52cd2093e772c83a92ffd1ee1cb7975c2e + 944af087e39c306bfea2b9f86a8e789370d3a088 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 41f29c238df840..82f758740b0713 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,9 +39,9 @@ Any tools that contribute to the design-time experience should use the MicrosoftCodeAnalysisVersion_LatestVS property above to ensure they do not break the local dev experience. --> - 4.8.0-3.23468.1 - 4.8.0-3.23468.1 - 4.8.0-3.23468.1 + 4.8.0-3.23468.3 + 4.8.0-3.23468.3 + 4.8.0-3.23468.3 - 4.8.0-3.23468.3 - 4.8.0-3.23468.3 - 4.8.0-3.23468.3 + 4.8.0-3.23468.4 + 4.8.0-3.23468.4 + 4.8.0-3.23468.4