fix(pwa): Ensure PWS manifest is copied to the proper location

src/Uno.Wasm.AotTests/Uno.Wasm.AotTests.csproj

@@ -22,6 +22,10 @@
  <None Remove="WasmScripts\image.js" />
  </ItemGroup>
 
+ <ItemGroup>
+ <Content Include="pwa-images\**\*.*" />
+ </ItemGroup>
+
  <ItemGroup>
  <EmbeddedResource Include="Uno.Wasm.AotTests.xml">
  <LogicalName>Uno.Wasm.AotTests.xml</LogicalName>
@@ -51,4 +55,17 @@
  <UserProperties manifest_1json__JsonSchema="http://json.schemastore.org/grunt-task" />
  </VisualStudio>
  </ProjectExtensions>
+
+ <Target Name="AfterBuildValidation" AfterTargets="Build">
+ <ItemGroup>
+ <_AdditionalFile1 Include="pwa-images\android\android-launchericon-144-144.png" />
+ <_AdditionalFile1 Include="pwa-images\windows10\SplashScreen.scale-100.png" />
+ </ItemGroup>
+
+ <Error Condition="!exists('$(WasmShellOutputPackagePath)\%(_AdditionalFile1.Identity)')" Text="%(_AdditionalFile1.Identity) is missing in $(WasmShellOutputPackagePath)" />
+ <Error Condition="!exists('$(WasmShellOutputDistPath)\$(WasmPWAManifestFile)')" Text="AdditionalContent/$(WasmPWAManifestFile) should exist in $(WasmShellOutputDistPath)" />
+
+ <Message Importance="high" Text="Output dist validated" />
+ </Target>
+
 </Project>

src/Uno.Wasm.Bootstrap/ShellTask.cs

@@ -1694,7 +1694,7 @@ string s when s.StartsWith("./") => $"./{_remoteBasePackagePath}/" + s.Substring
  }
  }
 
- File.WriteAllText(PWAManifestFile, manifestDocument.ToString());
+ File.WriteAllText(Path.Combine(_distPath, Path.GetFileName(PWAManifestFile)), manifestDocument.ToString());
  }
  }
 

src/Uno.Wasm.Bootstrap/Uno.Wasm.Bootstrap.csproj

@@ -13,7 +13,6 @@
  <LangVersion>8.0</LangVersion>
  <Nullable>enable</Nullable>
  <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
- <GitVersion_Sha>1234</GitVersion_Sha>
  </PropertyGroup>
 
  <PropertyGroup Condition="'$(GitVersion_Sha)'!=''">
@@ -150,6 +149,10 @@
  </ProjectReference>
  </ItemGroup>
 
+ <ItemGroup>
+ <Folder Include="build\packager\" />
+ </ItemGroup>
+
  <Target Name="UpdateAdditionalAssemblies" AfterTargets="CoreCompile">
  <ItemGroup>
  <Content Include="./tools/support/Uno.Wasm.TimezoneData.*">
@@ -225,9 +228,7 @@
  <ReplaceSHAVersion FilePath="%(_Sha1Replace.Identity)" SHAVersion="$(_CurrentVersion)" />
  </Target>
 
- <UsingTask TaskName="ReplaceSHAVersion"
- TaskFactory="RoslynCodeTaskFactory"
- AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+ <UsingTask TaskName="ReplaceSHAVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
  <ParameterGroup>
  <FilePath ParameterType="System.String" Required="True" Output="False" />
  <SHAVersion ParameterType="System.String" Required="True" Output="False" />

src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets

@@ -1,7 +1,7 @@
 <Project>
 
  <PropertyGroup>
- <_packageBinaryPath>$(MSBuildThisFileDirectory)../tools/Uno.Wasm.Bootstrap.v1234.dll</_packageBinaryPath>
+ <_packageBinaryPath>$(MSBuildThisFileDirectory)../tools/Uno.Wasm.Bootstrap.v0.dll</_packageBinaryPath>
 
  <WasmShellTasksPath Condition="!Exists('$(_packageBinaryPath)')">$(MSBuildThisFileDirectory)../bin/$(Configuration)/netstandard2.0</WasmShellTasksPath>
  <WasmShellTasksPath Condition="Exists('$(_packageBinaryPath)')">../tools</WasmShellTasksPath>
@@ -97,8 +97,8 @@
  <UpToDateCheckInput Include="@(LinkerDescriptor)" />
  </ItemGroup>
 
- <UsingTask AssemblyFile="$(WasmShellTasksPath)/Uno.Wasm.Bootstrap.v1234.dll" TaskName="Uno.Wasm.Bootstrap.ShellTask_v1234" />
- <UsingTask AssemblyFile="$(WasmShellTasksPath)/Uno.Wasm.Bootstrap.v1234.dll" TaskName="Uno.Wasm.Bootstrap.UnoInstallSDKTask_v1234" />
+ <UsingTask AssemblyFile="$(WasmShellTasksPath)/Uno.Wasm.Bootstrap.v0.dll" TaskName="Uno.Wasm.Bootstrap.ShellTask_v0" />
+ <UsingTask AssemblyFile="$(WasmShellTasksPath)/Uno.Wasm.Bootstrap.v0.dll" TaskName="Uno.Wasm.Bootstrap.UnoInstallSDKTask_v0" />
 
  <Target Name="_GenerateLinkerDescriptor" BeforeTargets="PrepareForBuild">
  <!-- 
@@ -136,7 +136,7 @@
  <WasmShellDistPath Condition="'$(WasmShellDistPath)'==''">$(OutputPath)/dist</WasmShellDistPath>
  </PropertyGroup>
 
- <UnoInstallSDKTask_v1234
+ <UnoInstallSDKTask_v0
  MonoWasmSDKUri="$(MonoWasmSDKUri)"
  MonoWasmAOTSDKUri="$(MonoWasmAOTSDKUri)"
  NetCoreWasmSDKUri="$(NetCoreWasmSDKUri)"
@@ -155,9 +155,9 @@
  <Output TaskParameter="SdkPath" PropertyName="_UnoMonoSdkPath" />
  <Output TaskParameter="PackagerBinPath" PropertyName="_UnoMonoPackagerBinPath" />
  <Output TaskParameter="PackagerProjectFile" PropertyName="_UnoMonoPackagerProjectFile" />
- </UnoInstallSDKTask_v1234>
+ </UnoInstallSDKTask_v0>
 
- <ShellTask_v1234
+ <ShellTask_v0
  CurrentProjectPath="$(MSBuildProjectDirectory)"
  BuildTaskBasePath="$(MSBuildThisFileDirectory)"
  Assembly="$(IntermediateOutputPath)$(TargetFileName)"
@@ -199,7 +199,7 @@
  ReferencePath="@(_UnoWasmBootstrapAssembliesForReferenceCopyLocalPaths)">
  <Output TaskParameter="OutputPackagePath" PropertyName="WasmShellOutputPackagePath" />
  <Output TaskParameter="OutputDistPath" PropertyName="WasmShellOutputDistPath" />
- </ShellTask_v1234>
+ </ShellTask_v0>
  </Target>
 
  <Target Name="_CleanDist" BeforeTargets="Clean">