Skip to content

Commit

Permalink
Merge pull request #601 from seesharper/usenet8
Browse files Browse the repository at this point in the history
Use Net8 and bumped all deps
  • Loading branch information
seesharper authored Nov 6, 2024
2 parents 70eab3b + e0a8a0c commit 818b50b
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion build/build.csx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#load "nuget:Dotnet.Build, 0.16.1"
#load "nuget:Dotnet.Build, 0.23.0"
#load "nuget:github-changelog, 0.1.5"
#load "nuget:dotnet-steps, 0.0.2"

Expand Down
2 changes: 1 addition & 1 deletion omnisharp.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
},
"script": {
"enableScriptNuGetReferences": true,
"defaultTargetFramework": "net6.0"
"defaultTargetFramework": "net8.0"
}
}
10 changes: 5 additions & 5 deletions src/LightInject.Benchmarks/LightInject.Benchmarks.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<IsPackable>false</IsPackable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
<PackageReference Include="DryIoc" Version="5.4.0" />
<PackageReference Include="BenchmarkDotNet" Version="0.14.0" />
<PackageReference Include="DryIoc" Version="5.4.3" />
<PackageReference Include="Grace" Version="7.2.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="SimpleInjector" Version="5.4.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="SimpleInjector" Version="5.5.0" />
<PackageReference Include="ImTools" Version="4.0.0" />
</ItemGroup>
<ItemGroup>
Expand Down
16 changes: 8 additions & 8 deletions src/LightInject.Tests/LightInject.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,23 +17,23 @@
<DefineConstants>USE_ASSEMBLY_VERIFICATION;USE_ASYNCDISPOSABLE</DefineConstants>
</PropertyGroup>
<ItemGroup Condition=" '$(TestTargetFramework)' == 'net46' OR '$(TestTargetFramework)' == 'netstandard2.0'">
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="3.2.0">
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="LightMock" Version="2.0.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.7.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xUnit.Analyzers" Version="1.1.0" />
<PackageReference Include="xunit" Version="2.9.2" />
<PackageReference Include="xUnit.Analyzers" Version="1.16.0" />
<PackageReference Include="ILVerifier" Version="0.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="8.0.0-rc.1.23419.4" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Specification.Tests" Version="8.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/LightInject.Tests/MicrosoftTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ public void NonexistentServiceCanBeIEnumerableResolved()
Assert.Empty(services);
}

public static TheoryData ServiceContainerPicksConstructorWithLongestMatchesData
public static TheoryData<IServiceRegistry,TypeWithSupersetConstructors> ServiceContainerPicksConstructorWithLongestMatchesData
{
get
{
Expand Down
6 changes: 3 additions & 3 deletions src/LightInject/LightInject.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;netstandard2.0;netcoreapp3.1;net462</TargetFrameworks>
<Version>6.6.4</Version>
<TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
<Version>7.0.0</Version>
<Authors>Bernhard Richter</Authors>
<PackageProjectUrl>https://www.lightinject.net</PackageProjectUrl>
<RepositoryType>git</RepositoryType>
Expand Down Expand Up @@ -45,7 +45,7 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down

0 comments on commit 818b50b

Please sign in to comment.