Skip to content

[wasm] add new interop to the console template #72375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radekdoulik merged 15 commits into from
Jul 21, 2022
Merged

[wasm] add new interop to the console template #72375

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
04d9d45
Merge pull request #1 from dotnet/main
alinpahontu2912 Jul 15, 2022
04c5c80
Merge branch 'dotnet:main' into main
alinpahontu2912 Jul 15, 2022
e6a899d
first try for wasm console template
Jul 18, 2022
fdfa5e3
removed unnecessary references
Jul 18, 2022
daab523
modified initial .csproj file
Jul 18, 2022
35c1cbf
Delete console.csproj
alinpahontu2912 Jul 18, 2022
fb68215
solved formatting and fixed failing test
Jul 18, 2022
7db0885
Merge branch 'main' of https://github.com/alinpahontu2912/runtime
Jul 18, 2022
e7e0fc9
Merge branch 'dotnet:main' into main
alinpahontu2912 Jul 19, 2022
cc4c83d
Merge branch 'dotnet:main' into main
alinpahontu2912 Jul 19, 2022
e3808fc
solved failing tests
Jul 21, 2022
cc757ae
fixed styling
Jul 21, 2022
7d7b806
simplified updating of Program.cs
Jul 21, 2022
a8ee272
removed unnecessary files
Jul 21, 2022
f12f56a
used string.replace instead of regex
Jul 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
solved failing tests
  • Loading branch information
Stefan Pahontu committed Jul 21, 2022
commit e3808fcd6d5f7245923739b0cac55d6a99ca6f39
26 changes: 24 additions & 2 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/WasmTemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using System;
using System.IO;
using System.Text;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
Expand All @@ -19,6 +20,25 @@ public WasmTemplateTests(ITestOutputHelper output, SharedBuildPerTestClassFixtur
{
}

public string getProgramText(string path, string programText) {
string text = File.ReadAllText(path);
var lines = text.Split('\n');
int i = 0;
StringBuilder stringBuilder = new();
while (!lines[i].Contains("Console.WriteLine(\"Hello, Console!\");")) {
stringBuilder.Append(lines[i]);
i++;
}

stringBuilder.Append(programText);
while (i < lines.Length) {
stringBuilder.Append(lines[i]);
i++;
}

return stringBuilder.ToString();
}

[Theory]
[InlineData("Debug")]
[InlineData("Release")]
Expand Down Expand Up @@ -133,7 +153,8 @@ public void ConsoleBuildAndRun(string config)
for (int i = 0; i < args.Length; i ++)
Console.WriteLine ($"args[{i}] = {args[i]}");
""";
File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), programText);
File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), getProgramText(Path.Combine(_projectDir!, "Program.cs"), programText));


var buildArgs = new BuildArgs(projectName, config, false, id, null);
buildArgs = ExpandBuildArgs(buildArgs);
Expand Down Expand Up @@ -175,7 +196,8 @@ public void ConsolePublishAndRun(string config, bool aot)
for (int i = 0; i < args.Length; i ++)
Console.WriteLine ($"args[{i}] = {args[i]}");
""";
File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), programText);
File.WriteAllText(Path.Combine(_projectDir!, "Program.cs"), getProgramText(Path.Combine(_projectDir!, "Program.cs"), programText));

if (aot)
AddItemsPropertiesToProject(projectFile, "<RunAOTCompilation>true</RunAOTCompilation>");

Expand Down