Skip to content

Commit 92134d1

Browse files
pub-comppub-comp
authored
Merge pull request #58 from NoahLerner/feature/upgrade-postsharp-support-net6
Upgrade Postsharp and support net6
2 parents 593bd18 + 47117ea commit 92134d1

File tree

8 files changed

+21
-24
lines changed

8 files changed

+21
-24
lines changed

‎AopCaching.UnitTests/AopCaching.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
99
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
10-
<PackageReference Include="PostSharp" Version="6.8.7" />
10+
<PackageReference Include="PostSharp" Version="6.10.13" />
1111
<PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
1212
</ItemGroup>
1313
<ItemGroup>

‎AopCaching/AopCaching.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<AssemblyName>PubComp.Caching.AopCaching</AssemblyName>
66
<RootNamespace>PubComp.Caching.AopCaching</RootNamespace>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8-
<Version>5.0.2</Version>
8+
<Version>5.0.3</Version>
99
<AssemblyVersion>5.0.0.0</AssemblyVersion>
10-
<FileVersion>5.0.2.0</FileVersion>
10+
<FileVersion>5.0.3.0</FileVersion>
1111
</PropertyGroup>
1212
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1313
<NoWarn>1701;1702;1591</NoWarn>
@@ -17,7 +17,7 @@
1717
</PropertyGroup>
1818
<ItemGroup>
1919
<PackageReference Include="NLog" Version="4.5.10" />
20-
<PackageReference Include="PostSharp" Version="6.8.7" />
20+
<PackageReference Include="PostSharp" Version="6.10.13" />
2121
</ItemGroup>
2222
<ItemGroup>
2323
<ProjectReference Include="..\Core\Core.csproj" />

‎AopCaching/CacheAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
using NLog;
22
using PostSharp.Aspects;
3+
using PostSharp.Serialization;
34
using PubComp.Caching.Core;
45
using PubComp.Caching.Core.Attributes;
56
using System;
67
using System.Collections.Generic;
78
using System.Linq;
89
using System.Reflection;
9-
using System.Threading;
1010
using System.Threading.Tasks;
1111

