From e6a3dc4187cc0e7af1c97dbd7c6f90fd391d386b Mon Sep 17 00:00:00 2001
From: Weihan Li <weihanli@outlook.com>
Date: Thu, 27 Mar 2025 17:57:19 +0800
Subject: [PATCH 1/2] refactor: simplify and unify InternalsVisibleTo usage

Signed-off-by: Weihan Li <weihanli@outlook.com>
---
 .../OpenFeature.DependencyInjection.csproj                | 8 ++------
 src/OpenFeature/FeatureProvider.cs                        | 2 --
 src/OpenFeature/OpenFeature.csproj                        | 1 +
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/OpenFeature.DependencyInjection/OpenFeature.DependencyInjection.csproj b/src/OpenFeature.DependencyInjection/OpenFeature.DependencyInjection.csproj
index 6f8163fb..99270ab3 100644
--- a/src/OpenFeature.DependencyInjection/OpenFeature.DependencyInjection.csproj
+++ b/src/OpenFeature.DependencyInjection/OpenFeature.DependencyInjection.csproj
@@ -17,12 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>$(AssemblyName).Tests</_Parameter1>
-    </AssemblyAttribute>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
-    </AssemblyAttribute>
+    <InternalsVisibleTo Include="$(AssemblyName).Tests" />
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OpenFeature/FeatureProvider.cs b/src/OpenFeature/FeatureProvider.cs
index 6aff0129..eb68b479 100644
--- a/src/OpenFeature/FeatureProvider.cs
+++ b/src/OpenFeature/FeatureProvider.cs
@@ -6,8 +6,6 @@
 using OpenFeature.Constant;
 using OpenFeature.Model;
 
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] // required to allow NSubstitute mocking of internal methods
-
 namespace OpenFeature
 {
     /// <summary>
diff --git a/src/OpenFeature/OpenFeature.csproj b/src/OpenFeature/OpenFeature.csproj
index 357d39c5..c47b109d 100644
--- a/src/OpenFeature/OpenFeature.csproj
+++ b/src/OpenFeature/OpenFeature.csproj
@@ -12,6 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <InternalsVisibleTo Include="DynamicProxyGenAssembly2" />
     <InternalsVisibleTo Include="OpenFeature.Benchmarks" />
     <InternalsVisibleTo Include="OpenFeature.Tests" />
     <InternalsVisibleTo Include="OpenFeature.E2ETests" />

From b5886005418fdc7a002966194f026966d26ad0bb Mon Sep 17 00:00:00 2001
From: Weihan Li <weihanli@outlook.com>
Date: Thu, 27 Mar 2025 18:00:04 +0800
Subject: [PATCH 2/2] remove unnecessary using

Signed-off-by: Weihan Li <weihanli@outlook.com>
---
 src/OpenFeature/FeatureProvider.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/OpenFeature/FeatureProvider.cs b/src/OpenFeature/FeatureProvider.cs
index eb68b479..b5b9a30f 100644
--- a/src/OpenFeature/FeatureProvider.cs
+++ b/src/OpenFeature/FeatureProvider.cs
@@ -1,5 +1,4 @@
 using System.Collections.Immutable;
-using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Channels;
 using System.Threading.Tasks;