Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions FeatureMasterX.XUnitTest/FeatureMasterX.XUnitTest.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand All @@ -14,12 +14,12 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
14 changes: 8 additions & 6 deletions FeatureMasterX/FeatureMasterX.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<RepositoryUrl>https://github.com/SkJonko/FeatureMasterX</RepositoryUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>image.png</PackageIcon>
Expand All @@ -14,10 +14,12 @@
<PackageProjectUrl>https://github.com/SkJonko/FeatureMasterX</PackageProjectUrl>
<Title>FeatureMasterX</Title>
<Description>A powerful and easy-to-use extension for Microsoft's FeatureManagement library</Description>
<Version>9.0.2</Version>
<Version>10.0.0</Version>
<Authors>SKJonko</Authors>
<Copyright>Copyright © 2025</Copyright>
<PackageReleaseNotes>
10.0.0
- Feature: Port in NET 10.0. Remove support for net6.0
9.0.2
- Feature: Add Scoped Dependency Injection of FeatureMasterX
9.0.1
Expand All @@ -32,16 +34,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions">
<Version Condition="'$(TargetFramework)' == 'net6.0'">6.0.0</Version>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0">
<Version Condition="'$(TargetFramework)' == 'net8.0'">8.0.2</Version>
<Version Condition="'$(TargetFramework)' == 'net9.0'">9.0.1</Version>
<Version Condition="'$(TargetFramework)' == 'net9.0'">9.0.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.FeatureManagement" Version="4.0.0" />
<PackageReference Include="Microsoft.FeatureManagement" Version="4.3.0" />
</ItemGroup>

<ItemGroup>
<None Include="Images\image.png" Pack="true" PackagePath=""/>
<None Include="Images\image.png" Pack="true" PackagePath="" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions FeatureMasterX/Filters/ListCheckFeatureFilterProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public Task<FeatureDefinition> GetFeatureDefinitionAsync(string featureName)
{
Name = FeatureMasterXExtensions.ListCheck,
Parameters = new ConfigurationBuilder()
.AddInMemoryCollection(new Dictionary<string, string>
.AddInMemoryCollection(new Dictionary<string, string?>
{
{ FeatureMasterXExtensions.AllowedUsers, JsonSerializer.Serialize(allowedUsers) }
})
Expand Down Expand Up @@ -69,7 +69,7 @@ public async IAsyncEnumerable<FeatureDefinition> GetAllFeatureDefinitionsAsync()
{
Name = FeatureMasterXExtensions.ListCheck,
Parameters = new ConfigurationBuilder()
.AddInMemoryCollection(new Dictionary<string, string>
.AddInMemoryCollection(new Dictionary<string, string?>
{
{ FeatureMasterXExtensions.AllowedUsers, JsonSerializer.Serialize(allowedUsers) }
})
Expand Down
Loading