Skip to content

Commit 62ead8a

Browse files
MackinnonBuckMackinnonBuck
committed
Revert sample project changes
1 parent f678b4a commit 62ead8a

14 files changed

+50
-211
lines changed

‎AspNetCore.sln

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,10 +1786,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authen
17861786
EndProject
17871787
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IdentitySample.ApiEndpoints", "src\Identity\samples\IdentitySample.ApiEndpoints\IdentitySample.ApiEndpoints.csproj", "{37FC77EA-AC44-4D08-B002-8EFF415C424A}"
17881788
EndProject
1789-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorUnitedApp.Shared", "src\Components\Samples\BlazorUnitedApp.Shared\BlazorUnitedApp.Shared.csproj", "{087CA931-BBD4-4184-9470-850DDC2B08CF}"
1790-
EndProject
1791-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorUnitedApp.WebAssembly", "src\Components\Samples\BlazorUnitedApp.WebAssembly\BlazorUnitedApp.WebAssembly.csproj", "{453469D5-F5A3-42B5-9D03-DFC2529A3C72}"
1792-
EndProject
17931789
Global
17941790
GlobalSection(SolutionConfigurationPlatforms) = preSolution
17951791
Debug|Any CPU = Debug|Any CPU
@@ -10743,38 +10739,6 @@ Global
1074310739
{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x64.Build.0 = Release|Any CPU
1074410740
{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x86.ActiveCfg = Release|Any CPU
1074510741
{37FC77EA-AC44-4D08-B002-8EFF415C424A}.Release|x86.Build.0 = Release|Any CPU
10746-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10747-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
10748-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Debug|arm64.ActiveCfg = Debug|Any CPU
10749-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Debug|arm64.Build.0 = Debug|Any CPU
10750-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Debug|x64.ActiveCfg = Debug|Any CPU
10751-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Debug|x64.Build.0 = Debug|Any CPU
10752-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Debug|x86.ActiveCfg = Debug|Any CPU
10753-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Debug|x86.Build.0 = Debug|Any CPU
10754-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
10755-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Release|Any CPU.Build.0 = Release|Any CPU
10756-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Release|arm64.ActiveCfg = Release|Any CPU
10757-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Release|arm64.Build.0 = Release|Any CPU
10758-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Release|x64.ActiveCfg = Release|Any CPU
10759-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Release|x64.Build.0 = Release|Any CPU
10760-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Release|x86.ActiveCfg = Release|Any CPU
10761-
{087CA931-BBD4-4184-9470-850DDC2B08CF}.Release|x86.Build.0 = Release|Any CPU
10762-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
10763-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Debug|Any CPU.Build.0 = Debug|Any CPU
10764-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Debug|arm64.ActiveCfg = Debug|Any CPU
10765-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Debug|arm64.Build.0 = Debug|Any CPU
10766-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Debug|x64.ActiveCfg = Debug|Any CPU
10767-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Debug|x64.Build.0 = Debug|Any CPU
10768-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Debug|x86.ActiveCfg = Debug|Any CPU
10769-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Debug|x86.Build.0 = Debug|Any CPU
10770-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Release|Any CPU.ActiveCfg = Release|Any CPU
10771-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Release|Any CPU.Build.0 = Release|Any CPU
10772-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Release|arm64.ActiveCfg = Release|Any CPU
10773-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Release|arm64.Build.0 = Release|Any CPU
10774-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Release|x64.ActiveCfg = Release|Any CPU
10775-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Release|x64.Build.0 = Release|Any CPU
10776-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Release|x86.ActiveCfg = Release|Any CPU
10777-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72}.Release|x86.Build.0 = Release|Any CPU
1077810742
EndGlobalSection
1077910743
GlobalSection(SolutionProperties) = preSolution
1078010744
HideSolutionNode = FALSE
@@ -11657,8 +11621,6 @@ Global
1165711621
{56291265-B7BF-4756-92AB-FC30F09381D1} = {822D1519-77F0-484A-B9AB-F694C2CC25F1}
1165811622
{66FA1041-5556-43A0-9CA3-F9937F085F6E} = {56291265-B7BF-4756-92AB-FC30F09381D1}
1165911623
{37FC77EA-AC44-4D08-B002-8EFF415C424A} = {64B2A28F-6D82-4F2B-B0BB-88DE5216DD2C}
11660-
{087CA931-BBD4-4184-9470-850DDC2B08CF} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
11661-
{453469D5-F5A3-42B5-9D03-DFC2529A3C72} = {5FE1FBC1-8CE3-4355-9866-44FE1307C5F1}
1166211624
EndGlobalSection
1166311625
GlobalSection(ExtensibilityGlobals) = postSolution
1166411626
SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

‎src/Components/Components.slnf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
"src\\Components\\QuickGrid\\Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter\\src\\Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter.csproj",
2020
"src\\Components\\QuickGrid\\Microsoft.AspNetCore.Components.QuickGrid\\src\\Microsoft.AspNetCore.Components.QuickGrid.csproj",
2121
"src\\Components\\Samples\\BlazorServerApp\\BlazorServerApp.csproj",
22-
"src\\Components\\Samples\\BlazorUnitedApp.Shared\\BlazorUnitedApp.Shared.csproj",
23-
"src\\Components\\Samples\\BlazorUnitedApp.WebAssembly\\BlazorUnitedApp.WebAssembly.csproj",
2422
"src\\Components\\Samples\\BlazorUnitedApp\\BlazorUnitedApp.csproj",
2523
"src\\Components\\Server\\src\\Microsoft.AspNetCore.Components.Server.csproj",
2624
"src\\Components\\Server\\test\\Microsoft.AspNetCore.Components.Server.Tests.csproj",
@@ -150,4 +148,4 @@
150148
"src\\WebEncoders\\src\\Microsoft.Extensions.WebEncoders.csproj"
151149
]
152150
}
153-
}
151+
}

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

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

