Skip to content

[release/6.0-rc2][wasm] Bump sdk version for workload testing to 6.0.100-rc.2.21467.10 #59279

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

Closed
radical wants to merge 2 commits into from
Closed

[release/6.0-rc2][wasm] Bump sdk version for workload testing to 6.0.100-rc.2.21467.10 #59279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4021d7a
[wasm] Bump sdk version for workload testing to 6.0.100-rc.2.21467.10
radical Sep 17, 2021
f5cea6d
[wasm] Add test for issue #59255
radical Sep 17, 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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<SQLitePCLRawbundle_greenVersion>2.0.4</SQLitePCLRawbundle_greenVersion>
<MoqVersion>4.12.0</MoqVersion>
<FsCheckVersion>2.14.3</FsCheckVersion>
<SdkVersionForWorkloadTesting>6.0.100-rc.2.21463.12</SdkVersionForWorkloadTesting>
<SdkVersionForWorkloadTesting>6.0.100-rc.2.21467.10</SdkVersionForWorkloadTesting>
<!-- Docs -->
<MicrosoftPrivateIntellisenseVersion>6.0.0-preview-20210916.1</MicrosoftPrivateIntellisenseVersion>
<!-- ILLink -->
Expand Down
123 changes: 7 additions & 116 deletions src/mono/wasm/BlazorOverwrite.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ Copyright (c) .NET Foundation. All rights reserved.
<DisableAutoWasmPublishApp>true</DisableAutoWasmPublishApp>
<EnableDefaultWasmAssembliesToBundle>false</EnableDefaultWasmAssembliesToBundle>
<WasmNestedPublishAppDependsOn>ComputeFilesToPublish;_GatherWasmFilesToPublish;$(WasmNestedPublishAppDependsOn)</WasmNestedPublishAppDependsOn>
<_ScrambleDotnetJsFileNameAfterThisTarget Condition="'$(UsingBrowserRuntimeWorkload)' != 'true'">ResolveRuntimePackAssets</_ScrambleDotnetJsFileNameAfterThisTarget>
<_ScrambleDotnetJsFileNameAfterThisTarget Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'">WasmBuildApp</_ScrambleDotnetJsFileNameAfterThisTarget>

<!-- Workaround https://github.com/dotnet/sdk/issues/20923 where we end up with two publish dirs - 'Publish', and 'publish' -->
<PublishDirName Condition="'$(PublishDirName)' == 'publish'">Publish</PublishDirName>
</PropertyGroup>

<ItemGroup>
Expand Down Expand Up @@ -114,121 +109,13 @@ Copyright (c) .NET Foundation. All rights reserved.

<Import Project="Microsoft.NET.Sdk.BlazorWebAssembly.ServiceWorkerAssetsManifest.targets" Condition="'$(ServiceWorkerAssetsManifest)' != ''" />

<Target Name="_ScrambleDotnetJsFileNameForPublish">
<!--
We want the dotnet.js file output to have a version to better work with caching. We'll append the runtime version to the file name as soon as file has been discovered.
-->
<PropertyGroup>
<_DotNetJsVersion>$(BundledNETCoreAppPackageVersion)</_DotNetJsVersion>
<_DotNetJsVersion Condition="'$(RuntimeFrameworkVersion)' != ''">$(RuntimeFrameworkVersion)</_DotNetJsVersion>
<_BlazorDotnetJsFileName>dotnet.$(_DotNetJsVersion).js</_BlazorDotnetJsFileName>
</PropertyGroup>

<ItemGroup Condition="@(WasmNativeAsset->Count()) != 0">
<_DotNetJsItem Remove="@(_DotNetJsItem)" />
<_DotNetJsItem Include="@(WasmNativeAsset)" Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.js'">
<RelativePath>_framework/$(_BlazorDotnetJsFileName)</RelativePath>
<AssetType>native</AssetType>
<CopyLocal>true</CopyLocal>
</_DotNetJsItem>
</ItemGroup>

<ItemGroup>
<_DotnetJsStaticWebAssetCandidate Remove="@(_DotnetJsStaticWebAssetCandidate)" />
<_DotnetJsCopyCandidates Remove="@(_DotnetJsCopyCandidates)" />
</ItemGroup>

<DefineStaticWebAssets Condition="'@(_DotNetJsItem->Count())' != '0'"
CandidateAssets="@(_DotNetJsItem)"
SourceId="$(PackageId)"
SourceType="Computed"
AssetKind="Build"
AssetRole="Primary"
AssetTraitName="BlazorWebAssemblyResource"
AssetTraitValue="native"
CopyToOutputDirectory="PreserveNewest"
CopyToPublishDirectory="Never"
ContentRoot="$(IntermediateOutputPath)\blazor"
BasePath="$(StaticWebAssetBasePath)"
>
<Output TaskParameter="Assets" ItemName="_DotnetJsStaticWebAssetCandidate" />
<Output TaskParameter="CopyCandidates" ItemName="_DotnetJsCopyCandidates" />
</DefineStaticWebAssets>

