Skip to content

Commit fcb0bdb

Browse files
SteveSandersonMSSteveSandersonMS
authored
Unified project (#18)
* Fix unrelated build issues * Merge server and WebAssembly projects into one via multitargeting * Clean up sln
1 parent fda5b1e commit fcb0bdb

File tree

13 files changed

+49
-53
lines changed

13 files changed

+49
-53
lines changed

‎AspNetCore.sln

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,8 +1758,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server
17581758
EndProject
17591759
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorUnitedApp", "src\Components\Samples\BlazorUnitedApp\BlazorUnitedApp.csproj", "{09962BE7-48EC-44EA-B86A-3652FF0D7D1A}"
17601760
EndProject
1761-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorUnitedApp.WebAssembly", "src\Components\Samples\BlazorUnitedApp.WebAssembly\BlazorUnitedApp.WebAssembly.csproj", "{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}"
1762-
EndProject
17631761
Global
17641762
GlobalSection(SolutionConfigurationPlatforms) = preSolution
17651763
Debug|Any CPU = Debug|Any CPU
@@ -10553,22 +10551,6 @@ Global
1055310551
{09962BE7-48EC-44EA-B86A-3652FF0D7D1A}.Release|x64.Build.0 = Release|Any CPU
1055410552
{09962BE7-48EC-44EA-B86A-3652FF0D7D1A}.Release|x86.ActiveCfg = Release|Any CPU
1055510553
{09962BE7-48EC-44EA-B86A-3652FF0D7D1A}.Release|x86.Build.0 = Release|Any CPU
10556-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10557-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Debug|Any CPU.Build.0 = Debug|Any CPU
10558-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Debug|arm64.ActiveCfg = Debug|Any CPU
10559-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Debug|arm64.Build.0 = Debug|Any CPU
10560-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Debug|x64.ActiveCfg = Debug|Any CPU
10561-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Debug|x64.Build.0 = Debug|Any CPU
10562-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Debug|x86.ActiveCfg = Debug|Any CPU
10563-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Debug|x86.Build.0 = Debug|Any CPU
10564-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Release|Any CPU.ActiveCfg = Release|Any CPU
10565-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Release|Any CPU.Build.0 = Release|Any CPU
10566-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Release|arm64.ActiveCfg = Release|Any CPU
10567-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Release|arm64.Build.0 = Release|Any CPU
10568-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Release|x64.ActiveCfg = Release|Any CPU
10569-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Release|x64.Build.0 = Release|Any CPU
10570-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Release|x86.ActiveCfg = Release|Any CPU
10571-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D}.Release|x86.Build.0 = Release|Any CPU
1057210554
EndGlobalSection
1057310555
GlobalSection(SolutionProperties) = preSolution
1057410556
HideSolutionNode = FALSE
@@ -11437,7 +11419,6 @@ Global
1143711419
{74377D3E-E0C6-41A4-89ED-11A9C00142A9} = {166E48ED-9738-4E13-8618-0D805F6F0F65}
1143811420
{3C7C65BF-0C13-418E-90BD-EC9C3CD282CB} = {74377D3E-E0C6-41A4-89ED-11A9C00142A9}
1143911421
{09962BE7-48EC-44EA-B86A-3652FF0D7D1A} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
11440-
{42DA21DE-8DC8-4BED-BCE8-D7DDA9CEC60D} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
1144111422
EndGlobalSection
1144211423
GlobalSection(ExtensibilityGlobals) = postSolution
1144311424
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎src/Components/Components.slnf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"src\\Components\\Forms\\src\\Microsoft.AspNetCore.Components.Forms.csproj",
1616
"src\\Components\\Forms\\test\\Microsoft.AspNetCore.Components.Forms.Tests.csproj",
1717
"src\\Components\\Samples\\BlazorServerApp\\BlazorServerApp.csproj",
18-
"src\\Components\\Samples\\BlazorUnitedApp.WebAssembly\\BlazorUnitedApp.WebAssembly.csproj",
1918
"src\\Components\\Samples\\BlazorUnitedApp\\BlazorUnitedApp.csproj",
2019
"src\\Components\\Server\\src\\Microsoft.AspNetCore.Components.Server.csproj",
2120
"src\\Components\\Server\\test\\Microsoft.AspNetCore.Components.Server.Tests.csproj",

‎src/Components/Samples/BlazorUnitedApp.WebAssembly/BlazorUnitedApp.WebAssembly.csproj

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

‎src/Components/Samples/BlazorUnitedApp.WebAssembly/_Imports.razor

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

‎src/Components/Samples/BlazorUnitedApp/BlazorUnitedApp.csproj

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
1+
<Project>
32
<PropertyGroup>
4-
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
3+
<TargetFrameworks>net8.0;net7.0-browser</TargetFrameworks>
54
<IsShippingPackage>false</IsShippingPackage>
5+
<ImplicitUsings>true</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>
88

9-
<ItemGroup>
9+
<Import Project="UnifiedProject.props" />
10+
11+
<ItemGroup Condition="'$(IsBrowser)' != 'true'">
1012
<Reference Include="Microsoft.AspNetCore" />
1113
<Reference Include="Microsoft.AspNetCore.Components.Server" />
1214
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
@@ -15,8 +17,12 @@
1517
<Reference Include="Microsoft.Extensions.Hosting" />
1618
</ItemGroup>
1719

