From f56cafebe0449d41e934fe5e740ebef7bc8c2041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <2493377+askpt@users.noreply.github.com>
Date: Fri, 10 Apr 2026 19:06:14 +0100
Subject: [PATCH 1/3] Refactor package references to use
 OpenFeature.Contrib.Flagd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com>
---
 Directory.Packages.props                                        | 2 +-
 .../CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj        | 2 +-
 .../CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs    | 2 +-
 .../CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs | 2 +-
 .../CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 668a4938a..b64dc49d3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -101,7 +101,7 @@
     <PackageVersion Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />
     <PackageVersion Include="Bogus" Version="35.6.3" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
-    <PackageVersion Include="OpenFeature.Contrib.Providers.Flagd" Version="0.3.3" />
+    <PackageVersion Include="OpenFeature.Contrib.Flagd" Version="0.3.3" />
     <PackageVersion Include="OpenFeature.Providers.Ofrep" Version="0.1.2" />
     <PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
diff --git a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj
index f998db26c..c332e7cea 100644
--- a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj
+++ b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenFeature.Contrib.Providers.Flagd" />
+    <PackageReference Include="OpenFeature.Contrib.Flagd" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs
index 0f11e3653..a253970c8 100644
--- a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs
+++ b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs
@@ -1,4 +1,4 @@
-using OpenFeature.Contrib.Providers.Flagd;
+using OpenFeature.Contrib.Flagd;
 
 var builder = DistributedApplication.CreateBuilder(args);
 
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs b/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs
index 80c679b62..b4d0cee34 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs
@@ -1,6 +1,6 @@
 using Aspire.Components.Common.Tests;
 using CommunityToolkit.Aspire.Testing;
-using OpenFeature.Contrib.Providers.Flagd;
+using OpenFeature.Contrib.Flagd;
 using OpenFeature.Providers.Ofrep;
 using OpenFeature.Providers.Ofrep.Configuration;
 
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj b/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj
index a3275a343..d2a22b2df 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj
+++ b/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="OpenFeature.Contrib.Providers.Flagd" />
+    <PackageReference Include="OpenFeature.Contrib.Flagd" />
     <PackageReference Include="OpenFeature.Providers.Ofrep" />
   </ItemGroup>
 

From 4fffdfe27cfc09c6c0aae37b6d8bba90c1b87cc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <2493377+askpt@users.noreply.github.com>
Date: Fri, 10 Apr 2026 19:08:06 +0100
Subject: [PATCH 2/3] Update package references from OpenFeature.Contrib.Flagd
 to OpenFeature.Providers.Flagd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: André Silva <2493377+askpt@users.noreply.github.com>
---
 Directory.Packages.props                                        | 2 +-
 .../CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj        | 2 +-
 .../CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs    | 2 +-
 .../CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs | 2 +-
 .../CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index b64dc49d3..59094bcf6 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -101,7 +101,7 @@
     <PackageVersion Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />
     <PackageVersion Include="Bogus" Version="35.6.3" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
-    <PackageVersion Include="OpenFeature.Contrib.Flagd" Version="0.3.3" />
+    <PackageVersion Include="OpenFeature.Providers.Flagd" Version="0.6.0" />
     <PackageVersion Include="OpenFeature.Providers.Ofrep" Version="0.1.2" />
     <PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
diff --git a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj
index c332e7cea..4b073de6a 100644
--- a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj
+++ b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenFeature.Contrib.Flagd" />
+    <PackageReference Include="OpenFeature.Providers.Flagd" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs
index a253970c8..6b83eae45 100644
--- a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs
+++ b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs
@@ -1,4 +1,4 @@
-using OpenFeature.Contrib.Flagd;
+using OpenFeature.Providers.Flagd;
 
 var builder = DistributedApplication.CreateBuilder(args);
 
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs b/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs
index b4d0cee34..55e25a0aa 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs
+++ b/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/AppHostTests.cs
@@ -1,6 +1,6 @@
 using Aspire.Components.Common.Tests;
 using CommunityToolkit.Aspire.Testing;
-using OpenFeature.Contrib.Flagd;
+using OpenFeature.Providers.Flagd;
 using OpenFeature.Providers.Ofrep;
 using OpenFeature.Providers.Ofrep.Configuration;
 
diff --git a/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj b/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj
index d2a22b2df..39bb5eb3e 100644
--- a/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj
+++ b/tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests/CommunityToolkit.Aspire.Hosting.Flagd.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <PackageReference Include="OpenFeature.Contrib.Flagd" />
+    <PackageReference Include="OpenFeature.Providers.Flagd" />
     <PackageReference Include="OpenFeature.Providers.Ofrep" />
   </ItemGroup>
 

From 574f9da2552a194664af03333f181924267c99cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?=
 <2493377+askpt@users.noreply.github.com>
Date: Fri, 10 Apr 2026 19:17:48 +0100
Subject: [PATCH 3/3] Apply suggestions from code review

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 .../CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj      | 4 ----
 .../CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs  | 2 --
 2 files changed, 6 deletions(-)

diff --git a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj
index 4b073de6a..aa0162fdc 100644
--- a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj
+++ b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/CommunityToolkit.Aspire.Hosting.Flagd.AppHost.csproj
@@ -8,10 +8,6 @@
     <UserSecretsId>6445164b-1ed4-461b-baa5-86790b0c158d</UserSecretsId>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="OpenFeature.Providers.Flagd" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="../../../src/CommunityToolkit.Aspire.Hosting.Flagd/CommunityToolkit.Aspire.Hosting.Flagd.csproj" IsAspireProjectResource="false" />
   </ItemGroup>
diff --git a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs
index 6b83eae45..437c52d54 100644
--- a/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs
+++ b/examples/flagd/CommunityToolkit.Aspire.Hosting.Flagd.AppHost/Program.cs
@@ -1,5 +1,3 @@
-using OpenFeature.Providers.Flagd;
-
 var builder = DistributedApplication.CreateBuilder(args);
 
 // Add flagd with local flag configuration file