Skip to content

Commit 2fb0558

Browse files
Avoiding the configuration manager reference hack for net461.
1 parent 6d94035 commit 2fb0558

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

CoreMemoryCache/NHibernate.Caches.CoreMemoryCache.Tests/NHibernate.Caches.CoreMemoryCache.Tests.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
2323
<PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
2424
</ItemGroup>
25-
<ItemGroup Condition="'$(TargetFramework)'=='net461'">
26-
<!-- See https://github.com/dotnet/standard/issues/506 -->
27-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
28-
</ItemGroup>
2925
<ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.0'">
3026
<PackageReference Include="NUnitLite" Version="3.9.0" />
3127
</ItemGroup>

CoreMemoryCache/NHibernate.Caches.CoreMemoryCache/NHibernate.Caches.CoreMemoryCache.csproj

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,17 @@
44
<Product>NHibernate.Caches.CoreMemoryCache</Product>
55
<Title>NHibernate.Caches.CoreMemoryCache</Title>
66
<Description>Cache provider for NHibernate using .Net Core MemoryCache (Microsoft.Extensions.Caching.Memory).</Description>
7-
<TargetFramework>netstandard2.0</TargetFramework>
7+
8+
<!-- Targeting net461 explicitly in order to avoid https://github.com/dotnet/standard/issues/506 for net461 consumers-->
9+
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
810
<SignAssembly>True</SignAssembly>
911
<AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
1012
<PackageReleaseNotes>* New feature
1113
* #25 - Add a .Net Core MemoryCache</PackageReleaseNotes>
1214
</PropertyGroup>
15+
<PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
16+
<DefineConstants>NETFX;$(DefineConstants)</DefineConstants>
17+
</PropertyGroup>
1318
<ItemGroup>
1419
<None Include="..\..\NHibernate.Caches.snk" Link="NHibernate.snk" />
1520
<None Include="..\default.build" Link="default.build" />
@@ -19,6 +24,9 @@
1924
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.0.0" />
2025
<PackageReference Include="NHibernate" Version="5.1.0" />
2126
</ItemGroup>
27+
<ItemGroup Condition="'$(TargetFramework)' == 'net461'">
28+
<Reference Include="System.Configuration" />
29+
</ItemGroup>
2230
<ItemGroup>
2331
<Content Include="../../readme.md">
2432
<PackagePath>./NHibernate.Caches.readme.md</PackagePath>

0 commit comments

Comments
 (0)