Merge branch 'main' into kylej/flagd-fix-sync-port

Signed-off-by: Kyle Julian <38759683+kylejuliandev@users.noreply.github.com>

Author: kylejuliandev

.github/component_owners.yml

@@ -1,7 +1,7 @@
 # Keep all in alphabetical order
 components:
   # src/
-  src/OpenFeature.Contrib.Providers.Flagd:
+  src/OpenFeature.Providers.Flagd:
     - askpt
     - bacherfl
     - kylejuliandev
@@ -29,7 +29,7 @@ components:
     - weyert
 
   # test/
-  test/OpenFeature.Contrib.Providers.Flagd.Test:
+  test/OpenFeature.Providers.Flagd.Test:
     - askpt
     - bacherfl
     - kylejuliandev

.gitmodules

@@ -1,11 +1,11 @@
-[submodule "src/OpenFeature.Contrib.Providers.Flagd/schemas"]
-	path = src/OpenFeature.Contrib.Providers.Flagd/schemas
+[submodule "src/OpenFeature.Providers.Flagd/schemas"]
+	path = src/OpenFeature.Providers.Flagd/schemas
 	url = https://github.com/open-feature/schemas.git
 [submodule "spec"]
 	path = spec
 	url = https://github.com/open-feature/spec.git
-[submodule "src/OpenFeature.Contrib.Providers.Flagd/flagd-testbed"]
-	path = src/OpenFeature.Contrib.Providers.Flagd/flagd-testbed
+[submodule "src/OpenFeature.Providers.Flagd/flagd-testbed"]
+	path = src/OpenFeature.Providers.Flagd/flagd-testbed
 	url = https://github.com/open-feature/flagd-testbed.git
 [submodule "src/OpenFeature.Providers.GOFeatureFlag/wasm-releases"]
 	path = src/OpenFeature.Providers.GOFeatureFlag/wasm-releases

.release-please-manifest.json

@@ -1,12 +1,12 @@
 {
-  "src/OpenFeature.Contrib.Providers.Flagd": "0.5.0",
   "src/OpenFeature.Contrib.Providers.GOFeatureFlag": "0.2.1",
   "src/OpenFeature.Contrib.Providers.Flagsmith": "0.2.1",
   "src/OpenFeature.Contrib.Providers.ConfigCat": "0.1.1",
   "src/OpenFeature.Contrib.Providers.FeatureManagement": "0.1.2",
   "src/OpenFeature.Contrib.Providers.Statsig": "0.1.1",
   "src/OpenFeature.Contrib.Providers.Flipt": "0.0.5",
   "src/OpenFeature.Contrib.Providers.EnvVar": "0.0.7",
+  "src/OpenFeature.Providers.Flagd": "0.5.0",
   "src/OpenFeature.Providers.Ofrep": "0.1.5",
   "src/OpenFeature.Providers.GOFeatureFlag": "1.0.0"
-}
+}

CONTRIBUTING.md

@@ -38,10 +38,10 @@ If you prefer not to use the Dev Container, ensure you have the following instal
 
 ## Adding a project
 
-1. Create a new library project under `src/`: `dotnet new classlib -o src/OpenFeature.Contrib.MyComponent`
-2. Create a new test project under `test/`: `dotnet new xunit -o test/OpenFeature.Contrib.MyComponent.Test`
-3. Add the library project to the solution: `dotnet sln DotnetSdkContrib.slnx add src/OpenFeature.Contrib.MyComponent/OpenFeature.Contrib.MyComponent.csproj`
-4. Add the test project to the solution: `dotnet sln DotnetSdkContrib.slnx add test/OpenFeature.Contrib.MyComponent.Test/OpenFeature.Contrib.MyComponent.Test.csproj`
+1. Create a new library project under `src/`: `dotnet new classlib -o src/OpenFeature.MyComponent`
+2. Create a new test project under `test/`: `dotnet new xunit -o test/OpenFeature.MyComponent.Test`
+3. Add the library project to the solution: `dotnet sln DotnetSdkContrib.slnx add src/OpenFeature.MyComponent/OpenFeature.MyComponent.csproj`
+4. Add the test project to the solution: `dotnet sln DotnetSdkContrib.slnx add test/OpenFeature.MyComponent.Test/OpenFeature.MyComponent.Test.csproj`
 5. Add the desired properties to your library's `.csproj` file (see example below).
 6. Remove all content besides the root element from your test project's `.csproj` file (all settings will be inherited).
 7. Add the new library project to `release-please-config.json`.
@@ -54,7 +54,7 @@ Sample `.csproj` file:
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <PackageId>OpenFeature.Contrib.MyComponent</PackageId>
+    <PackageId>OpenFeature.MyComponent</PackageId>
     <VersionNumber>0.0.1</VersionNumber> <!--x-release-please-version -->
     <VersionPrefix>$(VersionNumber)</VersionPrefix>
     <AssemblyVersion>$(VersionNumber)</AssemblyVersion>
@@ -98,7 +98,7 @@ Each E2E test project contains an `appsettings.json` file. To enable E2E tests,
 
 You can also set the `E2E` environment variable to `true` if you prefer not to modify the `appsettings.json` file.
 
-An example E2E project are the Flagd Provider E2E tests, found [here](/test/OpenFeature.Contrib.Providers.Flagd.E2e.ProcessTest/appsettings.json).
+An example E2E project are the Flagd Provider E2E tests, found [here](/test/OpenFeature.Providers.Flagd.E2e.ProcessTest/appsettings.json).
 
 If you want to disable E2E tests, set `"E2E": "false"` or remove the setting.
 

DotnetSdkContrib.slnx

