Skip to content

Commit 29b5322

Browse files
ilonatommyilonatommy
committed
Use existing TestContentPackage as a shared project.
1 parent f7c6092 commit 29b5322

20 files changed

+12
-32
lines changed

‎src/Components/test/testassets/Components.Shared/Components.Shared.csproj‎

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

‎src/Components/test/testassets/Components.Shared/_Imports.razor‎

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

‎src/Components/test/testassets/Components.TestServer/Components.TestServer.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<ProjectReference Include="..\BasicTestApp\BasicTestApp.csproj" />
3737
<ProjectReference Include="..\Components.WasmMinimal\Components.WasmMinimal.csproj" />
3838
<ProjectReference Include="..\Components.WasmRemoteAuthentication\Components.WasmRemoteAuthentication.csproj" />
39-
<ProjectReference Include="..\Components.Shared\Components.Shared.csproj" />
4039
</ItemGroup>
4140

4241
<ItemGroup>

‎src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsNoInteractivityStartup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
7272
reexecutionApp.UseEndpoints(endpoints =>
7373
{
7474
endpoints.MapRazorComponents<TRootComponent>()
75-
.AddAdditionalAssemblies(Assembly.Load("Components.Shared"));
75+
.AddAdditionalAssemblies(Assembly.Load("TestContentPackage"));
7676
});
7777
});
7878

@@ -94,7 +94,7 @@ private void ConfigureSubdirPipeline(IApplicationBuilder app, IWebHostEnvironmen
9494
app.UseEndpoints(endpoints =>
9595
{
9696
endpoints.MapRazorComponents<TRootComponent>()
97-
.AddAdditionalAssemblies(Assembly.Load("Components.Shared"));
97+
.AddAdditionalAssemblies(Assembly.Load("TestContentPackage"));
9898
});
9999
}
100100
}

‎src/Components/test/testassets/Components.TestServer/RazorComponentEndpointsStartup.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private void ConfigureEndpoints(IApplicationBuilder app, IWebHostEnvironment env
146146
}
147147

148148
_ = endpoints.MapRazorComponents<TRootComponent>()
149-
.AddAdditionalAssemblies(Assembly.Load("Components.Shared"))
149+
.AddAdditionalAssemblies(Assembly.Load("TestContentPackage"))
150150
.AddAdditionalAssemblies(Assembly.Load("Components.WasmMinimal"))
151151
.AddInteractiveServerRenderMode(options =>
152152
{

‎src/Components/test/testassets/Components.TestServer/RazorComponents/App.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@using Components.TestServer.RazorComponents.Pages.Forms
22
@using Components.WasmMinimal.Pages.NotFound
3-
@using Components.Shared
3+
@using TestContentPackage.NotFound
44

55
@code {
66
[Parameter]
@@ -30,7 +30,7 @@
3030
<HeadOutlet />
3131
</head>
3232
<body>
33-
<Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(Components.Shared.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
33+
<Router AppAssembly="@typeof(App).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
3434
<Found Context="routeData">
3535
<RouteView RouteData="@routeData" />
3636
<FocusOnNavigate RouteData="@routeData" Selector="[data-focus-on-navigate]" />

‎src/Components/test/testassets/Components.WasmMinimal/Components.WasmMinimal.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
<ItemGroup>
1717
<ProjectReference Include="..\NotReferencedInWasmCodePackage\NotReferencedInWasmCodePackage.csproj" />
1818
<ProjectReference Include="..\TestContentPackage\TestContentPackage.csproj" />
19-
<ProjectReference Include="..\Components.Shared\Components.Shared.csproj" />
2019
</ItemGroup>
2120

2221
</Project>

‎src/Components/test/testassets/Components.WasmMinimal/Pages/NotFound/PageThatSetsNotFound-Interactive.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
the component's content will be rendered when it becomes interactive
77
*@
88

9-
<Components.Shared.ComponentThatSetsNotFound @rendermode="@RenderModeHelper.GetRenderMode(_renderMode)" WaitForInteractivity="true" />
9+
<TestContentPackage.NotFound.ComponentThatSetsNotFound @rendermode="@RenderModeHelper.GetRenderMode(_renderMode)" WaitForInteractivity="true" />
1010

1111
@code{
1212
[Parameter, SupplyParameterFromQuery(Name = "renderMode")]

‎src/Components/test/testassets/Components.WasmMinimal/Routes.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@using Microsoft.AspNetCore.Components.Routing
22
@using Components.WasmMinimal.Pages.NotFound
3-
@using Components.Shared
3+
@using TestContentPackage.NotFound
44
@inject NavigationManager NavigationManager
55

66
@code {
@@ -23,7 +23,7 @@
2323
}
2424
}
2525

26-
<Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(Components.Shared.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
26+
<Router AppAssembly="@typeof(Program).Assembly" AdditionalAssemblies="new[] { typeof(TestContentPackage.NotFound.NotFoundPage).Assembly }" NotFoundPage="NotFoundPageType">
2727
<Found Context="routeData">
2828
<RouteView RouteData="@routeData" />
2929
<FocusOnNavigate RouteData="@routeData" Selector="h1" />

‎src/Components/test/testassets/Components.Shared/ComponentThatPostsNotFound.razor‎ renamed to ‎src/Components/test/testassets/TestContentPackage/NotFound/ComponentThatPostsNotFound.razor‎

File renamed without changes.

0 commit comments

Comments
 (0)