Skip to content

Commit

Permalink
Merge branch 'develop' into appctx
Browse files Browse the repository at this point in the history
  • Loading branch information
wasabii authored Sep 9, 2024
2 parents ab37f93 + f6fd873 commit 26d92e4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions IKVM.deps.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<ItemGroup>
<PackageReference Include="IKVM.ByteCode" Version="9.1.3" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
</ItemGroup>

<Choose>
Expand All @@ -16,19 +17,18 @@
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
<PackageReference Include="System.Text.Json" Version="8.0.4" />
</ItemGroup>
</When>
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
<PackageReference Include="System.Data.Odbc" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
</ItemGroup>
</When>
<When Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
<PackageReference Include="System.Data.Odbc" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
</ItemGroup>
</When>
</Choose>
Expand Down

0 comments on commit 26d92e4

Please sign in to comment.