<Copy
SourceFiles="@(_DotnetJsCopyCandidates)"
DestinationFiles="@(_DotnetJsCopyCandidates->'%(TargetPath)')"
SkipUnchangedFiles="true"
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" />

<ItemGroup Condition="'@(_DotNetJsItem->Count())' != '0'">
<ReferenceCopyLocalPaths Remove="@(_DotNetJsItem)" />
<_DotnetJsStaticWebAsset Include="@(_DotnetJsStaticWebAssetCandidate->'%(ContentRoot)_framework\dotnet.js')" />
<_BlazorStaticWebAsset Include="@(_DotnetJsStaticWebAsset)" />
</ItemGroup>
</Target>

<Target Name="_ScrambleDotnetJsFileName" AfterTargets="$(_ScrambleDotnetJsFileNameAfterThisTarget)">
<!--
We want the dotnet.js file output to have a version to better work with caching. We'll append the runtime version to the file name as soon as file has been discovered.
-->
<PropertyGroup>
<_DotNetJsVersion>$(BundledNETCoreAppPackageVersion)</_DotNetJsVersion>
<_DotNetJsVersion Condition="'$(RuntimeFrameworkVersion)' != ''">$(RuntimeFrameworkVersion)</_DotNetJsVersion>
<_BlazorDotnetJsFileName>dotnet.$(_DotNetJsVersion).js</_BlazorDotnetJsFileName>
</PropertyGroup>

<ItemGroup Condition="@(WasmNativeAsset->Count()) == 0">
<_DotNetJsItem Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.DestinationSubPath)' == 'dotnet.js' AND '%(ReferenceCopyLocalPaths.AssetType)' == 'native'">
<RelativePath>_framework/$(_BlazorDotnetJsFileName)</RelativePath>
</_DotNetJsItem>
</ItemGroup>

<ItemGroup Condition="@(WasmNativeAsset->Count()) != 0">
<_DotNetJsItem Remove="@(_DotNetJsItem)" />
<_DotNetJsItem Include="@(WasmNativeAsset)" Condition="'%(WasmNativeAsset.FileName)%(WasmNativeAsset.Extension)' == 'dotnet.js'">
<RelativePath>_framework/$(_BlazorDotnetJsFileName)</RelativePath>
<AssetType>native</AssetType>
<CopyLocal>true</CopyLocal>
</_DotNetJsItem>
</ItemGroup>

<DefineStaticWebAssets Condition="'@(_DotNetJsItem->Count())' != '0'"
CandidateAssets="@(_DotNetJsItem)"
SourceId="$(PackageId)"
SourceType="Computed"
AssetKind="Build"
AssetRole="Primary"
AssetTraitName="BlazorWebAssemblyResource"
AssetTraitValue="native"
CopyToOutputDirectory="PreserveNewest"
CopyToPublishDirectory="Never"
ContentRoot="$(IntermediateOutputPath)\blazor"
BasePath="$(StaticWebAssetBasePath)"
>
<Output TaskParameter="Assets" ItemName="_DotnetJsStaticWebAssetCandidate" />
<Output TaskParameter="CopyCandidates" ItemName="_DotnetJsCopyCandidates" />
</DefineStaticWebAssets>

<Copy
SourceFiles="@(_DotnetJsCopyCandidates)"
DestinationFiles="@(_DotnetJsCopyCandidates->'%(TargetPath)')"
SkipUnchangedFiles="true"
OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)" />

<ItemGroup Condition="'@(_DotNetJsItem->Count())' != '0'">
<ReferenceCopyLocalPaths Remove="@(_DotNetJsItem)" />
<_DotnetJsStaticWebAsset Include="@(_DotnetJsStaticWebAssetCandidate->'%(ContentRoot)_framework\dotnet.js')" />
<_BlazorStaticWebAsset Include="@(_DotnetJsStaticWebAsset)" />
</ItemGroup>
</Target>

<Target Name="_BlazorWasmNativeForBuild" DependsOnTargets="_GatherWasmFilesToBuild;WasmBuildApp" Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'" />

<Target Name="_GatherWasmFilesToBuild">
<ItemGroup>
<WasmAssembliesToBundle Remove="@(WasmAssembliesToBundle)" />
<WasmAssembliesToBundle Include="@(ReferenceCopyLocalPaths);@(MainAssembly)" Condition="'%(ReferenceCopyLocalPaths.Extension)' == '.dll'" />
<WasmAssembliesToBundle Include="@(IntermediateAssembly)" />
<WasmAssembliesToBundle Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Extension)' == '.dll'" />
<WasmAssembliesToBundle Condition="'%(WasmAssembliesToBundle.FileName)' == 'Microsoft.JSInterop.WebAssembly'" AOT_InternalForceToInterpret="true" />
</ItemGroup>
</Target>
Expand Down Expand Up @@ -265,6 +152,7 @@ Copyright (c) .NET Foundation. All rights reserved.

