Skip to content

Commit

Permalink
Merge pull request #690 from Havunen/update-castlecore
Browse files Browse the repository at this point in the history
Updated NSubstitute to v5 for modern TFMs
  • Loading branch information
dtchepak authored Jul 9, 2022
2 parents a6ce8c1 + 288b489 commit 1cefed8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup Condition="'$(TargetIsNetFx)' == 'true'">
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0-preview.2" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
</ItemGroup>

</Project>
9 changes: 8 additions & 1 deletion src/NSubstitute/NSubstitute.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0-*" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetIsNetFx)' == 'true'">
<PackageReference Include="Castle.Core" Version="4.4.1-*" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetIsNet5OrNewer)' == 'true'">
<PackageReference Include="Castle.Core" Version="5.0.0-*" />
</ItemGroup>

<PropertyGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
<DefineConstants>$(DefineConstants);SYSTEM_REFLECTION_CUSTOMATTRIBUTES_IS_ARRAY</DefineConstants>
</PropertyGroup>
Expand Down Expand Up @@ -51,7 +59,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Castle.Core" Version="4.4.1-*" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*" Condition="'$(TargetIsNet5OrNewer)' != 'true'" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetIsNetFx)' == 'true'">
Expand Down

0 comments on commit 1cefed8

Please sign in to comment.