@@ -3,7 +3,7 @@
     <Project Path="src/OpenFeature.Contrib.Providers.ConfigCat/OpenFeature.Contrib.Providers.ConfigCat.csproj" />
     <Project Path="src/OpenFeature.Contrib.Providers.EnvVar/OpenFeature.Contrib.Providers.EnvVar.csproj" />
     <Project Path="src/OpenFeature.Contrib.Providers.FeatureManagement/OpenFeature.Contrib.Providers.FeatureManagement.csproj" />
-    <Project Path="src/OpenFeature.Contrib.Providers.Flagd/OpenFeature.Contrib.Providers.Flagd.csproj" />
+    <Project Path="src/OpenFeature.Providers.Flagd/OpenFeature.Providers.Flagd.csproj" />
     <Project Path="src/OpenFeature.Contrib.Providers.Flagsmith/OpenFeature.Contrib.Providers.Flagsmith.csproj" />
     <Project Path="src/OpenFeature.Contrib.Providers.Flipt/OpenFeature.Contrib.Providers.Flipt.csproj" />
     <Project Path="src/OpenFeature.Contrib.Providers.Statsig/OpenFeature.Contrib.Providers.Statsig.csproj" />
@@ -14,10 +14,10 @@
     <Project Path="test/OpenFeature.Contrib.Providers.ConfigCat.Test/OpenFeature.Contrib.Providers.ConfigCat.Test.csproj" />
     <Project Path="test/OpenFeature.Contrib.Providers.EnvVar.Test/OpenFeature.Contrib.Providers.EnvVar.Test.csproj" />
     <Project Path="test/OpenFeature.Contrib.Providers.FeatureManagement.Test/OpenFeature.Contrib.Providers.FeatureManagement.Test.csproj" />
-    <Project Path="test/OpenFeature.Contrib.Providers.Flagd.E2e.Common/OpenFeature.Contrib.Providers.Flagd.E2e.Common.csproj" />
-    <Project Path="test/OpenFeature.Contrib.Providers.Flagd.E2e.ProcessTest/OpenFeature.Contrib.Providers.Flagd.E2e.ProcessTest.csproj" />
-    <Project Path="test/OpenFeature.Contrib.Providers.Flagd.E2e.RpcTest/OpenFeature.Contrib.Providers.Flagd.E2e.RpcTest.csproj" />
-    <Project Path="test/OpenFeature.Contrib.Providers.Flagd.Test/OpenFeature.Contrib.Providers.Flagd.Test.csproj" />
+    <Project Path="test/OpenFeature.Providers.Flagd.E2e.Common/OpenFeature.Providers.Flagd.E2e.Common.csproj" />
+    <Project Path="test/OpenFeature.Providers.Flagd.E2e.ProcessTest/OpenFeature.Providers.Flagd.E2e.ProcessTest.csproj" />
+    <Project Path="test/OpenFeature.Providers.Flagd.E2e.RpcTest/OpenFeature.Providers.Flagd.E2e.RpcTest.csproj" />
+    <Project Path="test/OpenFeature.Providers.Flagd.Test/OpenFeature.Providers.Flagd.Test.csproj" />
     <Project Path="test/OpenFeature.Contrib.Providers.Flagsmith.Test/OpenFeature.Contrib.Providers.Flagsmith.Test.csproj" />
     <Project Path="test/OpenFeature.Contrib.Providers.Flipt.Test/OpenFeature.Contrib.Providers.Flipt.Test.csproj" />
     <Project Path="test/OpenFeature.Contrib.Providers.Statsig.Test/OpenFeature.Contrib.Providers.Statsig.Test.csproj" />

release-please-config.json

@@ -3,14 +3,14 @@
   "separate-pull-requests": true,
   "signoff": "OpenFeature Bot <109696520+openfeaturebot@users.noreply.github.com>",
   "packages": {
-    "src/OpenFeature.Contrib.Providers.Flagd": {
-      "package-name": "OpenFeature.Contrib.Providers.Flagd",
+    "src/OpenFeature.Providers.Flagd": {
+      "package-name": "OpenFeature.Providers.Flagd",
       "release-type": "simple",
       "bump-minor-pre-major": true,
       "bump-patch-for-minor-pre-major": true,
       "versioning": "default",
       "extra-files": [
-        "OpenFeature.Contrib.Providers.Flagd.csproj"
+        "OpenFeature.Providers.Flagd.csproj"
       ]
     },
     "src/OpenFeature.Providers.GOFeatureFlag": {

src/OpenFeature.Contrib.Providers.Flagd/Resolver/InProcess/FlagdSchema.cs

@@ -3,7 +3,7 @@
 
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
 
-namespace OpenFeature.Contrib.Providers.Flagd;
+namespace OpenFeature.Providers.Flagd;
 
 internal interface ICache<TKey, TValue>
 {

…ure.Contrib.Providers.Flagd/CHANGELOG.md …OpenFeature.Providers.Flagd/CHANGELOG.mdsrc/OpenFeature.Contrib.Providers.Flagd/CHANGELOG.md renamed to src/OpenFeature.Providers.Flagd/CHANGELOG.md src/OpenFeature.Contrib.Providers.Flagd/CHANGELOG.md renamed to src/OpenFeature.Providers.Flagd/CHANGELOG.md

@@ -3,9 +3,9 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
-using OpenFeature.Contrib.Providers.Flagd;
-using OpenFeature.Contrib.Providers.Flagd.DependencyInjection;
 using OpenFeature.Hosting;
+using OpenFeature.Providers.Flagd;
+using OpenFeature.Providers.Flagd.DependencyInjection;
 
 namespace OpenFeature.DependencyInjection.Providers.Flagd;