‎src/Components/Samples/BlazorUnitedApp.Shared/CounterButtonServer.razor

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

‎src/Components/Samples/BlazorUnitedApp.Shared/CounterButtonWasm.razor

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

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

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

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

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

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

‎src/Components/Samples/BlazorUnitedApp.WebAssembly/Properties/launchSettings.json

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

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,9 @@
99
<ItemGroup>
1010
<Reference Include="Microsoft.AspNetCore" />
1111
<Reference Include="Microsoft.AspNetCore.Components.Endpoints" />
12-
<Reference Include="Microsoft.AspNetCore.Components.Server" />
13-
<Reference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" />
1412
<Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
1513
<Reference Include="Microsoft.Extensions.Hosting" />
1614
<Reference Include="Microsoft.AspNetCore.StaticFiles" />
1715
</ItemGroup>
1816

19-
<ItemGroup>
20-
<ProjectReference Include="..\BlazorUnitedApp.Shared\BlazorUnitedApp.Shared.csproj" />
21-
<ProjectReference Include="..\BlazorUnitedApp.WebAssembly\BlazorUnitedApp.WebAssembly.csproj" />
22-
</ItemGroup>
23-
2417
</Project>

‎src/Components/Samples/BlazorUnitedApp/Pages/Counter.razor

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,15 @@
44

55
<h1>Counter</h1>
66

7-
<CounterButtonWasm />
7+
<p role="status">Current count: @currentCount</p>
88

9-
<hr />
9+
<button class="btn btn-primary" @onclick="IncrementCount">Click me</button>
1010

11-
<CounterButtonServer />
11+
@code {
12+
private int currentCount = 0;
1213

14+
private void IncrementCount()
15+
{
16+
currentCount++;
17+
}
18+
}

‎src/Components/Samples/BlazorUnitedApp/Pages/FetchData.razor

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,47 @@
11
@page "/fetchdata"
2+
@using BlazorUnitedApp.Data
3+
@inject WeatherForecastService ForecastService
24

35
<PageTitle>Weather forecast</PageTitle>
46

57
<h1>Weather forecast</h1>
68

79
<p>This component demonstrates fetching data from a service.</p>
810

9-
<ForecastTable />
11+
@if (forecasts == null)
12+
{
13+
<p><em>Loading...</em></p>
14+
}
15+
else
16+
{
17+
<table class="table">
18+
<thead>
19+
<tr>
20+
<th>Date</th>
21+
<th>Temp. (C)</th>
22+
<th>Temp. (F)</th>
23+
<th>Summary</th>
24+
</tr>
25+
</thead>
26+
<tbody>
27+
@foreach (var forecast in forecasts)
28+
{
29+
<tr>
30+
<td>@forecast.Date.ToShortDateString()</td>
31+
<td>@forecast.TemperatureC</td>
32+
<td>@forecast.TemperatureF</td>
33+
<td>@forecast.Summary</td>
34+
</tr>
35+
}
36+
</tbody>
37+
</table>
38+
}
39+
40+
@code {
41+
private WeatherForecast[]? forecasts;
42+
43+
protected override async Task OnInitializedAsync()
44+
{
45+
forecasts = await ForecastService.GetForecastAsync(DateOnly.FromDateTime(DateTime.Now));
46+
}
47+
}

‎src/Components/Samples/BlazorUnitedApp/Program.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
// Add services to the container.
1010
builder.Services.AddRazorComponents();
11-
builder.Services.AddServerSideBlazor();
1211

1312
builder.Services.AddSingleton<WeatherForecastService>();
1413

@@ -23,12 +22,11 @@
2322
}
2423

2524
app.UseHttpsRedirection();
26-
app.UseBlazorFrameworkFiles();
25+
2726
app.UseStaticFiles();
2827

2928
app.UseRouting();
3029

3130
app.MapRazorComponents<App>();
32-
app.MapBlazorHub();
3331

3432
app.Run();

‎src/Components/Samples/BlazorUnitedApp/Shared/ForecastTable.razor

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

0 commit comments

Comments
 (0)