From 7c19e606881bf8ca2ba50eb4ae5d4f941326b879 Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Tue, 29 Aug 2023 18:04:27 -0700
Subject: [PATCH 1/2] Move to granular opt-in for interceptors preview

---
 .../GivenThatWeWantToUseAnalyzers.cs             | 16 ++++++++--------
 .../Microsoft.NET.Sdk.Web.ProjectSystem.targets  | 10 +++++++---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs
index 30f806645b6b..e83fb8126800 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs
@@ -28,7 +28,7 @@ public void It_resolves_requestdelegategenerator_correctly(string testAssetName,
                 });
 
             VerifyRequestDelegateGeneratorIsUsed(asset, isEnabled);
-            VerifyInterceptorsFeatureEnabled(asset, isEnabled);
+            VerifyInterceptorsFeatureEnabled(asset, isEnabled, "Microsoft.AspNetCore.Http.Generated");
         }
 
         [Theory]
@@ -50,7 +50,7 @@ public void It_resolves_configbindinggenerator_correctly(string testAssetName, b
                 });
 
             VerifyConfigBindingGeneratorIsUsed(asset, isEnabled);
-            VerifyInterceptorsFeatureEnabled(asset, isEnabled);
+            VerifyInterceptorsFeatureEnabled(asset, isEnabled, "Microsoft.Extensions.Configuration.Binder.SourceGeneration");
         }
 
         [Fact]
@@ -67,7 +67,7 @@ public void It_enables_requestdelegategenerator_and_configbindinggenerator_for_P
 
             VerifyRequestDelegateGeneratorIsUsed(asset, expectEnabled: true);
             VerifyConfigBindingGeneratorIsUsed(asset, expectEnabled: true);
-            VerifyInterceptorsFeatureEnabled(asset, expectEnabled: true);
+            VerifyInterceptorsFeatureEnabled(asset, expectEnabled: true, "Microsoft.AspNetCore.Http.Generated", "Microsoft.Extensions.Configuration.Binder.SourceGeneration");
         }
 
         [Fact]
@@ -84,7 +84,7 @@ public void It_enables_requestdelegategenerator_and_configbindinggenerator_for_P
 
             VerifyRequestDelegateGeneratorIsUsed(asset, expectEnabled: true);
             VerifyConfigBindingGeneratorIsUsed(asset, expectEnabled: true);
-            VerifyInterceptorsFeatureEnabled(asset, expectEnabled: true);
+            VerifyInterceptorsFeatureEnabled(asset, expectEnabled: true, "Microsoft.AspNetCore.Http.Generated", "Microsoft.Extensions.Configuration.Binder.SourceGeneration");
         }
 
         private void VerifyGeneratorIsUsed(TestAsset asset, bool? expectEnabled, string generatorName)
@@ -112,13 +112,13 @@ private void VerifyRequestDelegateGeneratorIsUsed(TestAsset asset, bool? expectE
         private void VerifyConfigBindingGeneratorIsUsed(TestAsset asset, bool? expectEnabled)
             => VerifyGeneratorIsUsed(asset, expectEnabled, "Microsoft.Extensions.Configuration.Binder.SourceGeneration.dll");
 
-        private void VerifyInterceptorsFeatureEnabled(TestAsset asset, bool? expectEnabled)
+        private void VerifyInterceptorsFeatureEnabled(TestAsset asset, bool? expectEnabled, params string[] expectedNamespaces)
         {
             var command = new GetValuesCommand(
                 Log,
                 asset.Path,
                 ToolsetInfo.CurrentTargetFramework,
-                "Features",
+                "InterceptorsPreviewNamespaces",
                 GetValuesCommand.ValueType.Property);
 
             command
@@ -126,9 +126,9 @@ private void VerifyInterceptorsFeatureEnabled(TestAsset asset, bool? expectEnabl
                 .Execute()
                 .Should().Pass();
 
-            var features = command.GetValues();
+            var namespaces = command.GetValues();
 
-            Assert.Equal(expectEnabled ?? false, features.Any(feature => feature.Contains("InterceptorsPreview")));
+            Assert.Equal(expectEnabled ?? false, expectedNamespaces.All(expectedNamespace => namespaces.Contains(expectedNamespace)));
         }
 
         [Theory]
diff --git a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets
index dc9cffe58d30..53230142ff10 100644
--- a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets
+++ b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets
@@ -59,9 +59,13 @@ Copyright (c) .NET Foundation. All rights reserved.
     <EnableConfigurationBindingGenerator Condition="'$(EnableConfigurationBindingGenerator)' == ''">true</EnableConfigurationBindingGenerator>
   </PropertyGroup>
 
-  <!-- Enable the interceptors compiler feature by default for projects that use the RequestDelegateGenerator or the ConfigurationBindingGenerator. -->
-  <PropertyGroup Condition="'$(EnableRequestDelegateGenerator)' == 'true' Or '$(EnableConfigurationBindingGenerator)' == 'true'">
-    <Features>$(Features);InterceptorsPreview</Features>
+  <!-- Set the namespaces emitted by the RequestDelegateGenerator for interception when applicable. -->
+  <PropertyGroup Condition="'$(EnableRequestDelegateGenerator)' == 'true'">
+    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated</InterceptorsPreviewNamespaces>
+  </PropertyGroup>
+  <!-- Set the namespaces emitted by the ConfigurationBindingGenerator for interception when applicable. -->
+  <PropertyGroup Condition="'$(EnableConfigurationBindingGenerator)' == 'true'">
+    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
   </PropertyGroup>
 
   <!--

From 94cf4bc2d85c3f8962aadaf19e95121bb28e4e18 Mon Sep 17 00:00:00 2001
From: Safia Abdalla <safia@safia.rocks>
Date: Tue, 5 Sep 2023 13:47:20 -0700
Subject: [PATCH 2/2] Address feedback

---
 .../GivenThatWeWantToUseAnalyzers.cs                 | 10 +++++-----
 .../Microsoft.NET.Sdk.Web.ProjectSystem.targets      | 12 +++++-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs
index e83fb8126800..986d7873a357 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToUseAnalyzers.cs
@@ -28,7 +28,7 @@ public void It_resolves_requestdelegategenerator_correctly(string testAssetName,
                 });
 
             VerifyRequestDelegateGeneratorIsUsed(asset, isEnabled);
-            VerifyInterceptorsFeatureEnabled(asset, isEnabled, "Microsoft.AspNetCore.Http.Generated");
+            VerifyInterceptorsFeatureProperties(asset, isEnabled, "Microsoft.AspNetCore.Http.Generated");
         }
 
         [Theory]
