Skip to content

Commit 1d4645a

Browse files
gfraiteurgfraiteur
committed
Updated to PostSharp 6.8 RC.
1 parent fea9fc8 commit 1d4645a

File tree

44 files changed

+104
-155
lines changed

Some content is hidden

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

44 files changed

+104
-155
lines changed

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/PostSharp.Samples.Blazor.AutoRetry.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
1010
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
1111
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
12-
<PackageReference Include="PostSharp" Version="6.8.4-preview" />
12+
<PackageReference Include="PostSharp" Version="6.8.5-rc" />
1313
<PackageReference Include="System.Net.Http.Json" Version="3.2.0" />
1414
</ItemGroup>
1515

‎Diagnostics/PostSharp.Samples.Logging.Audit/PostSharp.Samples.Logging.Audit.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
</ItemGroup>
6161
<ItemGroup>
6262
<PackageReference Include="PostSharp">
63-
<Version>6.8.4-preview</Version>
63+
<Version>6.8.5-rc</Version>
6464
</PackageReference>
6565
<PackageReference Include="PostSharp.Patterns.Diagnostics">
66-
<Version>6.8.4-preview</Version>
66+
<Version>6.8.5-rc-e82a62</Version>
6767
</PackageReference>
6868
<PackageReference Include="System.ValueTuple">
6969
<Version>4.5.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.CommonLogging/PostSharp.Samples.Logging.CommonLogging.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@
5959
<Version>4.7.0</Version>
6060
</PackageReference>
6161
<PackageReference Include="PostSharp">
62-
<Version>6.8.4-preview</Version>
62+
<Version>6.8.5-rc</Version>
6363
</PackageReference>
6464
<PackageReference Include="PostSharp.Patterns.Diagnostics">
65-
<Version>6.8.4-preview</Version>
65+
<Version>6.8.5-rc-e82a62</Version>
6666
</PackageReference>
6767
<PackageReference Include="PostSharp.Patterns.Diagnostics.CommonLogging">
68-
<Version>6.8.4-preview</Version>
68+
<Version>6.8.5-rc-e82a62</Version>
6969
</PackageReference>
7070
<PackageReference Include="System.ValueTuple">
7171
<Version>4.5.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.Console/PostSharp.Samples.Logging.Console.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@
5353
</ItemGroup>
5454
<ItemGroup>
5555
<PackageReference Include="PostSharp">
56-
<Version>6.8.4-preview</Version>
56+
<Version>6.8.5-rc</Version>
5757
</PackageReference>
5858
<PackageReference Include="PostSharp.Patterns.Diagnostics">
59-
<Version>6.8.4-preview</Version>
59+
<Version>6.8.5-rc-e82a62</Version>
6060
</PackageReference>
6161
<PackageReference Include="System.ValueTuple">
6262
<Version>4.5.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.CustomBackend.ServiceStack/PostSharp.Samples.Logging.CustomBackend.ServiceStack.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
</ItemGroup>
5858
<ItemGroup>
5959
<PackageReference Include="PostSharp">
60-
<Version>6.8.4-preview</Version>
60+
<Version>6.8.5-rc</Version>
6161
</PackageReference>
6262
<PackageReference Include="PostSharp.Patterns.Diagnostics">
63-
<Version>6.8.4-preview</Version>
63+
<Version>6.8.5-rc-e82a62</Version>
6464
</PackageReference>
6565
<PackageReference Include="ServiceStack.Common">
6666
<Version>5.8.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.Customization/PostSharp.Samples.Logging.Customization.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@
5858
</ItemGroup>
5959
<ItemGroup>
6060
<PackageReference Include="PostSharp">
61-
<Version>6.8.4-preview</Version>
61+
<Version>6.8.5-rc</Version>
6262
</PackageReference>
6363
<PackageReference Include="PostSharp.Patterns.Diagnostics">
64-
<Version>6.8.4-preview</Version>
64+
<Version>6.8.5-rc-e82a62</Version>
6565
</PackageReference>
6666
<PackageReference Include="System.ValueTuple">
6767
<Version>4.5.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.ElasticStack/ClientExample/PostSharp.Samples.Logging.Distributed.Client.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
</PropertyGroup>
1010
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
1111
<ItemGroup>
12-
<PackageReference Include="PostSharp.Patterns.Diagnostics.HttpClient" Version="6.8.4-preview-58a97e" />
12+
<PackageReference Include="PostSharp.Patterns.Diagnostics.HttpClient" Version="6.8.5-rc-e82a62" />
1313
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
1414
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
15-
<PackageReference Include="PostSharp.Patterns.Diagnostics" Version="6.8.4-preview-58a97e" />
16-
<PackageReference Include="PostSharp.Patterns.Diagnostics.Serilog" Version="6.8.4-preview-58a97e" />
15+
<PackageReference Include="PostSharp.Patterns.Diagnostics" Version="6.8.5-rc-e82a62" />
16+
<PackageReference Include="PostSharp.Patterns.Diagnostics.Serilog" Version="6.8.5-rc-e82a62" />
1717
<PackageReference Include="Serilog.Sinks.ElasticSearch" Version="8.0.1" />
1818
</ItemGroup>
1919
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />

