Skip to content

Commit 1d60246

Browse files
radicalradical
authoredMar 3, 2022
[wasm] Bump sdk for workload testing to 7.0.100-preview.3.22151.18 (#65003)
* [wasm] bump sdk for workload testing to 7.0.100-preview.2.22108.4 * [wasm] dotnet-install.sh logs errors from curl, while trying older urls, .. don't let that fail the build. * [wasm] trigger Wasm.Build.Tests when workload-testing.targets changes * [wasm] trigger Wasm.Build.Tests on CI when eng/Versions.props changes * [wasm] Update Wasm.Build.Tests to target net7.0 by default net6 projects don't build with the workload currently. Tests will be added for that once it is fixed. * Bump sdk for workload testing to 7.0.100-preview.3.22128.3 * Bump sdk version for workload testing to 7.0.100-preview.3.22151.18
·
v10.0.0-preview.2.25163.2release/7.0
1 parent 7830fdd commit 1d60246

File tree

11 files changed

+72
-55
lines changed

11 files changed

+72
-55
lines changed
 

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
158158
<MoqVersion>4.12.0</MoqVersion>
159159
<FsCheckVersion>2.14.3</FsCheckVersion>
160-
<SdkVersionForWorkloadTesting>7.0.100-alpha.1.21528.1</SdkVersionForWorkloadTesting>
160+
<SdkVersionForWorkloadTesting>7.0.100-preview.3.22151.18</SdkVersionForWorkloadTesting>
161161
<CompilerPlatformTestingVersion>1.1.1-beta1.22103.1</CompilerPlatformTestingVersion>
162162
<!-- Docs -->
163163
<MicrosoftPrivateIntellisenseVersion>6.0.0-preview-20220104.1</MicrosoftPrivateIntellisenseVersion>

‎eng/pipelines/common/evaluate-default-paths.yml

+2
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ jobs:
117117
- src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/*
118118
- src/mono/mono/*
119119
- eng/testing/scenarios/BuildWasmAppsJobsList.txt
120+
- eng/testing/workloads-testing.targets
120121
- eng/Version.Details.xml
122+
- eng/Versions.props
121123
- src/mono/wasm/emscripten-version.txt
122124
- subset: wasmdebuggertests
123125
include:

‎eng/testing/tests.wasm.targets

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<_ShellCommandSeparator Condition="'$(OS)' == 'Windows_NT'">&amp;&amp;</_ShellCommandSeparator>
1616
<_ShellCommandSeparator Condition="'$(OS)' != 'Windows_NT'">&amp;&amp;</_ShellCommandSeparator>
1717
<_WasmMainJSFileName Condition="'$(WasmMainJSPath)' != ''">$([System.IO.Path]::GetFileName('$(WasmMainJSPath)'))</_WasmMainJSFileName>
18+
<_WasmStrictVersionMatch Condition="'$(ContinuousIntegrationBuild)' == 'true'">true</_WasmStrictVersionMatch>
1819
<XUnitUseRandomizedTestOrderer Condition="'$(XUnitUseRandomizedTestOrderer)' == '' and '$(IsTestProject)' == 'true'">true</XUnitUseRandomizedTestOrderer>
1920
</PropertyGroup>
2021

@@ -165,6 +166,7 @@
165166
<_WasmPropertyNames Include="WasmNativeStrip" />
166167
<_WasmPropertyNames Include="WasmEnableES6" />
167168
<_WasmPropertyNames Include="_WasmDevel" />
169+
<_WasmPropertyNames Include="_WasmStrictVersionMatch" />
168170
<_WasmPropertyNames Include="WasmEmitSymbolMap" />
169171

170172
<_WasmPropertiesToPass

‎src/mono/wasm/build/WasmApp.Native.targets

+5-2
Original file line numberDiff line numberDiff line change
@@ -471,10 +471,13 @@
471471
</ItemGroup>
472472
<PropertyGroup>
473473
<ActualEmccVersionRaw>%(_ReversedVersionLines.Identity)</ActualEmccVersionRaw>
474+
<_VersionMismatchMessage>Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures.</_VersionMismatchMessage>
474475
</PropertyGroup>
475476

476-
<Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)'"
477-
Text="Emscripten version mismatch. The runtime pack in $(MicrosoftNetCoreAppRuntimePackDir) expects '$(RuntimeEmccVersionRaw)', but emcc being used has version '$(ActualEmccVersionRaw)'. This might cause build failures." />
477+
<Warning Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' != 'true'"
478+
Text="$(_VersionMismatchMessage)" />
479+
<Error Condition="'$(RuntimeEmccVersionRaw)' != '$(ActualEmccVersionRaw)' and '$(_WasmStrictVersionMatch)' == 'true'"
480+
Text="$(_VersionMismatchMessage)" />
478481
</Target>
479482

480483
<!--

‎src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

+21-21
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
4646
string id = $"blz_no_aot_{config}";
4747
CreateBlazorWasmTemplateProject(id);
4848

49-
BlazorBuild(id, config, NativeFilesType.FromRuntimePack);
49+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
5050
if (config == "Release")
5151
{
5252
// relinking in publish for Release config
53-
BlazorPublish(id, config, NativeFilesType.Relinked);
53+
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
5454
}
5555
else
5656
{
57-
BlazorPublish(id, config, NativeFilesType.FromRuntimePack);
57+
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
5858
}
5959
}
6060

@@ -68,13 +68,13 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
6868
AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");
6969

7070
// No relinking, no AOT
71-
BlazorBuild(id, config, NativeFilesType.FromRuntimePack);
71+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
7272

7373
// will aot
74-
BlazorPublish(id, config, NativeFilesType.AOT);
74+
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.AOT));
7575

7676
// build again
77-
BlazorBuild(id, config, NativeFilesType.FromRuntimePack);
77+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
7878
}
7979

8080
[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
@@ -107,7 +107,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
107107
}
108108

109109
// Check that we linked only for publish
110-
string objBuildDir = Path.Combine(_projectDir!, "obj", config, "net6.0", "wasm", "for-build");
110+
string objBuildDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm", "for-build");
111111
Assert.False(Directory.Exists(objBuildDir), $"Found unexpected {objBuildDir}, which gets creating when relinking during Build");
112112

113113
// double check!
@@ -130,14 +130,14 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
130130
//CreateBlazorWasmTemplateProject(id);
131131

132132
//// No relinking, no AOT
133-
//BlazorBuild(id, config, NativeFilesType.FromRuntimePack);
133+
//BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack);
134134

135135
//// AOT=true only for the publish command line, similar to what
136136
//// would happen when setting it in Publish dialog for VS
137-
//BlazorPublish(id, config, expectedFileType: NativeFilesType.AOT, "-p:RunAOTCompilation=true");
137+
//BlazorPublish(new BlazorBuildOptions(id, config, expectedFileType: NativeFilesType.AOT, "-p:RunAOTCompilation=true");
138138

139139
//// publish again, no AOT
140-
//BlazorPublish(id, config, NativeFilesType.Relinked);
140+
//BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked);
141141
//}
142142

143143
[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
@@ -149,12 +149,12 @@ public void WithNativeReference_AOTInProjectFile(string config)
149149
string projectFile = CreateProjectWithNativeReference(id);
150150
AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");
151151

152-
BlazorBuild(id, config, expectedFileType: NativeFilesType.Relinked);
152+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
153153

154-
BlazorPublish(id, config, expectedFileType: NativeFilesType.AOT);
154+
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.AOT));
155155

156156
// will relink
157-
BlazorBuild(id, config, expectedFileType: NativeFilesType.Relinked);
157+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
158158
}
159159

160160
[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
@@ -165,12 +165,12 @@ public void WithNativeReference_AOTOnCommandLine(string config)
165165
string id = $"blz_nativeref_aot_{config}";
166166
CreateProjectWithNativeReference(id);
167167

168-
BlazorBuild(id, config, expectedFileType: NativeFilesType.Relinked);
168+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
169169

170-
BlazorPublish(id, config, expectedFileType: NativeFilesType.AOT, "-p:RunAOTCompilation=true");
170+
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.AOT), "-p:RunAOTCompilation=true");
171171

172172
// no aot!
173-
BlazorPublish(id, config, expectedFileType: NativeFilesType.Relinked);
173+
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
174174
}
175175

176176
[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
@@ -206,17 +206,17 @@ public static class MyDllImports
206206

207207
AddItemsPropertiesToProject(projectFile, extraItems: @"<NativeFileReference Include=""mylib.cpp"" />");
208208

209-
BlazorBuild(id, config, expectedFileType: NativeFilesType.Relinked);
209+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
210210
CheckNativeFileLinked(forPublish: false);
211211

212-
BlazorPublish(id, config, expectedFileType: NativeFilesType.Relinked);
212+
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
213213
CheckNativeFileLinked(forPublish: true);
214214

215215
void CheckNativeFileLinked(bool forPublish)
216216
{
217217
// very crude way to check that the native file was linked in
218218
// needed because we don't run the blazor app yet
219-
string objBuildDir = Path.Combine(_projectDir!, "obj", config, "net6.0", "wasm", forPublish ? "for-publish" : "for-build");
219+
string objBuildDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm", forPublish ? "for-publish" : "for-build");
220220
string pinvokeTableHPath = Path.Combine(objBuildDir, "pinvoke-table.h");
221221
Assert.True(File.Exists(pinvokeTableHPath), $"Could not find {pinvokeTableHPath}");
222222

@@ -257,10 +257,10 @@ public void BugRegression_60479_WithRazorClassLib()
257257
_projectDir = wasmProjectDir;
258258
string config = "Release";
259259
// No relinking, no AOT
260-
BlazorBuild(id, config, NativeFilesType.FromRuntimePack);
260+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
261261

262262
// will relink
263-
BlazorPublish(id, config, NativeFilesType.Relinked);
263+
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
264264

265265
// publish/wwwroot/_framework/blazor.boot.json
266266
string frameworkDir = FindBlazorBinFrameworkDir(config, forPublish: true);

‎src/tests/BuildWasmApps/Wasm.Build.Tests/BuildEnvironment.cs

+1
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public BuildEnvironment()
108108
EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
109109
EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
110110
EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
111+
EnvVars["_WasmStrictVersionMatch"] = "true";
111112
EnvVars["MSBuildSDKsPath"] = string.Empty;
112113
EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
113114

‎src/tests/BuildWasmApps/Wasm.Build.Tests/BuildTestBase.cs

+29-20
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ namespace Wasm.Build.Tests
2525
{
2626
public abstract class BuildTestBase : IClassFixture<SharedBuildPerTestClassFixture>, IDisposable
2727
{
28-
protected const string s_targetFramework = "net6.0";
28+
public const string DefaultTargetFramework = "net7.0";
29+
public static readonly string NuGetConfigFileNameForDefaultFramework = $"nuget7.config";
2930
protected static readonly bool s_skipProjectCleanup;
3031
protected static readonly string s_xharnessRunnerCommand;
3132
protected string? _projectDir;
@@ -128,7 +129,7 @@ protected string RunAndTestWasmApp(BuildArgs buildArgs,
128129
int expectedExitCode = 0,
129130
string? args = null,
130131
Dictionary<string, string>? envVars = null,
131-
string targetFramework = "net6.0")
132+
string targetFramework = DefaultTargetFramework)
132133
{
133134
buildDir ??= _projectDir;
134135
envVars ??= new();
@@ -246,14 +247,14 @@ protected static void InitProjectDir(string dir)
246247
File.WriteAllText(Path.Combine(dir, "Directory.Build.props"), s_buildEnv.DirectoryBuildPropsContents);
247248
File.WriteAllText(Path.Combine(dir, "Directory.Build.targets"), s_buildEnv.DirectoryBuildTargetsContents);
248249

249-
File.Copy(Path.Combine(BuildEnvironment.TestDataPath, "nuget6.config"), Path.Combine(dir, "nuget.config"));
250+
File.Copy(Path.Combine(BuildEnvironment.TestDataPath, NuGetConfigFileNameForDefaultFramework), Path.Combine(dir, "nuget.config"));
250251
Directory.CreateDirectory(Path.Combine(dir, ".nuget"));
251252
}
252253

253254
protected const string SimpleProjectTemplate =
254255
@$"<Project Sdk=""Microsoft.NET.Sdk"">
255256
<PropertyGroup>
256-
<TargetFramework>{s_targetFramework}</TargetFramework>
257+
<TargetFramework>{DefaultTargetFramework}</TargetFramework>
257258
<OutputType>Exe</OutputType>
258259
<WasmGenerateRunV8Script>true</WasmGenerateRunV8Script>
259260
<WasmMainJSPath>test-main.js</WasmMainJSPath>
@@ -342,7 +343,7 @@ protected static BuildArgs ExpandBuildArgs(BuildArgs buildArgs, string extraProp
342343

343344
if (options.ExpectSuccess)
344345
{
345-
string bundleDir = Path.Combine(GetBinDir(config: buildArgs.Config, targetFramework: options.TargetFramework ?? "net6.0"), "AppBundle");
346+
string bundleDir = Path.Combine(GetBinDir(config: buildArgs.Config, targetFramework: options.TargetFramework ?? DefaultTargetFramework), "AppBundle");
346347
AssertBasicAppBundle(bundleDir, buildArgs.ProjectName, buildArgs.Config, options.MainJS ?? "test-main.js", options.HasV8Script, options.HasIcudt, options.DotnetWasmFromRuntimePack ?? !buildArgs.AOT);
347348
}
348349

@@ -367,7 +368,7 @@ public void InitBlazorWasmProjectDir(string id)
367368
Directory.CreateDirectory(_projectDir);
368369
Directory.CreateDirectory(Path.Combine(_projectDir, ".nuget"));
369370

370-
File.Copy(Path.Combine(BuildEnvironment.TestDataPath, "nuget6.config"), Path.Combine(_projectDir, "nuget.config"));
371+
File.Copy(Path.Combine(BuildEnvironment.TestDataPath, NuGetConfigFileNameForDefaultFramework), Path.Combine(_projectDir, "nuget.config"));
371372
File.Copy(Path.Combine(BuildEnvironment.TestDataPath, "Blazor.Directory.Build.props"), Path.Combine(_projectDir, "Directory.Build.props"));
372373
File.Copy(Path.Combine(BuildEnvironment.TestDataPath, "Blazor.Directory.Build.targets"), Path.Combine(_projectDir, "Directory.Build.targets"));
373374
}
@@ -395,22 +396,22 @@ public string CreateBlazorWasmTemplateProject(string id)
395396
return Path.Combine(_projectDir!, $"{id}.csproj");
396397
}
397398

398-
protected (CommandResult, string) BlazorBuild(string id, string config, NativeFilesType expectedFileType, params string[] extraArgs)
399+
protected (CommandResult, string) BlazorBuild(BlazorBuildOptions options, params string[] extraArgs)
399400
{
400-
var res = BuildInternal(id, config, publish: false, extraArgs);
401-
AssertDotNetNativeFiles(expectedFileType, config, forPublish: false);
402-
AssertBlazorBundle(config, isPublish: false, dotnetWasmFromRuntimePack: expectedFileType == NativeFilesType.FromRuntimePack);
401+
var res = BuildInternal(options.Id, options.Config, publish: false, extraArgs);
402+
AssertDotNetNativeFiles(options.ExpectedFileType, options.Config, forPublish: false, targetFramework: options.TargetFramework);
403+
AssertBlazorBundle(options.Config, isPublish: false, dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack);
403404

404405
return res;
405406
}
406407

407-
protected (CommandResult, string) BlazorPublish(string id, string config, NativeFilesType expectedFileType, params string[] extraArgs)
408+
protected (CommandResult, string) BlazorPublish(BlazorBuildOptions options, params string[] extraArgs)
408409
{
409-
var res = BuildInternal(id, config, publish: true, extraArgs);
410-
AssertDotNetNativeFiles(expectedFileType, config, forPublish: true);
411-
AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: expectedFileType == NativeFilesType.FromRuntimePack);
410+
var res = BuildInternal(options.Id, options.Config, publish: true, extraArgs);
411+
AssertDotNetNativeFiles(options.ExpectedFileType, options.Config, forPublish: true, targetFramework: options.TargetFramework);
412+
AssertBlazorBundle(options.Config, isPublish: true, dotnetWasmFromRuntimePack: options.ExpectedFileType == NativeFilesType.FromRuntimePack);
412413

413-
if (expectedFileType == NativeFilesType.AOT)
414+
if (options.ExpectedFileType == NativeFilesType.AOT)
414415
{
415416
// check for this too, so we know the format is correct for the negative
416417
// test for jsinterop.webassembly.dll
@@ -445,10 +446,10 @@ public string CreateBlazorWasmTemplateProject(string id)
445446
return (res, logPath);
446447
}
447448

448-
protected void AssertDotNetNativeFiles(NativeFilesType type, string config, bool forPublish)
449+
protected void AssertDotNetNativeFiles(NativeFilesType type, string config, bool forPublish, string targetFramework = DefaultTargetFramework)
449450
{
450451
string label = forPublish ? "publish" : "build";
451-
string objBuildDir = Path.Combine(_projectDir!, "obj", config, "net6.0", "wasm", forPublish ? "for-publish" : "for-build");
452+
string objBuildDir = Path.Combine(_projectDir!, "obj", config, targetFramework, "wasm", forPublish ? "for-publish" : "for-build");
452453
string binFrameworkDir = FindBlazorBinFrameworkDir(config, forPublish);
453454

454455
string srcDir = type switch
@@ -630,7 +631,7 @@ protected void AssertBlazorBootJson(string config, bool isPublish, string? binFr
630631
$"{msgPrefix} Could not find dotnet.*js in {bootJson}");
631632
}
632633

633-
protected string FindBlazorBinFrameworkDir(string config, bool forPublish, string framework="net6.0")
634+
protected string FindBlazorBinFrameworkDir(string config, bool forPublish, string framework = DefaultTargetFramework)
634635
{
635636
string basePath = Path.Combine(_projectDir!, "bin", config, framework);
636637
if (forPublish)
@@ -652,14 +653,14 @@ private string FindSubDirIgnoringCase(string parentDir, string dirName)
652653
return first ?? Path.Combine(parentDir, dirName);
653654
}
654655

655-
protected string GetBinDir(string config, string targetFramework=s_targetFramework, string? baseDir=null)
656+
protected string GetBinDir(string config, string targetFramework=DefaultTargetFramework, string? baseDir=null)
656657
{
657658
var dir = baseDir ?? _projectDir;
658659
Assert.NotNull(dir);
659660
return Path.Combine(dir!, "bin", config, targetFramework, "browser-wasm");
660661
}
661662

662-
protected string GetObjDir(string config, string targetFramework=s_targetFramework, string? baseDir=null)
663+
protected string GetObjDir(string config, string targetFramework=DefaultTargetFramework, string? baseDir=null)
663664
{
664665
var dir = baseDir ?? _projectDir;
665666
Assert.NotNull(dir);
@@ -885,4 +886,12 @@ public record BuildProjectOptions
885886
string? TargetFramework = null,
886887
string? MainJS = null
887888
);
889+
890+
public record BlazorBuildOptions
891+
(
892+
string Id,
893+
string Config,
894+
NativeFilesType ExpectedFileType,
895+
string TargetFramework = BuildTestBase.DefaultTargetFramework
896+
);
888897
}

‎src/tests/BuildWasmApps/Wasm.Build.Tests/CleanTests.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public void Blazor_BuildThenClean_NativeRelinking(string config)
3434
<WasmBuildNative>true</WasmBuildNative>";
3535

3636
AddItemsPropertiesToProject(projectFile, extraProperties: extraProperties);
37-
BlazorBuild(id, config, NativeFilesType.Relinked);
37+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
3838

39-
string relinkDir = Path.Combine(_projectDir!, "obj", config, "net6.0", "wasm", "for-build");
39+
string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm", "for-build");
4040
Assert.True(Directory.Exists(relinkDir), $"Could not find expected relink dir: {relinkDir}");
4141

4242
string logPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-clean.binlog");
@@ -75,7 +75,7 @@ private void Blazor_BuildNativeNonNative_ThenCleanTest(string config, bool first
7575
BuildInternal(id, config, publish: false,
7676
extraArgs: relink ? "-p:WasmBuildNative=true" : string.Empty);
7777

78-
string relinkDir = Path.Combine(_projectDir!, "obj", config, "net6.0", "wasm", "for-build");
78+
string relinkDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm", "for-build");
7979
if (relink)
8080
Assert.True(Directory.Exists(relinkDir), $"Could not find expected relink dir: {relinkDir}");
8181

‎src/tests/BuildWasmApps/Wasm.Build.Tests/NativeRebuildTests/NoopNativeRebuildTest.cs

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ public void BlazorNoopRebuild(string config)
4444
string projectFile = CreateBlazorWasmTemplateProject(id);
4545
AddItemsPropertiesToProject(projectFile, extraProperties: "<WasmBuildNative>true</WasmBuildNative>");
4646

47-
string objDir = Path.Combine(_projectDir!, "obj", config, "net6.0", "wasm");
47+
string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm");
4848

49-
BlazorBuild(id, config, NativeFilesType.Relinked);
49+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
5050
File.Move(Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build.binlog"),
5151
Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build-first.binlog"));
5252

@@ -55,7 +55,7 @@ public void BlazorNoopRebuild(string config)
5555
var originalStat = StatFiles(pathsDict.Select(kvp => kvp.Value.fullPath));
5656

5757
// build again
58-
BlazorBuild(id, config, NativeFilesType.Relinked);
58+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
5959
var newStat = StatFiles(pathsDict.Select(kvp => kvp.Value.fullPath));
6060

6161
CompareStat(originalStat, newStat, pathsDict.Values);
@@ -71,9 +71,9 @@ public void BlazorOnlyLinkRebuild(string config)
7171
string projectFile = CreateBlazorWasmTemplateProject(id);
7272
AddItemsPropertiesToProject(projectFile, extraProperties: "<WasmBuildNative>true</WasmBuildNative>");
7373

74-
string objDir = Path.Combine(_projectDir!, "obj", config, "net6.0", "wasm");
74+
string objDir = Path.Combine(_projectDir!, "obj", config, DefaultTargetFramework, "wasm");
7575

76-
BlazorBuild(id, config, NativeFilesType.Relinked);
76+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
7777
File.Move(Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build.binlog"),
7878
Path.Combine(s_buildEnv.LogRootPath, id, $"{id}-build-first.binlog"));
7979

@@ -84,7 +84,7 @@ public void BlazorOnlyLinkRebuild(string config)
8484
var originalStat = StatFiles(pathsDict.Select(kvp => kvp.Value.fullPath));
8585

8686
// build again
87-
BlazorBuild(id, config, NativeFilesType.Relinked, "-p:EmccLinkOptimizationFlag=-O1");
87+
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked), "-p:EmccLinkOptimizationFlag=-O1");
8888
var newStat = StatFiles(pathsDict.Select(kvp => kvp.Value.fullPath));
8989

9090
CompareStat(originalStat, newStat, pathsDict.Values);

‎src/tests/BuildWasmApps/Wasm.Build.Tests/SatelliteAssembliesTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private void CreateProgramForCultureTest(string dir, string resourceName, string
150150
private const string s_resourcesProjectTemplate =
151151
@$"<Project Sdk=""Microsoft.NET.Sdk"">
152152
<PropertyGroup>
153-
<TargetFramework>{s_targetFramework}</TargetFramework>
153+
<TargetFramework>{DefaultTargetFramework}</TargetFramework>
154154
<OutputType>Exe</OutputType>
155155
<WasmGenerateRunV8Script>true</WasmGenerateRunV8Script>
156156
<WasmMainJSPath>test-main.js</WasmMainJSPath>

‎src/tests/BuildWasmApps/Wasm.Build.Tests/data/nuget6.config ‎src/tests/BuildWasmApps/Wasm.Build.Tests/data/nuget7.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</fallbackPackageFolders>
88
<packageSources>
99
<clear />
10-
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
10+
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
1111
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
1212
</packageSources>
1313
<disabledPackageSources>

0 commit comments

Comments
 (0)
Please sign in to comment.