Skip to content

Commit 618bf0f

Browse files
committed
Fix wbt AppsettingsTests
1 parent 6936d80 commit 618bf0f

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

eng/testing/scenarios/BuildWasmAppsJobsList.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Wasm.Build.NativeRebuild.Tests.ReferenceNewAssemblyRebuildTest
55
Wasm.Build.NativeRebuild.Tests.SimpleSourceChangeRebuildTest
66
Wasm.Build.Tests.InterpPgoTests
77
Wasm.Build.Templates.Tests.NativeBuildTests
8+
Wasm.Build.Tests.Blazor.AppsettingsTests
89
Wasm.Build.Tests.Blazor.BuildPublishTests
910
Wasm.Build.Tests.Blazor.SimpleRunTests
1011
Wasm.Build.Tests.Blazor.CleanTests

src/mono/wasm/Wasm.Build.Tests/Blazor/AppsettingsTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public AppsettingsTests(ITestOutputHelper output, SharedBuildPerTestClassFixture
2020
}
2121

2222
[Fact]
23-
[ActiveIssue("https://github.com/dotnet/runtime/issues/122338")] // add it back to eng\testing\scenarios\BuildWasmAppsJobsList.txt
2423
public async Task FileInVfs()
2524
{
2625
Configuration config = Configuration.Debug;

src/mono/wasm/Wasm.Build.Tests/Blazor/BlazorWasmTestBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,5 +221,5 @@ public override async Task<RunResult> RunForPublishWithWebServer(RunOptions runO
221221
}
222222

223223
public string GetBlazorBinFrameworkDir(Configuration config, bool forPublish, string? framework = null, string? projectDir = null)
224-
=> _provider.GetBinFrameworkDir(config: config, forPublish: forPublish, framework: framework ?? DefaultTargetFrameworkForBlazor, projectDir: projectDir);
224+
=> _provider.GetBinFrameworkDir(config: config, forPublish: forPublish, framework: framework ?? _provider.GetDefaultTargetFramework(), projectDir: projectDir);
225225
}

src/mono/wasm/Wasm.Build.Tests/Templates/WasmTemplateTestsBase.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,9 @@ public ProjectInfo CreateWasmTemplateProject(
7373
(string projectName, string logPath, string nugetDir) =
7474
InitProjectLocation(idPrefix, config, aot, appendUnicodeToPath ?? s_buildEnv.IsRunningOnCI);
7575

76-
if (addFrameworkArg) {
77-
var defaultTarget = template switch
78-
{
79-
Template.BlazorWasm => DefaultTargetFrameworkForBlazorTemplate,
80-
_ => DefaultTargetFramework,
81-
};
82-
83-
extraArgs += $" -f {defaultTarget}";
76+
if (addFrameworkArg)
77+
{
78+
extraArgs += $" -f {_provider.GetDefaultTargetFramework()}";
8479
}
8580

8681
using DotNetCommand cmd = new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false);
@@ -282,7 +277,7 @@ protected void DeleteFile(string pathRelativeToProjectDir)
282277

283278
protected void UpdateBrowserMainJs(string? targetFramework = null, string runtimeAssetsRelativePath = DefaultRuntimeAssetsRelativePath)
284279
{
285-
targetFramework ??= DefaultTargetFramework;
280+
targetFramework ??= _provider.GetDefaultTargetFramework();
286281
string mainJsPath = Path.Combine(_projectDir, "wwwroot", "main.js");
287282
string mainJsContent = File.ReadAllText(mainJsPath);
288283
Version targetFrameworkVersion = new Version(targetFramework.Replace("net", ""));
@@ -431,10 +426,10 @@ void OnErrorMessage(string msg)
431426
}
432427

433428
public string GetBinFrameworkDir(Configuration config, bool forPublish, string? framework = null, string? projectDir = null) =>
434-
_provider.GetBinFrameworkDir(config, forPublish, framework ?? DefaultTargetFramework, projectDir);
429+
_provider.GetBinFrameworkDir(config, forPublish, framework ?? _provider.GetDefaultTargetFramework(), projectDir);
435430

436431
public string GetObjDir(Configuration config, string? framework = null, string? projectDir = null) =>
437-
_provider.GetObjDir(config, framework ?? DefaultTargetFramework, projectDir);
432+
_provider.GetObjDir(config, framework ?? _provider.GetDefaultTargetFramework(), projectDir);
438433

439434
public BuildPaths GetBuildPaths(Configuration config, bool forPublish) =>
440435
_provider.GetBuildPaths(config, forPublish);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ public WasmSdkBasedProjectProvider(ITestOutputHelper _testOutput, string default
2424

2525
protected override string BundleDirName { get { return "wwwroot"; } }
2626

27+
public string GetDefaultTargetFramework() => _defaultTargetFramework;
28+
2729
protected override IReadOnlyDictionary<string, bool> GetAllKnownDotnetFilesToFingerprintMap(AssertBundleOptions assertOptions)
2830
{
2931
var result = new SortedDictionary<string, bool>()

0 commit comments

Comments
 (0)