Skip to content

Commit 39787b8

Browse files
prochan2prochan2
authored
Merge pull request #14 from postsharp/topic/story-29346-postsharp610rc
PostSharp updated to 6.10.4-rc
2 parents 0d210c0 + 28de1b1 commit 39787b8

File tree

100 files changed

+7424
-6420
lines changed

Some content is hidden

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

100 files changed

+7424
-6420
lines changed

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/App.razor‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
<Router AppAssembly="@typeof(Program).Assembly">
1+
<Router AppAssembly="@typeof(App).Assembly">
22
<Found Context="routeData">
33
<RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
4+
<FocusOnNavigate RouteData="@routeData" Selector="h1" />
45
</Found>
56
<NotFound>
7+
<PageTitle>Not found</PageTitle>
68
<LayoutView Layout="@typeof(MainLayout)">
7-
<p>Sorry, there's nothing at this address.</p>
9+
<p role="alert">Sorry, there's nothing at this address.</p>
810
</LayoutView>
911
</NotFound>
1012
</Router>

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/Aspects/AutoRetryAttribute.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
using PostSharp.Aspects;
22
using PostSharp.Extensibility;
33
using PostSharp.Serialization;
4-
using System;
54
using System.Data;
6-
using System.Linq;
75
using System.Net;
8-
using System.Threading.Tasks;
96

107
namespace PostSharp.Samples.AutoRetry.Aspects
118
{
@@ -26,7 +23,7 @@ public AutoRetryAttribute()
2623
// Set the default values for properties.
2724
MaxRetries = 5;
2825
Delay = 3;
29-
HandledExceptions = new[] { typeof(WebException), typeof(DataException) };
26+
HandledExceptions = new[] { typeof(HttpRequestException), typeof(WebException), typeof(DataException) };
3027
}
3128

3229
/// <summary>

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/LinkerConfig.xml‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/Model/WeatherForecast.cs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
namespace PostSharp.Samples.Blazor.AutoRetry.Model
2+
{
3+
public class WeatherForecast
4+
{
5+
public DateTime Date { get; set; }
6+
7+
public int TemperatureC { get; set; }
8+
9+
public string? Summary { get; set; }
10+
11+
public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
12+
}
13+
}

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/Pages/FetchData.razor‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
@page "/fetchdata"
2-
@inject HttpClient Http
1+
@page "/fetchdata"
2+
@using PostSharp.Samples.Blazor.AutoRetry.Model
33
@using PostSharp.Samples.Blazor.AutoRetry.Services
4+
@inject HttpClient Http
5+
6+
<PageTitle>Weather forecast</PageTitle>
47

58
<h1>Weather forecast</h1>
69

7-
<p>This component demonstrates fetching data from the server with auto-retry on connection failures.</p>
10+
<p>This component demonstrates fetching data from the server.</p>
811

9-
@if ( forecasts == null )
12+
@if (forecasts == null)
1013
{
1114
<p><em>Loading...</em></p>
1215
}
@@ -22,7 +25,7 @@ else
2225
</tr>
2326
</thead>
2427
<tbody>
25-
@foreach ( var forecast in forecasts )
28+
@foreach (var forecast in forecasts)
2629
{
2730
<tr>
2831
<td>@forecast.Date.ToShortDateString()</td>
@@ -36,7 +39,7 @@ else
3639
}
3740

3841
@code {
39-
private WeatherForecast[] forecasts;
42+
private WeatherForecast[]? forecasts;
4043

4144
protected override async Task OnInitializedAsync()
4245
{

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/Pages/Index.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@page "/"
22

3-
<h1>Hello, world!</h1>
3+
<PageTitle>Index</PageTitle>
44

5-
Welcome to your new app.
5+
<h1>Hello, world!</h1>
66

7-
For more information about Blazor support in PostSharp check out our documentation at <a href="https://doc.postsharp.net/blazor">https://doc.postsharp.net/blazor</a>.
7+
Welcome to the PostSharp AutoRetry sample in WebAssembly.

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
5-
<RazorLangVersion>3.0</RazorLangVersion>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Nullable>enable</Nullable>
6+
<ImplicitUsings>enable</ImplicitUsings>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
12-
<PackageReference Include="PostSharp" Version="6.8.5-rc" />
13-
<PackageReference Include="System.Net.Http.Json" Version="3.2.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
12+
<PackageReference Include="PostSharp" Version="6.10.4-rc" />
1413
</ItemGroup>
15-
16-
<ItemGroup>
17-
<BlazorLinkerDescriptor Include="LinkerConfig.xml" />
18-
</ItemGroup>
19-
14+
2015
</Project>

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/Program.cs‎

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,11 @@
1-
using System;
2-
using System.Net.Http;
3-
using System.Collections.Generic;
4-
using System.Threading.Tasks;
5-
using System.Text;
1+
using Microsoft.AspNetCore.Components.Web;
62
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
7-
using Microsoft.Extensions.Configuration;
8-
using Microsoft.Extensions.DependencyInjection;
9-
using Microsoft.Extensions.Logging;
3+
using PostSharp.Samples.Blazor.AutoRetry;
104

11-
namespace PostSharp.Samples.Blazor.AutoRetry
12-
{
13-
public class Program
14-
{
15-
public static async Task Main(string[] args)
16-
{
17-
var builder = WebAssemblyHostBuilder.CreateDefault(args);
18-
builder.RootComponents.Add<App>("app");
5+
var builder = WebAssemblyHostBuilder.CreateDefault(args);
6+
builder.RootComponents.Add<App>("#app");
7+
builder.RootComponents.Add<HeadOutlet>("head::after");
198

20-
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
9+
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
2110

22-
await builder.Build().RunAsync();
23-
}
24-
}
25-
}
11+
await builder.Build().RunAsync();

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/Properties/launchSettings.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,25 @@
33
"windowsAuthentication": false,
44
"anonymousAuthentication": true,
55
"iisExpress": {
6-
"applicationUrl": "http://localhost:1184",
6+
"applicationUrl": "http://localhost:2428",
77
"sslPort": 0
88
}
99
},
1010
"profiles": {
11-
"IIS Express": {
12-
"commandName": "IISExpress",
11+
"PostSharp.Samples.Blazor.AutoRetry": {
12+
"commandName": "Project",
13+
"dotnetRunMessages": true,
1314
"launchBrowser": true,
1415
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
16+
"applicationUrl": "http://localhost:5000",
1517
"environmentVariables": {
1618
"ASPNETCORE_ENVIRONMENT": "Development"
1719
}
1820
},
19-
"PostSharp.Samples.Blazor.AutoRetry": {
20-
"commandName": "Project",
21+
"IIS Express": {
22+
"commandName": "IISExpress",
2123
"launchBrowser": true,
2224
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
23-
"applicationUrl": "http://localhost:5000",
2425
"environmentVariables": {
2526
"ASPNETCORE_ENVIRONMENT": "Development"
2627
}

‎Blazor/PostSharp.Samples.Blazor.AutoRetry/README.md‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)