‎Diagnostics/PostSharp.Samples.Logging.ElasticStack/ClientExample/Program.cs

+12-2
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,20 @@ private static async Task Main()
5050
backend.Options.ContextIdGenerationStrategy = ContextIdGenerationStrategy.Hierarchical;
5151
LoggingServices.DefaultBackend = backend;
5252

53+
// Defines a filter that selects trusted requests for which the correlation protocol is enabled.
54+
// Enabling HTTP Correlation Protocol for communication with untrusted devices is a security risk.
55+
Predicate<CorrelationRequest> trustedRequests = request => request.RemoteHost == "localhost" ||
56+
request.RemoteHost == "127.0.0.1" ||
57+
request.RemoteHost == "::1";
58+
59+
// Determines which requests will be logged. We exclude requests to Logstash so that we are not logging
60+
// the logging itself.
61+
Predicate<Uri> loggedRequests = uri => uri.Port != 9200;
62+
5363
// Intercept outgoing HTTP requests and add logging to them.
5464
HttpClientLogging.Initialize(
55-
correlationProtocol: new LegacyHttpCorrelationProtocol(),
56-
requestUriPredicate: uri => uri.Port != 9200);
65+
correlationProtocol: new LegacyHttpCorrelationProtocol(trustedRequests),
66+
loggedRequests);
5767

5868

