Skip to content

Commit 55120ac

Browse files
committed
[wasm] WBT: Make project names unique
1 parent 60e9f8c commit 55120ac

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
2626
[InlineData("Release")]
2727
public void DefaultTemplate_WithoutWorkload(string config)
2828
{
29-
string id = $"blz_no_workload_{config}";
29+
string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}";
3030
CreateBlazorWasmTemplateProject(id);
3131

3232
// Build
@@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config)
4343
[InlineData("Release")]
4444
public void DefaultTemplate_NoAOT_WithWorkload(string config)
4545
{
46-
string id = $"blz_no_aot_{config}";
46+
string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}";
4747
CreateBlazorWasmTemplateProject(id);
4848

4949
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
@@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
6363
[InlineData("Release")]
6464
public void DefaultTemplate_AOT_InProjectFile(string config)
6565
{
66-
string id = $"blz_aot_prj_file_{config}";
66+
string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
6767
string projectFile = CreateBlazorWasmTemplateProject(id);
6868
AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");
6969

@@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
8282
[InlineData("Debug", false)]
8383
[InlineData("Release", true)]
8484
[InlineData("Release", false)]
85-
[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
85+
//[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
8686
public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRelink)
8787
{
88-
string id = $"blz_deploy_on_build_{config}_{nativeRelink}";
88+
string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
8989
string projectFile = CreateProjectWithNativeReference(id);
9090
AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "<RunAOTCompilation>true</RunAOTCompilation>");
9191

@@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
147147
[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
148148
public void WithNativeReference_AOTInProjectFile(string config)
149149
{
150-
string id = $"blz_nativeref_aot_{config}";
150+
string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
151151
string projectFile = CreateProjectWithNativeReference(id);
152152
AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");
153153

@@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config)
165165
[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
166166
public void WithNativeReference_AOTOnCommandLine(string config)
167167
{
168-
string id = $"blz_nativeref_aot_{config}";
168+
string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
169169
CreateProjectWithNativeReference(id);
170170

171171
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
@@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config)
182182
public void WithDllImportInMainAssembly(string config)
183183
{
184184
// Based on https://github.com/dotnet/runtime/issues/59255
185-
string id = $"blz_dllimp_{config}";
185+
string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}";
186186
string projectFile = CreateProjectWithNativeReference(id);
187187
string nativeSource = @"
188188
#include <stdio.h>
@@ -233,7 +233,7 @@ void CheckNativeFileLinked(bool forPublish)
233233
[Fact]
234234
public void BugRegression_60479_WithRazorClassLib()
235235
{
236-
string id = "blz_razor_lib_top";
236+
string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}";
237237
InitBlazorWasmProjectDir(id);
238238

239239
string wasmProjectDir = Path.Combine(_projectDir!, "wasm");

src/mono/wasm/Wasm.Build.Tests/NativeBuildTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public void IntermediateBitcodeToObjectFilesAreNotLLVMIR(BuildArgs buildArgs, st
106106
[InlineData("Release")]
107107
public void BlazorWasm_CanRunMonoAOTCross_WithNoTrimming(string config)
108108
{
109-
string id = $"blazorwasm_{config}_aot";
109+
string id = $"blazorwasm_{config}_aot_{Path.GetRandomFileName()}";
110110
CreateBlazorWasmTemplateProject(id);
111111

112112
// We don't want to emcc compile, and link ~180 assemblies!

src/mono/wasm/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void NoOpRebuildForNativeBuilds(BuildArgs buildArgs, bool nativeRelink, b
4040
[InlineData("Release")]
4141
public void BlazorNoopRebuild(string config)
4242
{
43-
string id = $"blz_rebuild_{config}";
43+
string id = $"blz_rebuild_{config}_{Path.GetRandomFileName()}";
4444
string projectFile = CreateBlazorWasmTemplateProject(id);
4545
AddItemsPropertiesToProject(projectFile, extraProperties: "<WasmBuildNative>true</WasmBuildNative>");
4646

@@ -67,7 +67,7 @@ public void BlazorNoopRebuild(string config)
6767
[InlineData("Release")]
6868
public void BlazorOnlyLinkRebuild(string config)
6969
{
70-
string id = $"blz_relink_{config}";
70+
string id = $"blz_relink_{config}_{Path.GetRandomFileName()}";
7171
string projectFile = CreateBlazorWasmTemplateProject(id);
7272
AddItemsPropertiesToProject(projectFile, extraProperties: "<WasmBuildNative>true</WasmBuildNative>");
7373

0 commit comments

Comments
 (0)