18-
<ItemGroup>
19-
<ProjectReference Include="..\BlazorUnitedApp.WebAssembly\BlazorUnitedApp.WebAssembly.csproj" />
20-
</ItemGroup>
20+
<ItemGroup Condition="'$(IsBrowser)' == 'true'">
21+
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
22+
<Reference Include="System.Net.Http.Json" />
23+
<Content Remove="Pages\CounterPassive.razor" />
24+
<Content Remove="Shared\ActionButton.razor" />
25+
</ItemGroup>
2126

27+
<Import Project="UnifiedProject.targets" />
2228
</Project>

‎src/Components/Samples/BlazorUnitedApp/Program.cs renamed to ‎src/Components/Samples/BlazorUnitedApp/Program.Server.cs

File renamed without changes.

‎src/Components/Samples/BlazorUnitedApp.WebAssembly/Program.cs renamed to ‎src/Components/Samples/BlazorUnitedApp/Program.WebAssembly.cs

File renamed without changes.

‎src/Components/Samples/BlazorUnitedApp.WebAssembly/CounterUI.razor renamed to ‎src/Components/Samples/BlazorUnitedApp/Shared/CounterUI.razor

File renamed without changes.

‎src/Components/Samples/BlazorUnitedApp/UnifiedProject.props

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetPlatformIdentifier>windows</TargetPlatformIdentifier>
4+
<IsBrowser Condition="'$(TargetFramework)' == 'net7.0-browser'">true</IsBrowser>
5+
<DefineConstants Condition="'$(IsBrowser)' == 'true'">BROWSER</DefineConstants>
6+
</PropertyGroup>
7+
8+
<Import Condition="'$(IsBrowser)' != 'true'" Sdk="Microsoft.NET.Sdk.Web" Project="Sdk.props" />
9+
<Import Condition="'$(IsBrowser)' == 'true'" Sdk="Microsoft.NET.Sdk.BlazorWebAssembly" Project="Sdk.props" />
10+
11+
<ItemGroup Condition="'$(IsBrowser)' != 'true'">
12+
<StaticWebAssetDiscoveryPattern Include="$(PackageId)\wwwroot">
13+
<Source>$(PackageId)</Source>
14+
<BasePath>$(StaticWebAssetBasePath)</BasePath>
15+
<ContentRoot>$(OutputPath)..\net7.0-browser\wwwroot</ContentRoot>
16+
<Pattern>**</Pattern>
17+
</StaticWebAssetDiscoveryPattern>
18+
19+
<Compile Remove="**\*.WebAssembly.cs" />
20+
<None Include="**\*.WebAssembly.cs" />
21+
</ItemGroup>
22+
23+
<ItemGroup Condition="'$(IsBrowser)' == 'true'">
24+
<Compile Remove="Controllers\**" />
25+
<Compile Remove="**\*.Server.cs" />
26+
<None Include="Controllers\**" />
27+
<None Include="**\*.Server.cs" />
28+
</ItemGroup>
29+
</Project>

‎src/Components/Samples/BlazorUnitedApp/UnifiedProject.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<Project>
2+
<Import Condition="'$(IsBrowser)' == 'true'" Sdk="Microsoft.NET.Sdk.BlazorWebAssembly" Project="Sdk.targets" />
3+
<Import Condition="'$(IsBrowser)' != 'true'" Sdk="Microsoft.NET.Sdk.Web" Project="Sdk.targets" />
4+
</Project>

‎src/Components/Samples/BlazorUnitedApp/_Imports.razor

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
@using System.Net.Http
2-
@using Microsoft.AspNetCore.Authorization
3-
@using Microsoft.AspNetCore.Components.Authorization
42
@using Microsoft.AspNetCore.Components.Forms
53
@using Microsoft.AspNetCore.Components.Routing
64
@using Microsoft.AspNetCore.Components.Web
75
@using Microsoft.JSInterop
86
@using BlazorUnitedApp
97
@using BlazorUnitedApp.Shared
10-
@using BlazorUnitedApp.WebAssembly
8+

‎src/Components/WebAssembly/WebAssembly/src/Prerendering/ClientComponentParameterDeserializer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public ParameterView DeserializeParameters(IList<ComponentParameter> parametersD
6767
parameterValue = JsonSerializer.Deserialize(
6868
value.GetRawText(),
6969
parameterType,
70-
WebAssemblyComponentSerializationSettings.JsonSerializationOptions);
70+
WebAssemblyComponentSerializationSettings.JsonSerializationOptions)!;
7171
}
7272

7373
parametersDictionary[definition.Name] = parameterValue;

‎src/Mvc/Mvc.ViewFeatures/src/RazorComponents/HtmlRenderer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ private string PrepareRenderFragment(RenderFragment fragment)
436436
// and run their full lifecycle (disposal, etc.)
437437
var rootComponent = new FragmentRenderer { Fragment = fragment };
438438
string initialHtml = null;
439-
var renderTask = _htmlRenderer.Dispatcher.InvokeAsync(async () =>
439+
var renderTask = _htmlRenderer.Dispatcher.InvokeAsync(() =>
440440
{
441441
// WARNING: THIS IS NOT CORRECT AND CAN CAUSE AN INFINITE LOOP
442442
// We should *not* really be creating new root components as a side-effect of

0 commit comments

Comments
 (0)