@@ -50,7 +50,7 @@ public void It_resolves_configbindinggenerator_correctly(string testAssetName, b
                 });
 
             VerifyConfigBindingGeneratorIsUsed(asset, isEnabled);
-            VerifyInterceptorsFeatureEnabled(asset, isEnabled, "Microsoft.Extensions.Configuration.Binder.SourceGeneration");
+            VerifyInterceptorsFeatureProperties(asset, isEnabled, "Microsoft.Extensions.Configuration.Binder.SourceGeneration");
         }
 
         [Fact]
@@ -67,7 +67,7 @@ public void It_enables_requestdelegategenerator_and_configbindinggenerator_for_P
 
             VerifyRequestDelegateGeneratorIsUsed(asset, expectEnabled: true);
             VerifyConfigBindingGeneratorIsUsed(asset, expectEnabled: true);
-            VerifyInterceptorsFeatureEnabled(asset, expectEnabled: true, "Microsoft.AspNetCore.Http.Generated", "Microsoft.Extensions.Configuration.Binder.SourceGeneration");
+            VerifyInterceptorsFeatureProperties(asset, expectEnabled: true, "Microsoft.AspNetCore.Http.Generated", "Microsoft.Extensions.Configuration.Binder.SourceGeneration");
         }
 
         [Fact]
@@ -84,7 +84,7 @@ public void It_enables_requestdelegategenerator_and_configbindinggenerator_for_P
 
             VerifyRequestDelegateGeneratorIsUsed(asset, expectEnabled: true);
             VerifyConfigBindingGeneratorIsUsed(asset, expectEnabled: true);
-            VerifyInterceptorsFeatureEnabled(asset, expectEnabled: true, "Microsoft.AspNetCore.Http.Generated", "Microsoft.Extensions.Configuration.Binder.SourceGeneration");
+            VerifyInterceptorsFeatureProperties(asset, expectEnabled: true, "Microsoft.AspNetCore.Http.Generated", "Microsoft.Extensions.Configuration.Binder.SourceGeneration");
         }
 
         private void VerifyGeneratorIsUsed(TestAsset asset, bool? expectEnabled, string generatorName)
@@ -112,7 +112,7 @@ private void VerifyRequestDelegateGeneratorIsUsed(TestAsset asset, bool? expectE
         private void VerifyConfigBindingGeneratorIsUsed(TestAsset asset, bool? expectEnabled)
             => VerifyGeneratorIsUsed(asset, expectEnabled, "Microsoft.Extensions.Configuration.Binder.SourceGeneration.dll");
 
-        private void VerifyInterceptorsFeatureEnabled(TestAsset asset, bool? expectEnabled, params string[] expectedNamespaces)
+        private void VerifyInterceptorsFeatureProperties(TestAsset asset, bool? expectEnabled, params string[] expectedNamespaces)
         {
             var command = new GetValuesCommand(
                 Log,
diff --git a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets
index 53230142ff10..9676aac013cd 100644
--- a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets
+++ b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets
@@ -59,13 +59,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     <EnableConfigurationBindingGenerator Condition="'$(EnableConfigurationBindingGenerator)' == ''">true</EnableConfigurationBindingGenerator>
   </PropertyGroup>
 
-  <!-- Set the namespaces emitted by the RequestDelegateGenerator for interception when applicable. -->
-  <PropertyGroup Condition="'$(EnableRequestDelegateGenerator)' == 'true'">
-    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated</InterceptorsPreviewNamespaces>
-  </PropertyGroup>
-  <!-- Set the namespaces emitted by the ConfigurationBindingGenerator for interception when applicable. -->
-  <PropertyGroup Condition="'$(EnableConfigurationBindingGenerator)' == 'true'">
-    <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
+  <PropertyGroup>
+    <!-- Set the namespaces emitted by the RequestDelegateGenerator for interception when applicable. -->
+    <InterceptorsPreviewNamespaces Condition="'$(EnableRequestDelegateGenerator)' == 'true'">$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated</InterceptorsPreviewNamespaces>
+    <!-- Set the namespaces emitted by the ConfigurationBindingGenerator for interception when applicable. -->
+    <InterceptorsPreviewNamespaces Condition="'$(EnableConfigurationBindingGenerator)' == 'true'">$(InterceptorsPreviewNamespaces);Microsoft.Extensions.Configuration.Binder.SourceGeneration</InterceptorsPreviewNamespaces>
   </PropertyGroup>
 
   <!--