Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d3ad227
rebased
radical Aug 27, 2021
cfb584d
Fix helix work item name
radical Aug 25, 2021
80fe082
fix test
radical Aug 25, 2021
b4d7659
get all the assemblies from the publishdir
radical Aug 25, 2021
c39313b
AOTCompiler: Expand the paths used with MONO_PATH
radical Aug 26, 2021
f9948e5
Implement support for skipping assemblies for AOT
radical Aug 26, 2021
7a82a3f
Update blazorwasm targets file with a locally patched copy
radical Aug 26, 2021
cd9ec8e
Cleanup
radical Aug 26, 2021
8944a98
fix path for copying blazorwasm targets file
radical Aug 27, 2021
56c5dc3
Fix tests on emsdk
radical Aug 27, 2021
5c707f0
Don't fixup runtime pack paths when not using workloads
radical Aug 27, 2021
2dbc899
[wasm] Fix building blazor projects with no workload installed
radical Sep 7, 2021
0cfd401
Update wasm README.md
radical Sep 7, 2021
8165407
Add missing files
radical Sep 7, 2021
b499586
WasmApp.targets: remove hack for blazor, which is not needed now
radical Sep 7, 2021
0ec1188
add comments for the new properties
radical Sep 8, 2021
567144c
blazor-sdk: cleanup assemblies list before adding to it
radical Sep 8, 2021
c906da8
Fix "Clean" for blazorwasm projects, for *Build*
radical Sep 8, 2021
1ecf92d
[wasm] Rename tmp folder 'relink' to 'for-build'
radical Sep 9, 2021
40d6713
[wasm] Fix support for AOT with trimming disabled
radical Sep 10, 2021
73efb99
WasmAppBuilder - cleanup
radical Sep 10, 2021
5457420
Bump sdk for workload testing to 6.0.100-rc.2.21459.15
radical Sep 10, 2021
a93db63
disable non-wasm builds
radical Sep 10, 2021
b5744b4
run blazor tests only with the workloads installed
radical Sep 9, 2021
5a5d8ed
Update BlazorOverride.targets to 6.0
radical Sep 9, 2021
40aef7d
[wasm] Fix Publish with VS
radical Sep 10, 2021
fda6f18
Revert "disable non-wasm builds"
radical Sep 10, 2021
8e2ba88
Fix up blazorOverride.targets
radical Sep 10, 2021
d011f44
Fix local aot builds for samples
radical Sep 10, 2021
6a37e25
Fix aot with no trimming for blazor projects
radical Sep 10, 2021
6fc4bbc
Wasm.Build.Test: find differently cased publish dir
radical Sep 10, 2021
5d53a50
Rename WasmBuildingForPublish->WasmBuildingForNestedPublish to be cle…
radical Sep 10, 2021
d2037c7
Update BlazorOverwrite.targets
radical Sep 10, 2021
ad96269
sample/iOS: Add new required IntermediateOutputPath parameter for Mon…
radical Sep 10, 2021
1e67f3e
disable non-wasm builds
radical Sep 10, 2021
7cfc9cf
Fix more wasm.build.tests to work around blazor's Publish dir issue
radical Sep 11, 2021
c1ab08f
Surface @(FileWrites) from nested publish to the main build
radical Sep 11, 2021
a8f1eae
[wasm] Don't relink after build, when `$(DeployOnBuild)=true`
radical Sep 11, 2021
c6cbe0b
Revert "disable non-wasm builds"
radical Sep 11, 2021
c1a77cf
Merge remote-tracking branch 'origin/release/6.0' into build-publish-6.0
radical Sep 13, 2021
48085f2
Update BlazorOverwrite.targets to work with rc2
radical Sep 14, 2021
3bba097
[wasm] Disable a blazorwasm publish test
radical Sep 14, 2021
617415f
Bump sdk for workload testing to 6.0.100-rc.2.21463.12
radical Sep 14, 2021
eb4ef84
Merge remote-tracking branch 'origin/release/6.0' into build-publish-6.0
radical Sep 14, 2021
ee62901
Revert "Update BlazorOverwrite.targets to work with rc2"
radical Sep 14, 2021
3da2650
disable non-wasm builds
radical Sep 10, 2021
4f52961
Address review feedback from @jonathanpeppers
radical Sep 14, 2021
981ba33
Revert "disable non-wasm builds"
radical Sep 15, 2021
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
[wasm] Disable a blazorwasm publish test
`DefaultTemplate_AOT_OnlyWithPublishCommandLine_Then_PublishNoAOT`

This test runs build thrice:
1. simple build (no relinking)
2. publish+aot
3. publish-no-aot (relinking)

This causes the publish folder to have more than one `dotnet*hash*js`
files, which breaks the test since we don't know which one is the
"current" one.
  • Loading branch information
radical committed Sep 14, 2021
commit 3bba0974971fc98f9f5c44dc952ff1e62806d936
Original file line number Diff line number Diff line change
Expand Up @@ -117,24 +117,26 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
Assert.Equal(-1, index);
}

[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
[InlineData("Debug")]
[InlineData("Release")]
public void DefaultTemplate_AOT_OnlyWithPublishCommandLine_Then_PublishNoAOT(string config)
{
string id = $"blz_aot_pub_{config}";
CreateBlazorWasmTemplateProject(id);

// No relinking, no AOT
BlazorBuild(id, config, NativeFilesType.FromRuntimePack);

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

// publish again, no AOT
BlazorPublish(id, config, NativeFilesType.Relinked);
}
// Disabling for now - publish folder can have more than one dotnet*hash*js, and not sure
// how to pick which one to check, for the test
//[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
//[InlineData("Debug")]
//[InlineData("Release")]
//public void DefaultTemplate_AOT_OnlyWithPublishCommandLine_Then_PublishNoAOT(string config)
//{
//string id = $"blz_aot_pub_{config}";
//CreateBlazorWasmTemplateProject(id);

//// No relinking, no AOT
//BlazorBuild(id, config, NativeFilesType.FromRuntimePack);

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

//// publish again, no AOT
//BlazorPublish(id, config, NativeFilesType.Relinked);
//}

[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
[InlineData("Debug")]
Expand Down