<_BlazorConfigFileCandidates Include="@(StaticWebAsset)" Condition="'%(SourceType)' == 'Discovered'" />

<!-- Remove dotnet.js/wasm from runtime pack, in favor of the relinked ones in @(WasmNativeAsset) -->
<ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)"
Condition="@(WasmNativeAsset->Count()) > 0 and '%(FileName)' == 'dotnet' and ('%(Extension)' == '.wasm' or '%(Extension)' == '.js')" />
</ItemGroup>
Expand All @@ -278,6 +166,7 @@ Copyright (c) .NET Foundation. All rights reserved.
TimeZoneSupport="$(_BlazorEnableTimeZoneSupport)"
InvariantGlobalization="$(_BlazorInvariantGlobalization)"
CopySymbols="$(_BlazorCopyOutputSymbolsToOutputDirectory)"
BundledNETCoreAppPackageVersion="$(BundledNETCoreAppPackageVersion)"
OutputPath="$(OutputPath)"
>
<Output TaskParameter="AssetCandidates" ItemName="_BuildAssetsCandidates" />
Expand Down Expand Up @@ -490,6 +379,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</ItemGroup>
</Target>

<!-- Wasm's Nested publish is run just to build the native bits. We don't need to run blazor targets for that -->
<Target Name="ProcessPublishFilesForBlazor" DependsOnTargets="_ResolveBlazorWasmConfiguration;LoadStaticWebAssetsBuildManifest" AfterTargets="ILLink" Condition="'$(WasmBuildingForNestedPublish)' != 'true'">
<PropertyGroup>
<_BlazorAotEnabled>$(UsingBrowserRuntimeWorkload)</_BlazorAotEnabled>
Expand Down Expand Up @@ -519,6 +409,7 @@ Copyright (c) .NET Foundation. All rights reserved.
InvariantGlobalization="$(_BlazorInvariantGlobalization)"
CopySymbols="$(CopyOutputSymbolsToPublishDirectory)"
ExistingAssets="@(_BlazorPublishPrefilteredAssets)"
BundledNETCoreAppPackageVersion="$(BundledNETCoreAppPackageVersion)"
>
<Output TaskParameter="NewCandidates" ItemName="_NewBlazorPublishStaticWebAssets" />
<Output TaskParameter="FilesToRemove" ItemName="_PublishResolvedFilesToRemove" />
Expand Down Expand Up @@ -649,7 +540,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</Target>

<Target Name="_BlazorWasmNative"
DependsOnTargets="_EnsureWasmRuntimeWorkload;WasmTriggerPublishApp;_ScrambleDotnetJsFileNameForPublish"
DependsOnTargets="_EnsureWasmRuntimeWorkload;WasmTriggerPublishApp"
BeforeTargets="ProcessPublishFilesForBlazor"
Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'" />

Expand Down
52 changes: 52 additions & 0 deletions src/tests/BuildWasmApps/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Linq;
using System.Text.RegularExpressions;
using Xunit;
using Xunit.Abstractions;

Expand Down Expand Up @@ -171,6 +172,57 @@ public void WithNativeReference_AOTOnCommandLine(string config)
BlazorPublish(id, config, expectedFileType: NativeFilesType.Relinked);
}

[ConditionalTheory(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
[InlineData("Debug")]
[InlineData("Release")]
public void WithDllImportInMainAssembly(string config)
{
// Based on https://github.com/dotnet/runtime/issues/59255
string id = $"blz_dllimp_{config}";
string projectFile = CreateProjectWithNativeReference(id);
string nativeSource = @"
#include <stdio.h>

extern ""C"" {
int cpp_add(int a, int b) {
return a + b;
}
}";
File.WriteAllText(Path.Combine(_projectDir!, "mylib.cpp"), nativeSource);

string myDllImportCs = @$"
using System.Runtime.InteropServices;
namespace {id};

public static class MyDllImports
{{
[DllImport(""mylib"")]
public static extern int cpp_add(int a, int b);
}}";
File.WriteAllText(Path.Combine(_projectDir!, "Pages", "MyDllImport.cs"), myDllImportCs);

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

BlazorBuild(id, config, expectedFileType: NativeFilesType.Relinked);
CheckNativeFileLinked(forPublish: false);

BlazorPublish(id, config, expectedFileType: NativeFilesType.Relinked);
CheckNativeFileLinked(forPublish: true);

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

string pinvokeTableHContents = File.ReadAllText(pinvokeTableHPath);
string pattern = $"\"cpp_add\".*{id}";
Assert.True(Regex.IsMatch(pinvokeTableHContents, pattern),
$"Could not find {pattern} in {pinvokeTableHPath}");
}
}
private string CreateProjectWithNativeReference(string id)
{
CreateBlazorWasmTemplateProject(id);
Expand Down