5969
using (logSource.Debug.OpenActivity(Formatted("Running the client"),

‎Diagnostics/PostSharp.Samples.Logging.ElasticStack/MicroserviceExample/Formatters/ActionResultFormatter.cs

-40
This file was deleted.

‎Diagnostics/PostSharp.Samples.Logging.ElasticStack/MicroserviceExample/Formatters/ObjectResultFormatter.cs

-21
This file was deleted.

‎Diagnostics/PostSharp.Samples.Logging.ElasticStack/MicroserviceExample/PostSharp.Samples.Logging.Distributed.Service.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<ItemGroup>
1515
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
1616
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
17-
<PackageReference Include="PostSharp.Patterns.Diagnostics" Version="6.8.4-preview-58a97e" />
18-
<PackageReference Include="PostSharp.Patterns.Diagnostics.Serilog" Version="6.8.4-preview-58a97e" />
19-
<PackageReference Include="PostSharp.Patterns.Diagnostics.AspNetCore" Version="6.8.4-preview-58a97e" />
17+
<PackageReference Include="PostSharp.Patterns.Diagnostics" Version="6.8.5-rc-e82a62" />
18+
<PackageReference Include="PostSharp.Patterns.Diagnostics.Serilog" Version="6.8.5-rc-e82a62" />
19+
<PackageReference Include="PostSharp.Patterns.Diagnostics.AspNetCore" Version="6.8.5-rc-e82a62" />
2020
<PackageReference Include="Serilog.Sinks.ElasticSearch" Version="8.0.1" />
2121
</ItemGroup>
2222
<ItemGroup>

‎Diagnostics/PostSharp.Samples.Logging.ElasticStack/MicroserviceExample/Program.cs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using MicroserviceExample.Formatters;
2-
using Microsoft.AspNetCore;
1+
using Microsoft.AspNetCore;
32
using Microsoft.AspNetCore.Hosting;
43
using Microsoft.AspNetCore.Mvc;
54
using PostSharp.Patterns.Diagnostics;
@@ -50,15 +49,16 @@ public static void Main(string[] args)
5049
backend.Options.ContextIdGenerationStrategy = ContextIdGenerationStrategy.Hierarchical;
5150
LoggingServices.DefaultBackend = backend;
5251

53-
LoggingServices.Formatters.Register(typeof(ActionResult<>), typeof(ActionResultFormatter<>));
54-
LoggingServices.Formatters.Register(new ActionResultFormatter());
55-
LoggingServices.Formatters.Register(new ObjectResultFormatter());
5652

5753

54+
// Defines a filter that selects trusted requests.
55+
// Enabling HTTP Correlation Protocol for communication with untrusted devices is a security risk.
56+
Predicate<CorrelationRequest> trustedRequests = request => request.RemoteHost == "localhost" ||
57+
request.RemoteHost == "127.0.0.1" ||
58+
request.RemoteHost == "::1";
59+
5860
// Instrument ASP.NET Core.
59-
AspNetCoreLogging.Initialize(
60-
correlationProtocol: new LegacyHttpCorrelationProtocol()
61-
);
61+
AspNetCoreLogging.Initialize( correlationProtocol: new LegacyHttpCorrelationProtocol(trustedRequests) );
6262

6363

6464
// Execute the web app.

‎Diagnostics/PostSharp.Samples.Logging.ElasticStack/MicroserviceExample/Properties/launchSettings.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"$schema": "http://json.schemastore.org/launchsettings.json",
1111
"profiles": {
1212
"IIS Express": {
13-
"commandName": "Executable",
13+
"commandName": "IISExpress",
1414
"launchBrowser": true,
1515
"launchUrl": "api/values",
1616
"environmentVariables": {

‎Diagnostics/PostSharp.Samples.Logging.ElmahIo/PostSharp.Samples.Logging.ElmahIo.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
<Version>3.0.3</Version>
1010
</PackageReference>
1111
<PackageReference Include="PostSharp.Patterns.Diagnostics">
12-
<Version>6.8.4-preview</Version>
12+
<Version>6.8.5-rc-e82a62</Version>
1313
</PackageReference>
1414
<PackageReference Include="PostSharp.Patterns.Diagnostics.Serilog">
15-
<Version>6.8.4-preview</Version>
15+
<Version>6.8.5-rc-e82a62</Version>
1616
</PackageReference>
1717
<PackageReference Include="Serilog.Sinks.ColoredConsole">
1818
<Version>3.0.1</Version>

‎Diagnostics/PostSharp.Samples.Logging.Etw.CustomSource/PostSharp.Samples.Logging.Etw.CustomSource.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@
5454
</ItemGroup>
5555
<ItemGroup>
5656
<PackageReference Include="PostSharp">
57-
<Version>6.8.4-preview</Version>
57+
<Version>6.8.5-rc</Version>
5858
</PackageReference>
5959
<PackageReference Include="PostSharp.Patterns.Diagnostics">
60-
<Version>6.8.4-preview</Version>
60+
<Version>6.8.5-rc-e82a62</Version>
6161
</PackageReference>
6262
<PackageReference Include="PostSharp.Patterns.Diagnostics.Tracing">
63-
<Version>6.8.4-preview</Version>
63+
<Version>6.8.5-rc-e82a62</Version>
6464
</PackageReference>
6565
<PackageReference Include="System.ValueTuple">
6666
<Version>4.5.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.Etw/PostSharp.Samples.Logging.Etw.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@
5353
</ItemGroup>
5454
<ItemGroup>
5555
<PackageReference Include="PostSharp">
56-
<Version>6.8.4-preview</Version>
56+
<Version>6.8.5-rc</Version>
5757
</PackageReference>
5858
<PackageReference Include="PostSharp.Patterns.Diagnostics">
59-
<Version>6.8.4-preview</Version>
59+
<Version>6.8.5-rc-e82a62</Version>
6060
</PackageReference>
6161
<PackageReference Include="PostSharp.Patterns.Diagnostics.Tracing">
62-
<Version>6.8.4-preview</Version>
62+
<Version>6.8.5-rc-e82a62</Version>
6363
</PackageReference>
6464
<PackageReference Include="System.ValueTuple">
6565
<Version>4.5.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.Log4Net/PostSharp.Samples.Logging.Log4Net.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@
6161
<Version>2.0.8</Version>
6262
</PackageReference>
6363
<PackageReference Include="PostSharp">
64-
<Version>6.8.4-preview</Version>
64+
<Version>6.8.5-rc</Version>
6565
</PackageReference>
6666
<PackageReference Include="PostSharp.Patterns.Diagnostics">
67-
<Version>6.8.4-preview</Version>
67+
<Version>6.8.5-rc-e82a62</Version>
6868
</PackageReference>
6969
<PackageReference Include="PostSharp.Patterns.Diagnostics.Log4Net">
70-
<Version>6.8.4-preview</Version>
70+
<Version>6.8.5-rc-e82a62</Version>
7171
</PackageReference>
7272
<PackageReference Include="System.ValueTuple">
7373
<Version>4.5.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.Loupe/PostSharp.Samples.Logging.Loupe.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
<Version>4.8.33</Version>
6565
</PackageReference>
6666
<PackageReference Include="PostSharp">
67-
<Version>6.8.4-preview</Version>
67+
<Version>6.8.5-rc</Version>
6868
</PackageReference>
6969
<PackageReference Include="PostSharp.Patterns.Diagnostics">
70-
<Version>6.8.4-preview</Version>
70+
<Version>6.8.5-rc-e82a62</Version>
7171
</PackageReference>
7272
<PackageReference Include="System.ValueTuple">
7373
<Version>4.5.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.NLog/PostSharp.Samples.Logging.NLog.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@
6161
<Version>4.6.8</Version>
6262
</PackageReference>
6363
<PackageReference Include="PostSharp">
64-
<Version>6.8.4-preview</Version>
64+
<Version>6.8.5-rc</Version>
6565
</PackageReference>
6666
<PackageReference Include="PostSharp.Patterns.Diagnostics">
67-
<Version>6.8.4-preview</Version>
67+
<Version>6.8.5-rc-e82a62</Version>
6868
</PackageReference>
6969
<PackageReference Include="PostSharp.Patterns.Diagnostics.NLog">
70-
<Version>6.8.4-preview</Version>
70+
<Version>6.8.5-rc-e82a62</Version>
7171
</PackageReference>
7272
<PackageReference Include="System.ValueTuple">
7373
<Version>4.5.0</Version>

‎Diagnostics/PostSharp.Samples.Logging.PerRequest/PostSharp.Samples.Logging.PerRequest.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="PostSharp.Patterns.Diagnostics" Version="6.8.4-preview" />
9-
<PackageReference Include="PostSharp.Patterns.Diagnostics.AspNetCore" Version="6.8.4-preview" />
10-
<PackageReference Include="PostSharp.Patterns.Diagnostics.Configuration" Version="6.8.4-preview" />
8+
<PackageReference Include="PostSharp.Patterns.Diagnostics" Version="6.8.5-rc-e82a62" />
9+
<PackageReference Include="PostSharp.Patterns.Diagnostics.AspNetCore" Version="6.8.5-rc-e82a62" />
10+
<PackageReference Include="PostSharp.Patterns.Diagnostics.Configuration" Version="6.8.5-rc-e82a62" />
1111
</ItemGroup>
1212

1313
</Project>

‎Diagnostics/PostSharp.Samples.Logging.Serilog/PostSharp.Samples.Logging.Serilog.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@
5353
</ItemGroup>
5454
<ItemGroup>
5555
<PackageReference Include="PostSharp">
56-
<Version>6.8.4-preview</Version>
56+
<Version>6.8.5-rc</Version>
5757
</PackageReference>
5858
<PackageReference Include="PostSharp.Patterns.Diagnostics">
59-
<Version>6.8.4-preview</Version>
59+
<Version>6.8.5-rc-e82a62</Version>
6060
</PackageReference>
6161
<PackageReference Include="PostSharp.Patterns.Diagnostics.Serilog">
62-
<Version>6.8.4-preview</Version>
62+
<Version>6.8.5-rc-e82a62</Version>
6363
</PackageReference>
6464
<PackageReference Include="Serilog">
6565
<Version>2.9.0</Version>

‎Framework/PostSharp.Samples.Authorization/PostSharp.Samples.Authorization.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
</ItemGroup>
8181
<ItemGroup>
8282
<PackageReference Include="PostSharp">
83-
<Version>6.8.4-preview</Version>
83+
<Version>6.8.5-rc</Version>
8484
</PackageReference>
8585
<PackageReference Include="System.Collections.Immutable">
8686
<Version>1.7.0</Version>

‎Framework/PostSharp.Samples.AutoDataContract/PostSharp.Samples.AutoDataContract.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
</ItemGroup>
6161
<ItemGroup>
6262
<PackageReference Include="PostSharp">
63-
<Version>6.8.4-preview</Version>
63+
<Version>6.8.5-rc</Version>
6464
</PackageReference>
6565
</ItemGroup>
6666
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

‎Framework/PostSharp.Samples.AutoRetry/PostSharp.Samples.AutoRetry.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<Version>2.0.3</Version>
7373
</PackageReference>
7474
<PackageReference Include="PostSharp">
75-
<Version>6.8.4-preview</Version>
75+
<Version>6.8.5-rc</Version>
7676
</PackageReference>
7777
</ItemGroup>
7878
<Import Project="..\..\PostSharp.Samples.targets" />

‎Framework/PostSharp.Samples.CustomCaching/PostSharp.Samples.CustomCaching.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</ItemGroup>
6060
<ItemGroup>
6161
<PackageReference Include="PostSharp">
62-
<Version>6.8.4-preview</Version>
62+
<Version>6.8.5-rc</Version>
6363
</PackageReference>
6464
</ItemGroup>
6565
<Import Project="..\..\PostSharp.Samples.targets" />

0 commit comments

Comments
 (0)