Skip to content

Commit bc33fd9

Browse files
committed
Updated to PostSharp 6.0.11, WeakEvent sample fixed, minor fixes.
1 parent f399f15 commit bc33fd9

73 files changed

Lines changed: 491 additions & 481 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Diagnostics/PostSharp.Samples.Audit.Extended/ExtendedAuditRecordBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ protected override AuditRecord CreateRecord(LoggingContext context, ref LogRecor
2020
return new ExtendedAuditRecord(context.Source.SourceType, memberInfo.MemberName, recordInfo.RecordKind);
2121
}
2222

23-
public override void SetParameter<T>(int index, string parameterName, ParameterDirection direction, string typeName, T value, IFormatter<T> formatter)
23+
public override void SetParameter<T>(
24+
int index, string parameterName, ParameterKind parameterKind, string typeName, T value, IFormatter<T> formatter)
2425
{
25-
base.SetParameter(index, parameterName, direction, typeName, value, formatter);
26+
base.SetParameter(index, parameterName, parameterKind, typeName, value, formatter);
2627

2728
// When the parameter is a business object, add it to the list of correlated business objects.
2829
var businessObject = value as BusinessObject;
2930

3031
if (businessObject != null)
3132
((ExtendedAuditRecord) CurrentRecord).RelatedBusinessObjects.Add(businessObject);
32-
3333
}
3434
}
3535
}

Diagnostics/PostSharp.Samples.Audit.Extended/PostSharp.Samples.Audit.Extended.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props')" />
3+
<Import Project="..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,14 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="PostSharp, Version=6.0.10.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\PostSharp.Redist.6.0.10-preview\lib\net45\PostSharp.dll</HintPath>
38+
<Reference Include="PostSharp, Version=6.0.11.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\PostSharp.Redist.6.0.11-preview\lib\net45\PostSharp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="PostSharp.Patterns.Common, Version=6.0.10.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\PostSharp.Patterns.Common.Redist.6.0.10-preview\lib\net46\PostSharp.Patterns.Common.dll</HintPath>
41+
<Reference Include="PostSharp.Patterns.Common, Version=6.0.11.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\PostSharp.Patterns.Common.Redist.6.0.11-preview\lib\net46\PostSharp.Patterns.Common.dll</HintPath>
4343
</Reference>
44-
<Reference Include="PostSharp.Patterns.Diagnostics, Version=6.0.10.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Redist.6.0.10-preview\lib\net46\PostSharp.Patterns.Diagnostics.dll</HintPath>
44+
<Reference Include="PostSharp.Patterns.Diagnostics, Version=6.0.11.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Redist.6.0.11-preview\lib\net46\PostSharp.Patterns.Diagnostics.dll</HintPath>
4646
</Reference>
4747
<Reference Include="System" />
4848
<Reference Include="System.Core" />
@@ -74,8 +74,8 @@
7474
<PropertyGroup>
7575
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7676
</PropertyGroup>
77-
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props'))" />
78-
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets'))" />
77+
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props'))" />
78+
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets'))" />
7979
</Target>
80-
<Import Project="..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets')" />
80+
<Import Project="..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets')" />
8181
</Project>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="PostSharp" version="6.0.10-preview" targetFramework="net46" developmentDependency="true" />
4-
<package id="PostSharp.Patterns.Common" version="6.0.10-preview" targetFramework="net46" developmentDependency="true" />
5-
<package id="PostSharp.Patterns.Common.Redist" version="6.0.10-preview" targetFramework="net46" />
6-
<package id="PostSharp.Patterns.Diagnostics" version="6.0.10-preview" targetFramework="net46" developmentDependency="true" />
7-
<package id="PostSharp.Patterns.Diagnostics.Redist" version="6.0.10-preview" targetFramework="net46" />
8-
<package id="PostSharp.Redist" version="6.0.10-preview" targetFramework="net46" />
3+
<package id="PostSharp" version="6.0.11-preview" targetFramework="net46" developmentDependency="true" />
4+
<package id="PostSharp.Patterns.Common" version="6.0.11-preview" targetFramework="net46" developmentDependency="true" />
5+
<package id="PostSharp.Patterns.Common.Redist" version="6.0.11-preview" targetFramework="net46" />
6+
<package id="PostSharp.Patterns.Diagnostics" version="6.0.11-preview" targetFramework="net46" developmentDependency="true" />
7+
<package id="PostSharp.Patterns.Diagnostics.Redist" version="6.0.11-preview" targetFramework="net46" />
8+
<package id="PostSharp.Redist" version="6.0.11-preview" targetFramework="net46" />
99
</packages>

