Skip to content

Commit aa52cc2

Browse files
committed
Publish to "trimmed" instead of "trimmed-or-threading"
- This fixes a regression introduced by #54655
1 parent e381d7e commit aa52cc2

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
<ProjectReference
9090
Include="..\testassets\Components.TestServer\Components.TestServer.csproj"
9191
Targets="Build;Publish"
92-
Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed-or-threading\Components.TestServer\;" />
92+
Properties="BuildProjectReferences=false;TestTrimmedOrMultithreadingApps=true;PublishDir=$(MSBuildThisFileDirectory)$(OutputPath)trimmed\Components.TestServer\;" />
9393
</ItemGroup>
9494

9595
<!-- Shared testing infrastructure for running E2E tests using selenium -->

src/Components/test/E2ETest/Tests/RemoteAuthenticationTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class RemoteAuthenticationTest :
2121
{
2222
public readonly bool TestTrimmedApps = typeof(ToggleExecutionModeServerFixture<>).Assembly
2323
.GetCustomAttributes<AssemblyMetadataAttribute>()
24-
.First(m => m.Key == "Microsoft.AspNetCore.E2ETesting.TestTrimmedOrMultithreadingApps")
24+
.First(m => m.Key == "Microsoft.AspNetCore.E2ETesting.TestTrimmedApps")
2525
.Value == "true";
2626

2727
public RemoteAuthenticationTest(
@@ -67,7 +67,7 @@ private static IHost BuildPublishedWebHost(string[] args) =>
6767

6868
private static string GetPublishedContentRoot(Assembly assembly)
6969
{
70-
var contentRoot = Path.Combine(AppContext.BaseDirectory, "trimmed-or-threading", assembly.GetName().Name);
70+
var contentRoot = Path.Combine(AppContext.BaseDirectory, "trimmed", assembly.GetName().Name);
7171

7272
if (!Directory.Exists(contentRoot))
7373
{

src/Components/test/E2ETest/Tests/WebAssemblyPrerenderedTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private void WaitUntilLoaded()
5656

5757
private static string GetPublishedContentRoot(Assembly assembly)
5858
{
59-
var contentRoot = Path.Combine(AppContext.BaseDirectory, "trimmed-or-threading", assembly.GetName().Name);
59+
var contentRoot = Path.Combine(AppContext.BaseDirectory, "trimmed", assembly.GetName().Name);
6060

6161
if (!Directory.Exists(contentRoot))
6262
{

0 commit comments

Comments
 (0)