Skip to content

Commit 0fa26b3

Browse files
radicalradical
authored
[wasm][debugger][tests] Make dotnet test DebuggerTestSuite.csproj work (#43158)
* [wasm][debugger][tests] Simplify test project files Now, the tests can be run with `dotnet test DebuggerTestSuite.csproj`. and the existing `make run-debugger-tests` still works. Changes: - We don't need to use wasmAppBuilder for all the test projects, only `debugger-test`. - Other assemblies just get bundled with `debugger-test` - Move common properties to `Directory.Build.*` - And move the settings being used for debugger-test in the Makefile to msbuild: - RuntimeConfiguration defaults to Release, same as what the Makefile did - build all the debugger-tests in artifacts dir - And instead of `TEST_SUITE_PATH`, determine the debugger-tests path based on the testsuite itself. - We can then remove `build-debugger-test-app` * [wasm][debugger] add debugger.sln * [wasm][debugger][tests] fix warnings - remove explicit xunit packageref
1 parent 2a52f75 commit 0fa26b3

File tree

9 files changed

+129
-127
lines changed

9 files changed

+129
-127
lines changed

‎src/mono/wasm/Makefile

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -150,27 +150,15 @@ run-tests-jsc-%:
150150
run-tests-%:
151151
PATH="$(JSVU):$(PATH)" $(DOTNET) build $(TOP)/src/libraries/$*/tests/ /t:Test /p:TargetOS=Browser /p:TargetArchitecture=wasm /p:Configuration=$(CONFIG) $(MSBUILD_ARGS)
152152

153-
build-debugger-test-app:
154-
$(DOTNET) build --configuration debug --nologo /p:TargetArchitecture=wasm /p:TargetOS=Browser /p:Configuration=Debug /p:RuntimeConfiguration=$(CONFIG) $(TOP)/src/mono/wasm/debugger/tests/debugger-test
155-
$(DOTNET) build --configuration debug --nologo /p:TargetArchitecture=wasm /p:TargetOS=Browser /p:Configuration=Debug /p:RuntimeConfiguration=$(CONFIG) $(TOP)/src/mono/wasm/debugger/tests/lazy-debugger-test
156-
$(DOTNET) build --configuration debug --nologo /p:TargetArchitecture=wasm /p:TargetOS=Browser /p:Configuration=Debug /p:RuntimeConfiguration=$(CONFIG) $(TOP)/src/mono/wasm/debugger/tests/lazy-debugger-test-embedded
157-
cp $(TOP)/src/mono/wasm/debugger/tests/debugger-test/debugger-driver.html $(TOP)/src/mono/wasm/debugger/tests/debugger-test/bin/Debug/publish
158-
cp $(TOP)/src/mono/wasm/debugger/tests/debugger-test/other.js $(TOP)/src/mono/wasm/debugger/tests/debugger-test/bin/Debug/publish
159-
cp $(TOP)/src/mono/wasm/debugger/tests/debugger-test/runtime-debugger.js $(TOP)/src/mono/wasm/debugger/tests/debugger-test/bin/Debug/publish
160-
cp $(TOP)/src/mono/wasm/debugger/tests/lazy-debugger-test/bin/Debug/publish/managed/* $(TOP)/src/mono/wasm/debugger/tests/debugger-test/bin/Debug/publish
161-
cp $(TOP)/src/mono/wasm/debugger/tests/lazy-debugger-test-embedded/bin/Debug/publish/managed/* $(TOP)/src/mono/wasm/debugger/tests/debugger-test/bin/Debug/publish
162-
163-
run-debugger-tests: build-debugger-test-app build-dbg-testsuite
153+
run-debugger-tests:
164154
if [ ! -z "$(TEST_FILTER)" ]; then \
165-
export TEST_SUITE_PATH=$(TOP)/src/mono/wasm/debugger/tests/debugger-test/bin/Debug/publish; \
166155
export LC_ALL=en_US.UTF-8; \
167156
$(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite --filter FullyQualifiedName~$(TEST_FILTER); \
168-
unset TEST_SUITE_PATH LC_ALL; \
157+
unset LC_ALL; \
169158
else \
170-
export TEST_SUITE_PATH=$(TOP)/src/mono/wasm/debugger/tests/debugger-test/bin/Debug/publish; \
171159
export LC_ALL=en_US.UTF-8; \
172160
$(DOTNET) test $(TOP)/src/mono/wasm/debugger/DebuggerTestSuite $(TEST_ARGS); \
173-
unset TEST_SUITE_PATH LC_ALL; \
161+
unset LC_ALL; \
174162
fi
175163

176164
build-dbg-proxy:

‎src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44
<TargetFramework>$(AspNetCoreAppCurrent)</TargetFramework>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<RunAnalyzers>false</RunAnalyzers>
7+
<IsTestProject>true</IsTestProject>
78
</PropertyGroup>
89

910
<ItemGroup>
10-
<PackageReference Include="xunit" Version="2.4.0" />
11-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
12-
1311
<Content Include="appsettings.json" CopyToOutputDirectory="PreserveNewest" />
1412
</ItemGroup>
1513

1614
<ItemGroup>
1715
<ProjectReference Include="..\BrowserDebugHost\BrowserDebugHost.csproj" />
1816
<ProjectReference Include="..\BrowserDebugProxy\BrowserDebugProxy.csproj" />
17+
<ProjectReference Include="..\tests\debugger-test\debugger-test.csproj" ReferenceOutputAssembly="false" />
1918
</ItemGroup>
2019

2120
</Project>

‎src/mono/wasm/debugger/DebuggerTestSuite/Support.cs

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using System.IO;
77
using System.Linq;
88
using System.Net.WebSockets;
9+
using System.Reflection;
910
using System.Text;
1011
using System.Threading;
1112
using System.Threading.Tasks;
@@ -130,20 +131,12 @@ protected static string DebuggerTestAppPath
130131

131132
static protected string FindTestPath()
132133
{
133-
//FIXME how would I locate it otherwise?
134-
var test_path = Environment.GetEnvironmentVariable("TEST_SUITE_PATH");
135-
//Lets try to guest
136-
if (test_path != null && Directory.Exists(test_path))
137-
return test_path;
138-
139-
var cwd = Environment.CurrentDirectory;
140-
Console.WriteLine("guessing from {0}", cwd);
141-
//tests run from DebuggerTestSuite/bin/Debug/netcoreapp2.1
142-
var new_path = Path.Combine(cwd, "../../../../bin/debugger-test-suite");
143-
if (File.Exists(Path.Combine(new_path, "debugger-driver.html")))
144-
return new_path;
145-
146-
throw new Exception("Missing TEST_SUITE_PATH env var and could not guess path from CWD");
134+
var asm_dir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
135+
var test_app_path = Path.Combine(asm_dir, "..", "..", "..", "debugger-test", "Debug", "publish");
136+
if (File.Exists(Path.Combine(test_app_path, "debugger-driver.html")))
137+
return test_app_path;
138+
139+
throw new Exception($"Could not figure out debugger-test app path ({test_app_path}) based on the test suite location ({asm_dir})");
147140
}
148141

149142
static string[] PROBE_LIST = {

‎src/mono/wasm/debugger/debugger.sln

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 15
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebuggerTestSuite", "DebuggerTestSuite\DebuggerTestSuite.csproj", "{FF4CBDBF-EAC9-4531-A0F7-F3B834182862}"
5+
EndProject
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "lazy-debugger-test", "tests\lazy-debugger-test\lazy-debugger-test.csproj", "{BB824B8F-3E3B-48AB-86DB-168D15121372}"
7+
EndProject
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "debugger-test", "tests\debugger-test\debugger-test.csproj", "{6C3A70F3-12C1-457D-A8D7-1E0E335B1F66}"
9+
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserDebugProxy", "BrowserDebugProxy\BrowserDebugProxy.csproj", "{532E9E35-D877-41A6-81F4-505AEA17AA04}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrowserDebugHost", "BrowserDebugHost\BrowserDebugHost.csproj", "{E8A5E324-3FCD-4E3A-AC99-0C39037A8C1B}"
13+
EndProject
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "lazy-debugger-test-embedded", "tests\lazy-debugger-test-embedded\lazy-debugger-test-embedded.csproj", "{1E2F50AA-DA21-4D71-AF07-F38B68026CAA}"
15+
EndProject
16+
Global
17+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
18+
Debug|x64 = Debug|x64
19+
Debug|x86 = Debug|x86
20+
Release|x64 = Release|x64
21+
Release|x86 = Release|x86
22+
EndGlobalSection
23+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
24+
{FF4CBDBF-EAC9-4531-A0F7-F3B834182862}.Debug|x64.ActiveCfg = Debug|x64
25+
{FF4CBDBF-EAC9-4531-A0F7-F3B834182862}.Debug|x64.Build.0 = Debug|x64
26+
{FF4CBDBF-EAC9-4531-A0F7-F3B834182862}.Debug|x86.ActiveCfg = Debug|x86
27+
{FF4CBDBF-EAC9-4531-A0F7-F3B834182862}.Debug|x86.Build.0 = Debug|x86
28+
{FF4CBDBF-EAC9-4531-A0F7-F3B834182862}.Release|x64.ActiveCfg = Release|x64
29+
{FF4CBDBF-EAC9-4531-A0F7-F3B834182862}.Release|x64.Build.0 = Release|x64
30+
{FF4CBDBF-EAC9-4531-A0F7-F3B834182862}.Release|x86.ActiveCfg = Release|x86
31+
{FF4CBDBF-EAC9-4531-A0F7-F3B834182862}.Release|x86.Build.0 = Release|x86
32+
{BB824B8F-3E3B-48AB-86DB-168D15121372}.Debug|x64.ActiveCfg = Debug|x64
33+
{BB824B8F-3E3B-48AB-86DB-168D15121372}.Debug|x64.Build.0 = Debug|x64
34+
{BB824B8F-3E3B-48AB-86DB-168D15121372}.Debug|x86.ActiveCfg = Debug|x86
35+
{BB824B8F-3E3B-48AB-86DB-168D15121372}.Debug|x86.Build.0 = Debug|x86
36+
{BB824B8F-3E3B-48AB-86DB-168D15121372}.Release|x64.ActiveCfg = Release|x64
37+
{BB824B8F-3E3B-48AB-86DB-168D15121372}.Release|x64.Build.0 = Release|x64
38+
{BB824B8F-3E3B-48AB-86DB-168D15121372}.Release|x86.ActiveCfg = Release|x86
39+
{BB824B8F-3E3B-48AB-86DB-168D15121372}.Release|x86.Build.0 = Release|x86
40+
{6C3A70F3-12C1-457D-A8D7-1E0E335B1F66}.Debug|x64.ActiveCfg = Debug|x64
41+
{6C3A70F3-12C1-457D-A8D7-1E0E335B1F66}.Debug|x64.Build.0 = Debug|x64
42+
{6C3A70F3-12C1-457D-A8D7-1E0E335B1F66}.Debug|x86.ActiveCfg = Debug|x86
43+
{6C3A70F3-12C1-457D-A8D7-1E0E335B1F66}.Debug|x86.Build.0 = Debug|x86
44+
{6C3A70F3-12C1-457D-A8D7-1E0E335B1F66}.Release|x64.ActiveCfg = Release|x64
45+
{6C3A70F3-12C1-457D-A8D7-1E0E335B1F66}.Release|x64.Build.0 = Release|x64
46+
{6C3A70F3-12C1-457D-A8D7-1E0E335B1F66}.Release|x86.ActiveCfg = Release|x86
47+
{6C3A70F3-12C1-457D-A8D7-1E0E335B1F66}.Release|x86.Build.0 = Release|x86
48+
{532E9E35-D877-41A6-81F4-505AEA17AA04}.Debug|x64.ActiveCfg = Debug|x64
49+
{532E9E35-D877-41A6-81F4-505AEA17AA04}.Debug|x64.Build.0 = Debug|x64
50+
{532E9E35-D877-41A6-81F4-505AEA17AA04}.Debug|x86.ActiveCfg = Debug|x86
51+
{532E9E35-D877-41A6-81F4-505AEA17AA04}.Debug|x86.Build.0 = Debug|x86
52+
{532E9E35-D877-41A6-81F4-505AEA17AA04}.Release|x64.ActiveCfg = Release|x64
53+
{532E9E35-D877-41A6-81F4-505AEA17AA04}.Release|x64.Build.0 = Release|x64
54+
{532E9E35-D877-41A6-81F4-505AEA17AA04}.Release|x86.ActiveCfg = Release|x86
55+
{532E9E35-D877-41A6-81F4-505AEA17AA04}.Release|x86.Build.0 = Release|x86
56+
{E8A5E324-3FCD-4E3A-AC99-0C39037A8C1B}.Debug|x64.ActiveCfg = Debug|x64
57+
{E8A5E324-3FCD-4E3A-AC99-0C39037A8C1B}.Debug|x64.Build.0 = Debug|x64
58+
{E8A5E324-3FCD-4E3A-AC99-0C39037A8C1B}.Debug|x86.ActiveCfg = Debug|x86
59+
{E8A5E324-3FCD-4E3A-AC99-0C39037A8C1B}.Debug|x86.Build.0 = Debug|x86
60+
{E8A5E324-3FCD-4E3A-AC99-0C39037A8C1B}.Release|x64.ActiveCfg = Release|x64
61+
{E8A5E324-3FCD-4E3A-AC99-0C39037A8C1B}.Release|x64.Build.0 = Release|x64
62+
{E8A5E324-3FCD-4E3A-AC99-0C39037A8C1B}.Release|x86.ActiveCfg = Release|x86
63+
{E8A5E324-3FCD-4E3A-AC99-0C39037A8C1B}.Release|x86.Build.0 = Release|x86
64+
{1E2F50AA-DA21-4D71-AF07-F38B68026CAA}.Debug|x64.ActiveCfg = Debug|x64
65+
{1E2F50AA-DA21-4D71-AF07-F38B68026CAA}.Debug|x64.Build.0 = Debug|x64
66+
{1E2F50AA-DA21-4D71-AF07-F38B68026CAA}.Debug|x86.ActiveCfg = Debug|x86
67+
{1E2F50AA-DA21-4D71-AF07-F38B68026CAA}.Debug|x86.Build.0 = Debug|x86
68+
{1E2F50AA-DA21-4D71-AF07-F38B68026CAA}.Release|x64.ActiveCfg = Release|x64
69+
{1E2F50AA-DA21-4D71-AF07-F38B68026CAA}.Release|x64.Build.0 = Release|x64
70+
{1E2F50AA-DA21-4D71-AF07-F38B68026CAA}.Release|x86.ActiveCfg = Release|x86
71+
{1E2F50AA-DA21-4D71-AF07-F38B68026CAA}.Release|x86.Build.0 = Release|x86
72+
EndGlobalSection
73+
EndGlobal

‎src/mono/wasm/debugger/tests/Directory.Build.props

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Directory.Build.props" />
3+
<PropertyGroup>
4+
<TargetFramework>$(AspNetCoreAppCurrent)</TargetFramework>
5+
<TargetArchitecture>wasm</TargetArchitecture>
6+
<TargetOS>Browser</TargetOS>
7+
<OutputType>Library</OutputType>
8+
<Configuration>Debug</Configuration>
9+
<RuntimeBuildConfig Condition="'$(RuntimeBuildConfig)' == ''">$(Configuration)</RuntimeBuildConfig>
10+
11+
<AppDir>$(ArtifactsBinDir)debugger-test\$(Configuration)\publish</AppDir>
12+
<OutDir>$(ArtifactsBinDir)debugger-test\$(Configuration)\wasm</OutDir>
13+
</PropertyGroup>
14+
</Project>

‎src/mono/wasm/debugger/tests/Directory.Build.targets

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<Project>
2+
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Directory.Build.targets" />
3+
4+
<PropertyGroup>
5+
<RuntimeConfiguration>Release</RuntimeConfiguration>
6+
</PropertyGroup>
7+
</Project>

‎src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="BuildApp">
22
<PropertyGroup>
3-
<TargetFramework>$(AspNetCoreAppCurrent)</TargetFramework>
4-
<TargetArchitecture>wasm</TargetArchitecture>
5-
<TargetOS>Browser</TargetOS>
6-
<MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.browser-wasm\Release\runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackDir>
7-
<BuildDir>$(MSBuildThisFileDirectory)obj\$(Configuration)\wasm</BuildDir>
8-
<AppDir>$(MSBuildThisFileDirectory)bin\$(Configuration)\publish</AppDir>
9-
<RuntimeBuildConfig Condition="'$(RuntimeBuildConfig)' == ''">$(Configuration)</RuntimeBuildConfig>
103
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
114
<OutputType>Library</OutputType>
125
<NoWarn>219</NoWarn>
@@ -15,6 +8,16 @@
158
<DebugType>portable</DebugType>
169
</PropertyGroup>
1710

11+
<ItemGroup>
12+
<ExtraFileForPublish Include="debugger-driver.html" />
13+
<ExtraFileForPublish Include="other.js" />
14+
<ExtraFileForPublish Include="runtime-debugger.js" />
15+
16+
<!-- We want to bundle these assemblies, so build them first -->
17+
<ProjectReference Include="..\lazy-debugger-test\lazy-debugger-test.csproj" Private="true"/>
18+
<ProjectReference Include="..\lazy-debugger-test-embedded\lazy-debugger-test-embedded.csproj" Private="true"/>
19+
</ItemGroup>
20+
1821
<Target Name="RebuildWasmAppBuilder">
1922
<ItemGroup>
2023
<WasmAppBuildProject Include="$(RepoTasksDir)mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj" />
@@ -33,19 +36,26 @@
3336
AssemblyFile="$(ArtifactsBinDir)WasmAppBuilder\$(Configuration)\$(NetCoreAppCurrent)\publish\WasmAppBuilder.dll"/>
3437

3538
<Target Name="BuildApp" DependsOnTargets="RebuildWasmAppBuilder;Build">
39+
<PropertyGroup>
40+
<MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.browser-wasm\Release\runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackDir>
41+
</PropertyGroup>
3642
<ItemGroup>
3743
<AssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackDir)native"/>
3844
<AssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackDir)lib\$(NetCoreAppCurrent)"/>
45+
46+
<ExtraFileForPublish Include="@(ReferenceCopyLocalPaths)" />
3947
</ItemGroup>
48+
4049
<WasmAppBuilder
4150
AppDir="$(AppDir)"
4251
MicrosoftNetCoreAppRuntimePackDir="$(MicrosoftNetCoreAppRuntimePackDir)"
43-
MainAssembly="$(ArtifactsBinDir)debugger-test/wasm/Debug/debugger-test.dll"
52+
MainAssembly="$(OutDir)debugger-test.dll"
4453
MainJS="$(MonoProjectRoot)wasm\runtime-test.js"
4554
DebugLevel="1"
4655
AssemblySearchPaths="@(AssemblySearchPaths)"
4756
ExtraAssemblies="$(ArtifactsBinDir)\System.Private.Runtime.InteropServices.JavaScript\$(NetCoreAppCurrent)-Browser-$(RuntimeConfiguration)\System.Private.Runtime.InteropServices.JavaScript.dll"/>
48-
<Exec Command="chmod a+x $(AppDir)/run-v8.sh" />
57+
58+
<Copy SourceFiles="@(ExtraFileForPublish)" DestinationFolder="$(AppDir)" />
4959
</Target>
5060

5161
</Project>

‎src/mono/wasm/debugger/tests/lazy-debugger-test-embedded/lazy-debugger-test-embedded.csproj

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="BuildApp">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(AspNetCoreAppCurrent)</TargetFramework>
4-
<TargetArchitecture>wasm</TargetArchitecture>
5-
<TargetOS>Browser</TargetOS>
6-
<MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.browser-wasm\Release\runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackDir>
7-
<BuildDir>$(MSBuildThisFileDirectory)obj\$(Configuration)\wasm</BuildDir>
8-
<AppDir>$(MSBuildThisFileDirectory)bin\$(Configuration)\publish</AppDir>
9-
<RuntimeBuildConfig Condition="'$(RuntimeBuildConfig)' == ''">$(Configuration)</RuntimeBuildConfig>
103
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
114
<OutputType>Library</OutputType>
125
<NoWarn>219</NoWarn>
136
<RunAnalyzers>false</RunAnalyzers>
147
<DebugType>embedded</DebugType>
158
</PropertyGroup>
16-
17-
<Target Name="RebuildWasmAppBuilder">
18-
<ItemGroup>
19-
<WasmAppBuildProject Include="$(RepoTasksDir)mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj" />
20-
</ItemGroup>
21-
22-
<MSBuild Projects="@(WasmAppBuildProject)"
23-
Properties="Configuration=$(Configuration);MSBuildRestoreSessionId=$([System.Guid]::NewGuid())"
24-
Targets="Restore"/>
25-
26-
<MSBuild Projects="@(WasmAppBuildProject)"
27-
Properties="Configuration=$(Configuration)"
28-
Targets="Build;Publish"/>
29-
</Target>
30-
31-
<UsingTask TaskName="WasmAppBuilder"
32-
AssemblyFile="$(ArtifactsBinDir)WasmAppBuilder\$(Configuration)\$(NetCoreAppCurrent)\publish\WasmAppBuilder.dll"/>
33-
34-
<Target Name="BuildApp" DependsOnTargets="RebuildWasmAppBuilder;Build">
35-
<ItemGroup>
36-
<AssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackDir)native"/>
37-
<AssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackDir)lib\$(NetCoreAppCurrent)"/>
38-
</ItemGroup>
39-
<WasmAppBuilder
40-
AppDir="$(AppDir)"
41-
MicrosoftNetCoreAppRuntimePackDir="$(MicrosoftNetCoreAppRuntimePackDir)"
42-
MainAssembly="$(ArtifactsBinDir)lazy-debugger-test-embedded/wasm/Debug/lazy-debugger-test-embedded.dll"
43-
MainJS="$(MonoProjectRoot)wasm\runtime-test.js"
44-
DebugLevel="1"
45-
AssemblySearchPaths="@(AssemblySearchPaths)"
46-
ExtraAssemblies="$(ArtifactsBinDir)\System.Private.Runtime.InteropServices.JavaScript\$(NetCoreAppCurrent)-Browser-$(RuntimeConfiguration)\System.Private.Runtime.InteropServices.JavaScript.dll"/>
47-
<Exec Command="chmod a+x $(AppDir)/run-v8.sh" />
48-
</Target>
49-
50-
</Project>
9+
</Project>

‎src/mono/wasm/debugger/tests/lazy-debugger-test/lazy-debugger-test.csproj

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk" DefaultTargets="BuildApp">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>$(AspNetCoreAppCurrent)</TargetFramework>
4-
<TargetArchitecture>wasm</TargetArchitecture>
5-
<TargetOS>Browser</TargetOS>
6-
<MicrosoftNetCoreAppRuntimePackDir>$(ArtifactsBinDir)microsoft.netcore.app.runtime.browser-wasm\Release\runtimes\browser-wasm\</MicrosoftNetCoreAppRuntimePackDir>
7-
<BuildDir>$(MSBuildThisFileDirectory)obj\$(Configuration)\wasm</BuildDir>
8-
<AppDir>$(MSBuildThisFileDirectory)bin\$(Configuration)\publish</AppDir>
9-
<RuntimeBuildConfig Condition="'$(RuntimeBuildConfig)' == ''">$(Configuration)</RuntimeBuildConfig>
103
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
114
<OutputType>Library</OutputType>
125
<NoWarn>219</NoWarn>
136
<RunAnalyzers>false</RunAnalyzers>
147
<DebugType>portable</DebugType>
158
</PropertyGroup>
16-
17-
<Target Name="RebuildWasmAppBuilder">
18-
<ItemGroup>
19-
<WasmAppBuildProject Include="$(RepoTasksDir)mobile.tasks\WasmAppBuilder\WasmAppBuilder.csproj" />
20-
</ItemGroup>
21-
22-
<MSBuild Projects="@(WasmAppBuildProject)"
23-
Properties="Configuration=$(Configuration);MSBuildRestoreSessionId=$([System.Guid]::NewGuid())"
24-
Targets="Restore"/>
25-
26-
<MSBuild Projects="@(WasmAppBuildProject)"
27-
Properties="Configuration=$(Configuration)"
28-
Targets="Build;Publish"/>
29-
</Target>
30-
31-
<UsingTask TaskName="WasmAppBuilder"
32-
AssemblyFile="$(ArtifactsBinDir)WasmAppBuilder\$(Configuration)\$(NetCoreAppCurrent)\publish\WasmAppBuilder.dll"/>
33-
34-
<Target Name="BuildApp" DependsOnTargets="RebuildWasmAppBuilder;Build">
35-
<ItemGroup>
36-
<AssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackDir)native"/>
37-
<AssemblySearchPaths Include="$(MicrosoftNetCoreAppRuntimePackDir)lib\$(NetCoreAppCurrent)"/>
38-
</ItemGroup>
39-
<WasmAppBuilder
40-
AppDir="$(AppDir)"
41-
MicrosoftNetCoreAppRuntimePackDir="$(MicrosoftNetCoreAppRuntimePackDir)"
42-
MainAssembly="$(ArtifactsBinDir)lazy-debugger-test/wasm/Debug/lazy-debugger-test.dll"
43-
MainJS="$(MonoProjectRoot)wasm\runtime-test.js"
44-
DebugLevel="1"
45-
AssemblySearchPaths="@(AssemblySearchPaths)"
46-
ExtraAssemblies="$(ArtifactsBinDir)\System.Private.Runtime.InteropServices.JavaScript\$(NetCoreAppCurrent)-Browser-$(RuntimeConfiguration)\System.Private.Runtime.InteropServices.JavaScript.dll"/>
47-
<Exec Command="chmod a+x $(AppDir)/run-v8.sh" />
48-
</Target>
49-
50-
</Project>
9+
</Project>

0 commit comments

Comments
 (0)