8000 Merge pull request #195 from cnblogs/remove-framework-reference · cnblogs/EnyimMemcachedCore@78f8563 · GitHub
[go: up one dir, main page]
Skip to content

Commit 78f8563

Browse files
cnblogs-duducnblogs-dudu
authored
Merge pull request #195 from cnblogs/remove-framework-reference
fix: remove FrameworkReference
2 parents 38a9a29 + d6f2b84 commit 78f8563

File tree

6 files changed

+19
-28
lines changed

6 files changed

+19
-28
lines changed

‎src/Enyim.Caching/Enyim.Caching.csproj

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,20 @@
1717
<LangVersion>latest</LangVersion>
1818
<NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
1919
</PropertyGroup>
20-
21-
<Choose>
22-
<When Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net7.0'">
23-
<ItemGroup>
24-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
25-
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
26-
</ItemGroup>
27-
</When>
28-
<Otherwise>
29-
<ItemGroup>
30-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
32-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
33-
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.0" />
34-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
35-
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
36-
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
37-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
38-
</ItemGroup>
39-
</Otherwise>
40-
</Choose>
20+
21+
<ItemGroup>
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
26+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
27+
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
28+
<PackageReference Include="Newtonsoft.Json.Bson" Version="1.0.2" />
29+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
30+
</ItemGroup>
4131

4232
<ItemGroup>
43-
<PackageReference Include="MessagePack" Version="2.4.59" />
33+
<PackageReference Include="MessagePack" Version="2.5.108" />
4434
</ItemGroup>
4535

4636
<ItemGroup>

‎test/DistributedCacheTests/DistributedCacheTests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
12+
<FrameworkReference Include="Microsoft.AspNetCore.App" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1314
<PackageReference Include="xunit" Version="2.4.2" />
1415
<PackageReference Include="Xunit.Priority" Version="1.1.6" />
1516
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

‎test/Enyim.Caching.Tests/Enyim.Caching.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
88
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
99
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1111
<PackageReference Include="xunit" Version="2.4.2" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1313
<PrivateAssets>all</PrivateAssets>

‎test/Enyim.StressTest/Enyim.StressTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup>
2020
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
2222
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
2323
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
2424
</ItemGroup>

‎test/MemcachedTest/MemcachedTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
88
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
99
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1111
<PackageReference Include="xunit" Version="2.4.2" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1313
<PrivateAssets>all</PrivateAssets>

‎test/SampleWebApp.IntegrationTests/SampleWebApp.IntegrationTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.2" />
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
9+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1111
<PackageReference Include="xunit" Version="2.4.2" />
1212
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
1313
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)
0