Skip to content

Commit 808e517

Browse files
authored
Merge pull request #383 from thompson-tomo/task/#382_TweakDependencies
#382 tweak dependencies based on new tfm
2 parents c06d0f6 + 4786818 commit 808e517

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

build/common.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
55
<Product>Foundatio</Product>
66
<Description>Pluggable foundation blocks for building distributed apps.</Description>
77
<PackageProjectUrl>https://github.com/FoundatioFx/Foundatio</PackageProjectUrl>

src/Foundatio.Xunit/Foundatio.Xunit.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
<ProjectReference Include="..\Foundatio\Foundatio.csproj" />
88
</ItemGroup>
99
<ItemGroup>
10-
<PackageReference Include="System.Collections.Immutable" Version="8.0" />
1110
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0" />
1211
<PackageReference Include="xunit" Version="2.9.3" />
1312
</ItemGroup>
13+
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
14+
<PackageReference Include="System.Collections.Immutable" Version="8.0" />
15+
</ItemGroup>
1416
</Project>

src/Foundatio/Foundatio.csproj

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3+
<!-- Can be removed when lowest TFM is net 8 -->
34
<PackageReference Include="Microsoft.Bcl.TimeProvider" Version="8.0" />
4-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
5+
<!-- Can be removed when lowest TFM is net 6 -->
56
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0" />
7+
<!-- Needed for all TFMs -->
68
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0" />
79
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0" />
10+
</ItemGroup>
11+
<ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
812
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0" />
13+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
914
</ItemGroup>
1015
</Project>

0 commit comments

Comments
 (0)