Diagnostics/PostSharp.Samples.Audit/PostSharp.Samples.Audit.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props')" />
3+
<Import Project="..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,14 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="PostSharp, Version=6.0.10.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
39-
<HintPath>..\..\packages\PostSharp.Redist.6.0.10-preview\lib\net45\PostSharp.dll</HintPath>
38+
<Reference Include="PostSharp, Version=6.0.11.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
39+
<HintPath>..\..\packages\PostSharp.Redist.6.0.11-preview\lib\net45\PostSharp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="PostSharp.Patterns.Common, Version=6.0.10.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\PostSharp.Patterns.Common.Redist.6.0.10-preview\lib\net46\PostSharp.Patterns.Common.dll</HintPath>
41+
<Reference Include="PostSharp.Patterns.Common, Version=6.0.11.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\PostSharp.Patterns.Common.Redist.6.0.11-preview\lib\net46\PostSharp.Patterns.Common.dll</HintPath>
4343
</Reference>
44-
<Reference Include="PostSharp.Patterns.Diagnostics, Version=6.0.10.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Redist.6.0.10-preview\lib\net46\PostSharp.Patterns.Diagnostics.dll</HintPath>
44+
<Reference Include="PostSharp.Patterns.Diagnostics, Version=6.0.11.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
45+
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Redist.6.0.11-preview\lib\net46\PostSharp.Patterns.Diagnostics.dll</HintPath>
4646
</Reference>
4747
<Reference Include="System" />
4848
<Reference Include="System.Core" />
@@ -70,8 +70,8 @@
7070
<PropertyGroup>
7171
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7272
</PropertyGroup>
73-
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props'))" />
74-
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets'))" />
73+
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props'))" />
74+
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets'))" />
7575
</Target>
76-
<Import Project="..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets')" />
76+
<Import Project="..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets')" />
7777
</Project>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="PostSharp" version="6.0.10-preview" targetFramework="net46" developmentDependency="true" />
4-
<package id="PostSharp.Patterns.Common" version="6.0.10-preview" targetFramework="net46" developmentDependency="true" />
5-
<package id="PostSharp.Patterns.Common.Redist" version="6.0.10-preview" targetFramework="net46" />
6-
<package id="PostSharp.Patterns.Diagnostics" version="6.0.10-preview" targetFramework="net46" developmentDependency="true" />
7-
<package id="PostSharp.Patterns.Diagnostics.Redist" version="6.0.10-preview" targetFramework="net46" />
8-
<package id="PostSharp.Redist" version="6.0.10-preview" targetFramework="net46" />
3+
<package id="PostSharp" version="6.0.11-preview" targetFramework="net46" developmentDependency="true" />
4+
<package id="PostSharp.Patterns.Common" version="6.0.11-preview" targetFramework="net46" developmentDependency="true" />
5+
<package id="PostSharp.Patterns.Common.Redist" version="6.0.11-preview" targetFramework="net46" />
6+
<package id="PostSharp.Patterns.Diagnostics" version="6.0.11-preview" targetFramework="net46" developmentDependency="true" />
7+
<package id="PostSharp.Patterns.Diagnostics.Redist" version="6.0.11-preview" targetFramework="net46" />
8+
<package id="PostSharp.Redist" version="6.0.11-preview" targetFramework="net46" />
99
</packages>

