Skip to content

Commit c162395

Browse files
YuriyDurovYuriyDurov
committed
Upgrade to dotnet 9
1 parent 4f782c7 commit c162395

File tree

17 files changed

+44
-203
lines changed

17 files changed

+44
-203
lines changed

Diff for: ‎BitzArt.Blazor.State.sln

-7
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{853EC833-DEF
4646
EndProject
4747
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BitzArt.Blazor.RenderStrategies", "src\BitzArt.Blazor.RenderStrategies\BitzArt.Blazor.RenderStrategies.csproj", "{201A4DFF-23FA-40C5-8920-9B9907D95E57}"
4848
EndProject
49-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BitzArt.Blazor.DotNet9Upgrade", "src\BitzArt.Blazor.DotNet9Upgrade\BitzArt.Blazor.DotNet9Upgrade.csproj", "{496F3A00-64FE-4A3F-B024-404FE5AFB1F2}"
50-
EndProject
5149
Global
5250
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5351
Debug|Any CPU = Debug|Any CPU
@@ -74,10 +72,6 @@ Global
7472
{201A4DFF-23FA-40C5-8920-9B9907D95E57}.Debug|Any CPU.Build.0 = Debug|Any CPU
7573
{201A4DFF-23FA-40C5-8920-9B9907D95E57}.Release|Any CPU.ActiveCfg = Release|Any CPU
7674
{201A4DFF-23FA-40C5-8920-9B9907D95E57}.Release|Any CPU.Build.0 = Release|Any CPU
77-
{496F3A00-64FE-4A3F-B024-404FE5AFB1F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
78-
{496F3A00-64FE-4A3F-B024-404FE5AFB1F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
79-
{496F3A00-64FE-4A3F-B024-404FE5AFB1F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
80-
{496F3A00-64FE-4A3F-B024-404FE5AFB1F2}.Release|Any CPU.Build.0 = Release|Any CPU
8175
EndGlobalSection
8276
GlobalSection(SolutionProperties) = preSolution
8377
HideSolutionNode = FALSE
@@ -91,7 +85,6 @@ Global
9185
{5EC46C1C-E2E1-4A1E-8CF5-BCE56F491ECF} = {AF748271-0827-41E0-9ACC-F6B38227B85F}
9286
{AF748271-0827-41E0-9ACC-F6B38227B85F} = {818B8950-B52B-49E9-B15B-196024C22A18}
9387
{201A4DFF-23FA-40C5-8920-9B9907D95E57} = {5A39EAA1-A9D6-402C-B1CD-1704F0DBD80B}
94-
{496F3A00-64FE-4A3F-B024-404FE5AFB1F2} = {5A39EAA1-A9D6-402C-B1CD-1704F0DBD80B}
9588
EndGlobalSection
9689
GlobalSection(ExtensibilityGlobals) = postSolution
9790
SolutionGuid = {70901A76-781C-4DB7-A313-3E93BE0F665F}

Diff for: ‎sample/BitzArt.Blazor.State.SampleApp/BitzArt.Blazor.State.SampleApp.Client/BitzArt.Blazor.State.SampleApp.Client.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
13+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

Diff for: ‎sample/BitzArt.Blazor.State.SampleApp/BitzArt.Blazor.State.SampleApp/BitzArt.Blazor.State.SampleApp.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<ProjectReference Include="..\BitzArt.Blazor.State.SampleApp.Client\BitzArt.Blazor.State.SampleApp.Client.csproj" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.8" />
11+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
1212
</ItemGroup>
1313

1414
</Project>

Diff for: ‎sample/BitzArt.Blazor.State.SampleApp/BitzArt.Blazor.State.SampleApp/Program.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public static void Main(string[] args)
2020

2121
var app = builder.Build();
2222

23-
// TODO: Dotnet 9
24-
//app.MapStaticAssets();
23+
app.MapStaticAssets();
2524
app.UseStaticFiles();
2625
app.UseAntiforgery();
2726

Diff for: ‎src/BitzArt.Blazor.DotNet9Upgrade/BitzArt.Blazor.DotNet9Upgrade.csproj

-41
This file was deleted.

Diff for: ‎src/BitzArt.Blazor.DotNet9Upgrade/RendererInfo.cs

-69
This file was deleted.

Diff for: ‎src/BitzArt.Blazor.RenderStrategies/BitzArt.Blazor.RenderStrategies.csproj

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<RootNamespace>BitzArt.Blazor.Render.Strategies</RootNamespace>
@@ -32,12 +32,11 @@
3232

3333
<ItemGroup>
3434
<PackageReference Include="BitzArt.CoreExtensions" Version="1.0.0" />
35-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
36-
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.8" />
3735
</ItemGroup>
3836

39-
<ItemGroup>
40-
<ProjectReference Include="..\BitzArt.Blazor.DotNet9Upgrade\BitzArt.Blazor.DotNet9Upgrade.csproj" />
37+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
38+
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="9.*" />
39+
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="9.*" />
4140
</ItemGroup>
4241

4342
</Project>

Diff for: ‎src/BitzArt.Blazor.RenderStrategies/Components/StrategyRenderedComponent.cs

+13-27
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,6 @@ internal IServiceProvider ServiceProvider
3737
set => RenderStrategy!.ServiceProvider = value;
3838
}
3939

40-
// TODO: Dotnet 9
41-
/// <summary>
42-
/// To be replaced with the default implementation with the release of dotnet 9.
43-
/// </summary>
44-
[Inject]
45-
public RendererInfo RendererInfo
46-
{
47-
get => RenderStrategy!.RendererInfo;
48-
internal set => RenderStrategy!.RendererInfo = value;
49-
}
50-
5140
internal virtual bool ShouldUseDefaultStrategy => true;
5241

5342
private IComponentRenderStrategy? renderStrategy;
@@ -98,11 +87,10 @@ protected virtual void BuildRenderTree(RenderTreeBuilder builder)
9887
internal void BuildRenderTreeInternal(RenderTreeBuilder builder)
9988
=> BuildRenderTree(builder);
10089

101-
//TODO: Dotnet 9
102-
// <summary>
103-
// Gets the <see cref="IComponentRenderMode"/> assigned to this component.
104-
// </summary>
105-
//protected IComponentRenderMode? AssignedRenderMode => RenderStrategy!.AssignedRenderMode;
90+
/// <summary>
91+
/// Gets the <see cref="IComponentRenderMode"/> assigned to this component.
92+
/// </summary>
93+
protected IComponentRenderMode? AssignedRenderMode => RenderStrategy!.AssignedRenderMode;
10694

10795
/// <summary>
10896
/// Returns a flag to indicate whether the component should render.
@@ -114,17 +102,15 @@ protected virtual bool ShouldRender()
114102
internal bool ShouldRenderInternal()
115103
=> ShouldRender();
116104

117-
// TODO: Dotnet 9
118-
// <summary>
119-
// Gets the <see cref="Microsoft.AspNetCore.Components.RendererInfo"/> the component is running on.
120-
// </summary>
121-
//protected RendererInfo RendererInfo => RenderStrategy!.Handle.RendererInfo;
122-
123-
// TODO: Dotnet 9
124-
// <summary>
125-
// Gets the <see cref="ResourceAssetCollection"/> for the application.
126-
// </summary>
127-
//protected ResourceAssetCollection Assets => RenderStrategy!.Handle.Assets;
105+
/// <summary>
106+
/// Gets the <see cref="Microsoft.AspNetCore.Components.RendererInfo"/> the component is running on.
107+
/// </summary>
108+
protected RendererInfo RendererInfo => RenderStrategy!.Handle.RendererInfo;
109+
110+
/// <summary>
111+
/// Gets the <see cref="ResourceAssetCollection"/> for the application.
112+
/// </summary>
113+
protected ResourceAssetCollection Assets => RenderStrategy!.Handle.Assets;
128114

129115
/// <summary>
130116
/// Method invoked when the component is ready to start, having received its

Diff for: ‎src/BitzArt.Blazor.RenderStrategies/Prerequisites/ComponentPrerequisite.cs

+6-11
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@
66
/// For a prerequisite type that automatically checks for completion at a specified interval,
77
/// see <see cref="AutomaticComponentPrerequisite"/>.
88
/// </summary>
9-
public class ComponentPrerequisite
9+
/// <remarks>
10+
/// Creates a new instance of <see cref="ComponentPrerequisite"/>.
11+
/// </remarks>
12+
/// <param name="requirement"><inheritdoc cref="Requirement" path="/summary"/></param>
13+
public class ComponentPrerequisite(Func<bool> requirement)
1014
{
1115
/// <summary>
1216
/// A function that returns a boolean value indicating
1317
/// whether the prerequisite is met.
1418
/// </summary>
15-
public Func<bool> Requirement { get; set; }
19+
public Func<bool> Requirement { get; set; } = requirement;
1620

1721
/// <summary>
1822
/// A function that returns a boolean value indicating
@@ -124,15 +128,6 @@ public ComponentPrerequisite(Func<bool> requirement, Func<bool> constraint)
124128
Constraint = constraint;
125129
}
126130

127-
/// <summary>
128-
/// Creates a new instance of <see cref="ComponentPrerequisite"/>.
129-
/// </summary>
130-
/// <param name="requirement"><inheritdoc cref="Requirement" path="/summary"/></param>
131-
public ComponentPrerequisite(Func<bool> requirement)
132-
{
133-
Requirement = requirement;
134-
}
135-
136131
internal async Task EnsureAsync()
137132
{
138133
try

Diff for: ‎src/BitzArt.Blazor.RenderStrategies/Strategies/ComponentRenderStrategy.cs

+4-9
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ namespace BitzArt.Blazor;
55

66
internal class ComponentRenderStrategy : IComponentRenderStrategy
77
{
8-
// TODO: Dotnet 9
9-
// private (IComponentRenderMode? mode, bool cached) _renderMode;
8+
private (IComponentRenderMode? mode, bool cached) _renderMode;
109
private bool _initialized;
1110
private bool _hasNeverRendered = true;
1211
private bool _hasPendingQueuedRender;
@@ -15,9 +14,6 @@ internal class ComponentRenderStrategy : IComponentRenderStrategy
1514
public bool IsInitialized { get; private set; } = false;
1615
public bool IsReady { get; private set; } = false;
1716

18-
//TODO: Dotnet 9
19-
public RendererInfo RendererInfo { get; set; } = null!;
20-
2117
public RenderHandle Handle { get; set; }
2218

2319
private RenderFragment RenderFragment
@@ -33,8 +29,7 @@ private RenderFragment RenderFragment
3329

3430
public IServiceProvider ServiceProvider { get; set; } = null!;
3531

36-
// TODO: Dotnet 9
37-
/*internal IComponentRenderMode? AssignedRenderMode
32+
IComponentRenderMode? IComponentRenderStrategy.AssignedRenderMode
3833
{
3934
get
4035
{
@@ -46,7 +41,7 @@ private RenderFragment RenderFragment
4641

4742
return _renderMode.mode;
4843
}
49-
}*/
44+
}
5045

5146
public void SetCustomRenderFragment(Action<RenderTreeBuilder, RenderFragment> customAction)
5247
=> _customRenderFragment = builder => customAction(builder, _renderFragment);
@@ -71,7 +66,7 @@ internal void OnRenderStarted()
7166
_hasNeverRendered = false;
7267
}
7368

74-
internal void OnRendered()
69+
internal static void OnRendered()
7570
{
7671
}
7772

Diff for: ‎src/BitzArt.Blazor.RenderStrategies/Strategies/IComponentRenderStrategy.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ public interface IComponentRenderStrategy
1515
internal IServiceProvider ServiceProvider { get; set; }
1616

1717
internal RenderHandle Handle { get; set; }
18-
19-
internal RendererInfo RendererInfo { get; set; }
18+
19+
internal IComponentRenderMode? AssignedRenderMode { get; }
2020

2121
internal void Attach(RenderHandle renderHandle);
2222

Diff for: ‎src/BitzArt.Blazor.State/BitzArt.Blazor.State.csproj

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFrameworks>net9.0</TargetFrameworks>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<RootNamespace>BitzArt.Blazor.State</RootNamespace>
@@ -27,11 +27,6 @@
2727
</AssemblyAttribute>
2828
</ItemGroup>
2929

30-
<ItemGroup>
31-
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.8" />
32-
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.8" />
33-
</ItemGroup>
34-
3530
<ItemGroup>
3631
<ProjectReference Include="..\BitzArt.Blazor.RenderStrategies\BitzArt.Blazor.RenderStrategies.csproj" />
3732
</ItemGroup>

Diff for: ‎src/BitzArt.Blazor.State/Builder/AddBlazorStateExtension.cs

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ public static IServiceCollection AddBlazorState(this IServiceCollection services
3030

3131
services.AddSingleton<PersistentComponentStateComposer>();
3232

33-
services.AddRendererInfo();
34-
3533
return services;
3634
}
3735
}

0 commit comments

Comments
 (0)