1212
namespace PubComp.Caching.AopCaching
1313
{
14-
[Serializable]
14+
[PSerializable]
1515
public class CacheAttribute : MethodInterceptionAspect
1616
{
1717
private string cacheName;

‎Core.UnitTests/Core.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
1717
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
1818
<PackageReference Include="NLog" Version="4.5.10" />
19-
<PackageReference Include="PostSharp" Version="6.8.7" />
19+
<PackageReference Include="PostSharp" Version="6.10.13" />
2020
<PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
2121
</ItemGroup>
2222
<ItemGroup>

‎MongoDbCaching/MongoDbCaching.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<NoWarn>1701;1702;1591</NoWarn>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<PackageReference Include="PubComp.NoSql.MongoDbDriver" Version="4.1.0" />
18+
<PackageReference Include="PubComp.NoSql.MongoDbDriver" Version="4.2.0" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<ProjectReference Include="..\Core\Core.csproj" />

‎RedisCaching.UnitTests/RedisCaching.UnitTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ItemGroup>
88
<PackageReference Include="MSTest.TestAdapter" Version="1.2.0" />
99
<PackageReference Include="MSTest.TestFramework" Version="1.2.0" />
10-
<PackageReference Include="PostSharp" Version="6.8.7" />
10+
<PackageReference Include="PostSharp" Version="6.10.13" />
1111
</ItemGroup>
1212
<ItemGroup>
1313
<ProjectReference Include="..\AopCaching\AopCaching.csproj" />

‎WebApi/TestHost.WebApi.csproj

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<Import Project="..\packages\PostSharp.6.0.28\build\PostSharp.props" Condition="Exists('..\packages\PostSharp.6.0.28\build\PostSharp.props')" />
2+
<Import Project="..\packages\PostSharp.6.10.13\build\PostSharp.props" Condition="Exists('..\packages\PostSharp.6.10.13\build\PostSharp.props')" />
33
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
44
<Import Project="..\packages\Microsoft.Net.Compilers.2.6.1\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.2.6.1\build\Microsoft.Net.Compilers.props')" />
55
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -81,8 +81,8 @@
8181
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
8282
<HintPath>..\packages\Pipelines.Sockets.Unofficial.1.0.0\lib\netstandard2.0\Pipelines.Sockets.Unofficial.dll</HintPath>
8383
</Reference>
84-
<Reference Include="PostSharp, Version=6.0.28.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
85-
<HintPath>..\packages\PostSharp.Redist.6.0.28\lib\net45\PostSharp.dll</HintPath>
84+
<Reference Include="PostSharp, Version=6.10.13.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
85+
<HintPath>..\packages\PostSharp.Redist.6.10.13\lib\net45\PostSharp.dll</HintPath>
8686
</Reference>
8787
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
8888
<HintPath>..\packages\StackExchange.Redis.2.0.505\lib\net461\StackExchange.Redis.dll</HintPath>
@@ -102,11 +102,8 @@
102102
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.4.5.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
103103
</Reference>
104104
<Reference Include="System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
105-
<Reference Include="System.IO.Pipelines, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
106-
<HintPath>..\packages\System.IO.Pipelines.4.5.0\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
107-
</Reference>
108105
<Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
109-
<HintPath>..\packages\System.Memory.4.5.0\lib\netstandard2.0\System.Memory.dll</HintPath>
106+
<HintPath>..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
110107
</Reference>
111108
<Reference Include="System.Net" />
112109
<Reference Include="System.Net.Http" />
@@ -144,7 +141,7 @@
144141
<HintPath>..\packages\System.Threading.Channels.4.5.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
145142
</Reference>
146143
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
147-
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
144+
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
148145
</Reference>
149146
<Reference Include="System.Transactions" />
150147
<Reference Include="System.Web.Cors, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -306,11 +303,11 @@
306303
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
307304
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.2.6.1\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.2.6.1\build\Microsoft.Net.Compilers.props'))" />
308305
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.1.0.8\build\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
309-
<Error Condition="!Exists('..\packages\PostSharp.6.0.28\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.6.0.28\build\PostSharp.props'))" />
310-
<Error Condition="!Exists('..\packages\PostSharp.6.0.28\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.6.0.28\build\PostSharp.targets'))" />
306+
<Error Condition="!Exists('..\packages\PostSharp.6.10.13\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.6.10.13\build\PostSharp.props'))" />
307+
<Error Condition="!Exists('..\packages\PostSharp.6.10.13\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PostSharp.6.10.13\build\PostSharp.targets'))" />
311308
</Target>
312309
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
313-
<Import Project="..\packages\PostSharp.6.0.28\build\PostSharp.targets" Condition="Exists('..\packages\PostSharp.6.0.28\build\PostSharp.targets')" />
310+
<Import Project="..\packages\PostSharp.6.10.13\build\PostSharp.targets" Condition="Exists('..\packages\PostSharp.6.10.13\build\PostSharp.targets')" />
314311
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
315312
Other similar extension points exist, see Microsoft.Common.targets.
316313
<Target Name="BeforeBuild">

‎WebApi/packages.config

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@
2525
<package id="NLog" version="4.5.10" targetFramework="net461" />
2626
<package id="Owin" version="1.0" targetFramework="net461" />
2727
<package id="Pipelines.Sockets.Unofficial" version="1.0.0" targetFramework="net461" />
28-
<package id="PostSharp" version="6.0.28" targetFramework="net461" developmentDependency="true" />
29-
<package id="PostSharp.Redist" version="6.0.28" targetFramework="net461" />
28+
<package id="PostSharp" version="6.10.13" targetFramework="net461" developmentDependency="true" />
29+
<package id="PostSharp.Redist" version="6.10.13" targetFramework="net461" />
3030
<package id="StackExchange.Redis" version="2.0.505" targetFramework="net461" />
3131
<package id="Swashbuckle.Core" version="5.5.3" targetFramework="net461" />
3232
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
3333
<package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net461" />
3434
<package id="System.Diagnostics.PerformanceCounter" version="4.5.0" targetFramework="net461" />
3535
<package id="System.IO.Pipelines" version="4.5.1" targetFramework="net461" />
36-
<package id="System.Memory" version="4.5.0" targetFramework="net461" />
36+
<package id="System.Memory" version="4.5.1" targetFramework="net461" />
3737
<package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net461" />
3838
<package id="System.Runtime.Caching" version="4.5.0" targetFramework="net461" />
3939
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.0" targetFramework="net461" />
4040
<package id="System.Security.AccessControl" version="4.5.0" targetFramework="net461" />
4141
<package id="System.Security.Permissions" version="4.5.0" targetFramework="net461" />
4242
<package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net461" />
4343
<package id="System.Threading.Channels" version="4.5.0" targetFramework="net461" />
44-
<package id="System.Threading.Tasks.Extensions" version="4.5.0" targetFramework="net461" />
44+
<package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
4545
<package id="Unity" version="5.5.5" targetFramework="net461" />
4646
<package id="Unity.Abstractions" version="3.1.2" targetFramework="net461" />
4747
<package id="Unity.AspNet.WebApi" version="5.0.11" targetFramework="net461" />

0 commit comments

Comments
 (0)