Diagnostics/PostSharp.Samples.Frigate.Generator/PostSharp.Samples.Frigate.Generator.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props')" />
3+
<Import Project="..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props" Condition="Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -36,20 +36,20 @@
3636
<WarningLevel>4</WarningLevel>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="PostSharp, Version=6.0.10.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
40-
<HintPath>..\..\packages\PostSharp.Redist.6.0.10-preview\lib\net45\PostSharp.dll</HintPath>
39+
<Reference Include="PostSharp, Version=6.0.11.0, Culture=neutral, PublicKeyToken=b13fd38b8f9c99d7, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\PostSharp.Redist.6.0.11-preview\lib\net45\PostSharp.dll</HintPath>
4141
</Reference>
4242
<Reference Include="PostSharp.Frigate.FileFormat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
43-
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Frigate.6.0.10-preview\lib\net45\PostSharp.Frigate.FileFormat.dll</HintPath>
43+
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Frigate.6.0.11-preview\lib\net45\PostSharp.Frigate.FileFormat.dll</HintPath>
4444
</Reference>
45-
<Reference Include="PostSharp.Patterns.Common, Version=6.0.10.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\PostSharp.Patterns.Common.Redist.6.0.10-preview\lib\net45\PostSharp.Patterns.Common.dll</HintPath>
45+
<Reference Include="PostSharp.Patterns.Common, Version=6.0.11.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\PostSharp.Patterns.Common.Redist.6.0.11-preview\lib\net45\PostSharp.Patterns.Common.dll</HintPath>
4747
</Reference>
48-
<Reference Include="PostSharp.Patterns.Diagnostics, Version=6.0.10.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Redist.6.0.10-preview\lib\net45\PostSharp.Patterns.Diagnostics.dll</HintPath>
48+
<Reference Include="PostSharp.Patterns.Diagnostics, Version=6.0.11.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Redist.6.0.11-preview\lib\net45\PostSharp.Patterns.Diagnostics.dll</HintPath>
5050
</Reference>
5151
<Reference Include="PostSharp.Patterns.Diagnostics.Backends.Frigate, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e7f631e6ce13f078, processorArchitecture=MSIL">
52-
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Frigate.6.0.10-preview\lib\net45\PostSharp.Patterns.Diagnostics.Backends.Frigate.dll</HintPath>
52+
<HintPath>..\..\packages\PostSharp.Patterns.Diagnostics.Frigate.6.0.11-preview\lib\net45\PostSharp.Patterns.Diagnostics.Backends.Frigate.dll</HintPath>
5353
</Reference>
5454
<Reference Include="System" />
5555
<Reference Include="System.Core" />
@@ -74,8 +74,8 @@
7474
<PropertyGroup>
7575
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
7676
</PropertyGroup>
77-
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.props'))" />
78-
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets'))" />
77+
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.props'))" />
78+
<Error Condition="!Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets'))" />
7979
</Target>
80-
<Import Project="..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.0.10-preview\build\PostSharp.targets')" />
80+
<Import Project="..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets" Condition="Exists('..\..\packages\PostSharp.6.0.11-preview\build\PostSharp.targets')" />
8181
</Project>
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="PostSharp" version="6.0.10-preview" targetFramework="net452" developmentDependency="true" />
4-
<package id="PostSharp.Patterns.Common" version="6.0.10-preview" targetFramework="net452" developmentDependency="true" />
5-
<package id="PostSharp.Patterns.Common.Redist" version="6.0.10-preview" targetFramework="net452" />
6-
<package id="PostSharp.Patterns.Diagnostics" version="6.0.10-preview" targetFramework="net452" developmentDependency="true" />
7-
<package id="PostSharp.Patterns.Diagnostics.Frigate" version="6.0.10-preview" targetFramework="net452" />
8-
<package id="PostSharp.Patterns.Diagnostics.Redist" version="6.0.10-preview" targetFramework="net452" />
9-
<package id="PostSharp.Redist" version="6.0.10-preview" targetFramework="net452" />
3+
<package id="PostSharp" version="6.0.11-preview" targetFramework="net452" developmentDependency="true" />
4+
<package id="PostSharp.Patterns.Common" version="6.0.11-preview" targetFramework="net452" developmentDependency="true" />
5+
<package id="PostSharp.Patterns.Common.Redist" version="6.0.11-preview" targetFramework="net452" />
6+
<package id="PostSharp.Patterns.Diagnostics" version="6.0.11-preview" targetFramework="net452" developmentDependency="true" />
7+
<package id="PostSharp.Patterns.Diagnostics.Frigate" version="6.0.11-preview" targetFramework="net452" />
8+
<package id="PostSharp.Patterns.Diagnostics.Redist" version="6.0.11-preview" targetFramework="net452" />
9+
<package id="PostSharp.Redist" version="6.0.11-preview" targetFramework="net452" />
1010
</packages>

0 commit comments

Comments
 (0)