Skip to content

Commit 33ebb58

Browse files
committed
Merge
2 parents 5dc3e89 + dc1dab7 commit 33ebb58

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

eng/PatchConfig.props

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
3+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.6' ">
4+
<PackagesInPatch>
5+
Microsoft.Extensions.ObjectPool;
6+
Microsoft.Extensions.Primitives;
7+
</PackagesInPatch>
8+
</PropertyGroup>
9+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.10' ">
10+
<PackagesInPatch>
11+
Microsoft.Extensions.Configuration.Binder;
12+
</PackagesInPatch>
13+
</PropertyGroup>
14+
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.1.23' ">
15+
<PackagesInPatch>
16+
Microsoft.Extensions.Caching.Abstractions;
17+
Microsoft.Extensions.Caching.Memory;
18+
</PackagesInPatch>
19+
</PropertyGroup>
20+
21+
</Project>

src/Caching/Memory/test/MemoryCacheSetAndRemoveTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -679,8 +679,8 @@ public void TryGetValueFromCacheWithNullKeyThrows()
679679
public void GetOrCreateFromCacheWithNullKeyThrows()
680680
{
681681
var cache = CreateCache();
682-
Assert.Throws<ArgumentNullException>(() => cache.GetOrCreate<object>(null, null))
683-
; }
682+
Assert.Throws<ArgumentNullException>(() => cache.GetOrCreate<object>(null, null));
683+
}
684684

685685
[Fact]
686686
public async Task GetOrCreateAsyncFromCacheWithNullKeyThrows()
@@ -695,4 +695,4 @@ private class TestKey
695695
public override int GetHashCode() => 0;
696696
}
697697
}
698-
}
698+
}

0 commit comments

Comments
 (0)