Skip to content

Commit

Permalink
Merge branch 'main' into askpt/add-dotnet-9-support
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/code-coverage.yml
#	Directory.Packages.props
#	src/OpenFeature.DependencyInjection/OpenFeature.DependencyInjection.csproj
#	src/OpenFeature.Hosting/OpenFeature.Hosting.csproj
#	test/OpenFeature.DependencyInjection.Tests/OpenFeature.DependencyInjection.Tests.csproj
  • Loading branch information
askpt committed Nov 18, 2024
2 parents 360edf5 + 94681f3 commit 9707e33
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
<PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
<PackageVersion Include="System.Collections.Immutable" Version="9.0.0" />
<PackageVersion Include="System.Threading.Channels" Version="9.0.0" />
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
Expand All @@ -27,7 +29,7 @@
<PackageVersion Include="SpecFlow.xUnit" Version="3.9.74" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(OS)' == 'Unix'">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net462</TargetFrameworks>
Expand Down

0 comments on commit 9707e33

Please sign in to comment.