feat: Add VS2022 Preview 4 suport

.vsts-ci-linux.yml

@@ -48,12 +48,12 @@ jobs:
 
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap
-      dotnet msbuild /r /p:Configuration=Release
+      dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true
     displayName: Build bootstrap
 
   - bash: |
       cd $(build.sourcesdirectory)/src
-      dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET5=true /t:Publish /m:1 Uno.Wasm.Bootstrap-netcore-only.slnf /bl:$(build.artifactstagingdirectory)/SampleNet5.binlog
+      dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true /t:Publish /m:1 Uno.Wasm.Bootstrap-netcore-only.slnf /bl:$(build.artifactstagingdirectory)/SampleNet5.binlog
     displayName: Build NetCore-Wasm Sample
 
   - task: CopyFiles@2
@@ -77,7 +77,7 @@ jobs:
   ## SWA sub-path validation
   - bash: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.AotTests.net5
-      dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET5=true /t:Publish /m:1 "/p:WasmShellWebAppBasePath=/"
+      dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true /t:Publish /m:1 "/p:WasmShellWebAppBasePath=/"
     displayName: Build RayTracer with sub-path
 
   - task: CopyFiles@2

.vsts-ci-macos.yml

@@ -16,6 +16,7 @@ jobs:
 
   steps:
   - template: build/ci/gitversion.yml
+  - template: build/ci/dotnet-install.yml
 
   - task: UseDotNet@2
     displayName: 'Install .NET 5 SDK'

.vsts-ci-windows-tests.yml

@@ -39,7 +39,7 @@ jobs:
 
   - pwsh: |
       cd $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap
-      dotnet msbuild /r /p:Configuration=Release
+      dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true
     displayName: Build bootstrap
 
   - pwsh: |

.vsts-ci.yml

@@ -23,8 +23,8 @@ jobs:
       packageType: sdk
       version: 3.1.403
 
-
   - template: build/ci/gitversion.yml
+  - template: build/ci/dotnet-install.yml
 
   - task: NuGetToolInstaller@0
     inputs:
@@ -60,22 +60,14 @@ jobs:
       OverWrite: false
       flattenFolders: false
 
-  - task: MSBuild@1
-    inputs:
-      solution: $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap-msbuild-only.slnf
-      msbuildLocationMethod: version
-      msbuildVersion: latest
-      msbuildArchitecture: x86
-      msbuildArguments: /r /bl /p:Configuration=Release /p:DISABLE_CLIHOST_NET5=true /p:InformationalVersion=$(GITVERSION.INFORMATIONALVERSION) /p:PackageVersion=$(GITVERSION.FullSemVer) /p:PackageOutputPath=$(build.sourcesdirectory)\build\nuget
-      clean: false
-      maximumCpuCount: false
-      restoreNugetPackages: false
-      logProjectEvents: false
-      createLogFile: false
+  - script: |
+      dotnet msbuild /r /bl /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true /p:InformationalVersion=$(GITVERSION.INFORMATIONALVERSION) /p:PackageVersion=$(GITVERSION.FullSemVer) /p:PackageOutputPath=$(build.sourcesdirectory)\build\nuget $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap-msbuild-only.slnf
+
+    displayName: Build Validation Binaries
 
   - powershell: |
-        cd $(build.sourcesdirectory)/src/Uno.Wasm.Node.Sample.Runner
-        .\Validate.ps1
+      cd $(build.sourcesdirectory)/src/Uno.Wasm.Node.Sample.Runner
+      .\Validate.ps1
 
   - task: VisualStudioTestPlatformInstaller@1
 

build/ci/dotnet-install.yml

@@ -0,0 +1,10 @@
+parameters:
+  DotNetVersion: '6.0.100-rc.1.21458.32'
+
+steps:
+
+  - task: UseDotNet@2
+    displayName: 'Use .NET 6 SDK'
+    inputs:
+      version: ${{ parameters.DotNetVersion }}
+      includePreviewVersions: true

src/Uno.Wasm.Bootstrap.Cli/DebuggingProxy/DebugHostExtensions.cs

@@ -11,8 +11,15 @@ using System;
 using System.Net;
 using System.Web;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 
+#if NET6_0_OR_GREATER
+using _RequestDelegate = Microsoft.AspNetCore.Http.RequestDelegate;
+#else
+using _RequestDelegate = System.Func<System.Threading.Tasks.Task>;
+#endif
+
 namespace Uno.Wasm.Bootstrap.Cli.DebuggingProxy
 {
 	internal static class DebuggerHostExtensions
@@ -24,7 +31,7 @@ namespace Uno.Wasm.Bootstrap.Cli.DebuggingProxy
 		public static void UseWebAssemblyDebugging(this IApplicationBuilder app, IConfiguration configuration)
 			=> app.Map("/_framework/debug", app =>
 			{
-				app.Use(async (context, next) =>
+				app.Use(async (HttpContext context, _RequestDelegate next) =>
 				{
 					var queryParams = HttpUtility.ParseQueryString(context.Request.QueryString.Value!);
 					var browserParam = queryParams.Get("browser");

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

@@ -3,11 +3,24 @@
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<StartupObject>Uno.Wasm.Bootstrap.Cli.Program</StartupObject>
-		<TargetFramework>net5</TargetFramework>
 		<AssemblyName>dotnet-unowasm</AssemblyName>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(DISABLE_CLIHOST_NET6)'!='true'">
+		<TargetFrameworks>net5;net6</TargetFrameworks>
+	</PropertyGroup>
+	
+	<PropertyGroup Condition="'$(DISABLE_CLIHOST_NET6)'=='true'">
+
+		<!--
+		Ensure that we're using TargetFramework, not TargetFrameworks
+		so publish can work without specifying a TargetFramework from the CLI
+		when building tests in CI
+		-->
+		<TargetFramework>net5</TargetFramework>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CodeAnalysis" Version="3.9.0" />
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
@@ -16,4 +29,6 @@
 		<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
 		<PackageReference Include="microsoft.aspnetcore.spaservices.extensions" Version="2.2.0" />
 	</ItemGroup>
+
+	<Target Name="GetTargetPath" />
 </Project>

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

@@ -31,6 +31,10 @@
 			<PackagePath>tools\server\net5</PackagePath>
 			<Pack>true</Pack>
 		</Content>
+		<Content Include="..\Uno.Wasm.Bootstrap.Cli\bin\$(Configuration)\net6\*.*" Link="tools\server\net5\%(FileName)%(Extension)">
+			<PackagePath>tools\server\net6</PackagePath>
+			<Pack>true</Pack>
+		</Content>
 	</ItemGroup>
 
 </Project>

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

@@ -9,6 +9,7 @@
 
 	<_UnoDevServerBasePath Condition="'$(TargetFramework)'=='netstandard2.0'">netcoreapp3.1</_UnoDevServerBasePath>
 	<_UnoDevServerBasePath Condition="'$(TargetFramework.substring(0,3))'=='net' and '$(TargetFramework)'!='netstandard2.0'">net5</_UnoDevServerBasePath>
+	<_UnoDevServerBasePath Condition="'$([MSBuild]::GetTargetFrameworkVersion($(TargetFramework)))' &gt; 5">net6</_UnoDevServerBasePath>
 
 	<!-- Uno.Wasm.Bootstrap internal args -->
 	<_unoBinArgs Condition="exists('$(MSBuildThisFileDirectory)../../Uno.Wasm.Bootstrap.Cli')">exec &quot;$(MSBuildThisFileDirectory)../../Uno.Wasm.Bootstrap.Cli/bin/$(Configuration)/$(_UnoDevServerBasePath)/dotnet-unowasm.dll&quot; serve $(_unoRunArgs)</_unoBinArgs>

src/Uno.Wasm.Bootstrap.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28516.95
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31710.8
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Wasm.Bootstrap", "Uno.Wasm.Bootstrap\Uno.Wasm.Bootstrap.csproj", "{A3899B5E-FDE5-4F5B-B960-6B2BE73685B1}"
 EndProject
@@ -84,9 +84,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Wasm.Packager", "Uno.Wa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Wasm.Tuner", "Uno.Wasm.Tuner\Uno.Wasm.Tuner.csproj", "{13C116EE-6907-45D4-9CB2-F1E905C71387}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Uno.Wasm.Sample", "Uno.Wasm.Sample\Uno.Wasm.Sample.shproj", "{ADEFF1C4-A1B5-4FE8-9EB0-A1D81B65B995}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Uno.Wasm.SampleNet6", "Uno.Wasm.SampleNet6\Uno.Wasm.SampleNet6.csproj", "{2477F160-939B-4B9F-B9CD-9100FCD24E34}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Uno.Wasm.Tests.Shared\Uno.Wasm.Tests.Shared.projitems*{237820d2-9ebd-4e55-b5c3-9b50e628b8d3}*SharedItemsImports = 13
+		Uno.Wasm.Sample\Uno.Wasm.Sample.projitems*{2477f160-939b-4b9f-b9cd-9100fcd24e34}*SharedItemsImports = 5
 		Uno.Wasm.AotTests.Shared\Uno.Wasm.AotTests.Shared.projitems*{286b5778-da8b-4965-9fc6-bc6f4258e155}*SharedItemsImports = 13
 		Uno.Wasm.AotTests.Shared\Uno.Wasm.AotTests.Shared.projitems*{7ee991bb-c93d-4720-854c-1e708b652ef1}*SharedItemsImports = 5
 		Uno.Wasm.Tests.Shared\Uno.Wasm.Tests.Shared.projitems*{7ee991bb-c93d-4720-854c-1e708b652ef1}*SharedItemsImports = 5
@@ -96,8 +101,10 @@ Global
 		Uno.Wasm.Tests.Shared\Uno.Wasm.Tests.Shared.projitems*{9fff339e-bd09-4d1c-a756-92ae3625eafd}*SharedItemsImports = 5
 		Uno.Wasm.Tests.Shared\Uno.Wasm.Tests.Shared.projitems*{a73bc29e-c720-44c8-a406-2a82d6079921}*SharedItemsImports = 5
 		Uno.Wasm.Threads.Shared\Uno.Wasm.Threads.Shared.projitems*{a73bc29e-c720-44c8-a406-2a82d6079921}*SharedItemsImports = 5
+		Uno.Wasm.Sample\Uno.Wasm.Sample.projitems*{adeff1c4-a1b5-4fe8-9eb0-a1d81b65b995}*SharedItemsImports = 13
 		Uno.Wasm.Tests.Shared\Uno.Wasm.Tests.Shared.projitems*{b474457d-dbcd-4795-a2ab-ec3f09e53198}*SharedItemsImports = 13
 		Uno.Wasm.StaticLinking.Shared\Uno.Wasm.StaticLinking.Shared.projitems*{b5571c08-f903-4f17-8346-36265f775b5f}*SharedItemsImports = 13
+		Uno.Wasm.Sample\Uno.Wasm.Sample.projitems*{b79f67e0-ac18-4b93-a3dd-f1bfe6f418e9}*SharedItemsImports = 5
 		Uno.Wasm.StaticLinking.Shared\Uno.Wasm.StaticLinking.Shared.projitems*{da82ef90-d444-414a-9dce-4db27ff72daa}*SharedItemsImports = 5
 		Uno.Wasm.Tests.Shared\Uno.Wasm.Tests.Shared.projitems*{da82ef90-d444-414a-9dce-4db27ff72daa}*SharedItemsImports = 5
 		Uno.Wasm.StaticLinking.Shared\Uno.Wasm.StaticLinking.Shared.projitems*{ebcb3142-593e-4815-915d-3b88b75161c1}*SharedItemsImports = 5
@@ -224,6 +231,10 @@ Global
 		{13C116EE-6907-45D4-9CB2-F1E905C71387}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{13C116EE-6907-45D4-9CB2-F1E905C71387}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{13C116EE-6907-45D4-9CB2-F1E905C71387}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2477F160-939B-4B9F-B9CD-9100FCD24E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2477F160-939B-4B9F-B9CD-9100FCD24E34}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2477F160-939B-4B9F-B9CD-9100FCD24E34}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2477F160-939B-4B9F-B9CD-9100FCD24E34}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -258,6 +269,8 @@ Global
 		{00F3A4D2-5534-44AF-B655-6209355E32A9} = {35E84E5F-1C9B-4168-8333-216B456C12DF}
 		{B27FC2DE-70CA-4287-9FC1-D108F115D8AA} = {35E84E5F-1C9B-4168-8333-216B456C12DF}
 		{B474457D-DBCD-4795-A2AB-EC3F09E53198} = {B27FC2DE-70CA-4287-9FC1-D108F115D8AA}
+		{ADEFF1C4-A1B5-4FE8-9EB0-A1D81B65B995} = {00F3A4D2-5534-44AF-B655-6209355E32A9}
+		{2477F160-939B-4B9F-B9CD-9100FCD24E34} = {00F3A4D2-5534-44AF-B655-6209355E32A9}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {FA350FE9-9316-4846-8145-356F9A0ACBC7}

src/Uno.Wasm.Sample/AdditionalContent/SomeContent01.txt

@@ -0,0 +1 @@
+Hello Uno !

src/Uno.Wasm.Sample/AdditionalContent/SomeContent02.txt

@@ -0,0 +1 @@
+Hello Uno !

src/Uno.Wasm.Sample/AdditionalContent/SomeContent03.txt

@@ -0,0 +1 @@
+This file should be copied to the ROOT dist folder.

src/Uno.Wasm.Sample/AdditionalContent/SomeContent04.txt

@@ -0,0 +1 @@
+This file should NOT be copied to dist folder

src/Uno.Wasm.Sample/Uno.Wasm.Sample.projitems

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>adeff1c4-a1b5-4fe8-9eb0-a1d81b65b995</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>Uno.Wasm.Sample</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)WasmCSS\test.css" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)WasmScripts\AppManifest.js" />
+    <EmbeddedResource Include="$(MSBuildThisFileDirectory)WasmScripts\test.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)Content\LockScreenLogo.scale-200.png" />
+    <None Include="$(MSBuildThisFileDirectory)sample.common.props" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="$(MSBuildThisFileDirectory)libman.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+    <Content Include="$(MSBuildThisFileDirectory)manifest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Program.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Runtime.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <!-- Add linked content first to validate directory creation from links -->
+    <Content Include="..\.editorconfig" Link="AdditionalContent\%(FileName)%(Extension)" />
+    <Content Include="../nuget.config" Link="AdditionalContent\%(FileName)%(Extension)" />
+    <Content Include="AdditionalContent\SomeContent01.txt">
+      <UnoDeploy>Package</UnoDeploy>
+    </Content>
+    <Content Include="AdditionalContent/SomeContent02.txt" />
+    <Content Include="AdditionalContent/SomeContent03.txt" UnoDeploy="Root" />
+    <Content Include="AdditionalContent/SomeContent04.txt" UnoDeploy="None" />
+  </ItemGroup>
+</Project>

src/Uno.Wasm.Sample/Uno.Wasm.Sample.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>adeff1c4-a1b5-4fe8-9eb0-a1d81b65b995</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="Uno.Wasm.Sample.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

src/Uno.Wasm.Sample/sample.common.props

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project>
+  <Import Project="..\Uno.Wasm.Bootstrap\build\Uno.Wasm.Bootstrap.targets" />
+  <Import Project="..\Uno.Wasm.Bootstrap.DevServer\build\Uno.Wasm.Bootstrap.DevServer.targets" />
+
+  <ItemGroup>
+	<None Include="WasmScripts\**\*.js" />
+	<None Include="WasmCSS\**\*.css" />
+  </ItemGroup>
+
+  <ItemGroup>
+	<EmbeddedResource Include="WasmScripts\**\*.js" />
+	<EmbeddedResource Include="WasmCSS\**\*.css" />
+  </ItemGroup>
+
+  <ItemGroup>
+	<WasmShellMonoEnvironment Include="MONO_GC_PARAMS" Value="soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep" />
+	<WasmShellMonoEnvironment Include="MONO_LOG_LEVEL" Value="debug" />
+	<WasmShellMonoEnvironment Include="MONO_LOG_MASK" Value="gc" />
+  </ItemGroup>
+
+  <Target Name="AfterBuildValidation" AfterTargets="Build">
+	<ItemGroup>
+	  <_AdditionalFile1 Include="SomeContent01.txt" />
+	  <_AdditionalFile1 Include="SomeContent02.txt" />
+	  <_AdditionalFile1 Include=".editorconfig" />
+	  <_AdditionalFile1 Include="nuget.config" />
+	</ItemGroup>
+
+	<Error Condition="!exists('$(WasmShellOutputPackagePath)\AdditionalContent\%(_AdditionalFile1.Identity)')" Text="%(_AdditionalFile1.Identity) does not exist in $(WasmShellOutputPackagePath)" />
+	<Error Condition="exists('$(WasmShellOutputPackagePath)\AdditionalContent\SomeContent04.txt')" Text="AdditionalContent/SomeContent04.tx should not exist in $(WasmShellOutputPackagePath)" />
+
+	<Error Condition="exists('$(WasmShellOutputDistPath)\AdditionalContent\%(_AdditionalFile1.Identity)')" Text="%(_AdditionalFile1.Identity) should not exist in $(WasmShellOutputDistPath)" />
+	<Error Condition="!exists('$(WasmShellOutputDistPath)\AdditionalContent\SomeContent03.txt')" Text="AdditionalContent/SomeContent03.txt does not exist in $(WasmShellOutputDistPath)" />
+	<Error Condition="exists('$(WasmShellOutputDistPath)\AdditionalContent\SomeContent04.txt')" Text="AdditionalContent/SomeContent04.txt should not exist in $(WasmShellOutputDistPath)" />
+	<Message Importance="high" Text="Output dist validated" />
+  </Target>
+
+  <ItemGroup>
+	<ProjectReference Include="..\Uno.Wasm.Bootstrap.Cli\Uno.Wasm.Bootstrap.Cli.csproj">
+	  <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+	  <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+	  <UndefineProperties>TargetFramework</UndefineProperties>
+	</ProjectReference>
+	<ProjectReference Include="..\Uno.Wasm.Bootstrap\Uno.Wasm.Bootstrap.csproj">
+	  <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+	  <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
+	  <UndefineProperties>TargetFramework</UndefineProperties>
+	</ProjectReference>
+  </ItemGroup>
+
+</Project>

src/Uno.Wasm.SampleNet5/Uno.Wasm.SampleNet5.csproj

@@ -21,68 +21,11 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.1" />
 	</ItemGroup>
 
-	<Import Project="..\Uno.Wasm.Bootstrap\build\Uno.Wasm.Bootstrap.targets" />
-	<Import Project="..\Uno.Wasm.Bootstrap.DevServer\build\Uno.Wasm.Bootstrap.DevServer.targets" />
+	<Import Project="..\Uno.Wasm.Sample\Uno.Wasm.Sample.projitems" Label="Shared" />
 
-	<ItemGroup>
-		<None Include="WasmScripts\**\*.js" />
-		<None Include="WasmCSS\**\*.css" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<EmbeddedResource Include="WasmScripts\**\*.js" />
-		<EmbeddedResource Include="WasmCSS\**\*.css" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<!-- Add linked content first to validate directory creation from links -->
-		<Content Include="..\.editorconfig" Link="AdditionalContent\%(FileName)%(Extension)" />
-		<Content Include="../nuget.config" Link="AdditionalContent\%(FileName)%(Extension)" />
-		<Content Include="AdditionalContent\SomeContent01.txt">
-			<UnoDeploy>Package</UnoDeploy>
-		</Content>
-		<Content Include="AdditionalContent/SomeContent02.txt" />
-		<Content Include="AdditionalContent/SomeContent03.txt" UnoDeploy="Root" />
-		<Content Include="AdditionalContent/SomeContent04.txt" UnoDeploy="None" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<WasmShellMonoEnvironment Include="MONO_GC_PARAMS" Value="soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep" />
-		<WasmShellMonoEnvironment Include="MONO_LOG_LEVEL" Value="debug" />
-		<WasmShellMonoEnvironment Include="MONO_LOG_MASK" Value="gc" />
-	</ItemGroup>
-
-	<Target Name="AfterBuildValidation" AfterTargets="Build">
-		<ItemGroup>
-			<_AdditionalFile1 Include="SomeContent01.txt" />
-			<_AdditionalFile1 Include="SomeContent02.txt" />
-			<_AdditionalFile1 Include=".editorconfig" />
-			<_AdditionalFile1 Include="nuget.config" />
-		</ItemGroup>
-
-		<Error Condition="!exists('$(WasmShellOutputPackagePath)\AdditionalContent\%(_AdditionalFile1.Identity)')" Text="%(_AdditionalFile1.Identity) does not exist in $(WasmShellOutputPackagePath)" />
-		<Error Condition="exists('$(WasmShellOutputPackagePath)\AdditionalContent\SomeContent04.txt')" Text="AdditionalContent/SomeContent04.tx should not exist in $(WasmShellOutputPackagePath)" />
-
-		<Error Condition="exists('$(WasmShellOutputDistPath)\AdditionalContent\%(_AdditionalFile1.Identity)')" Text="%(_AdditionalFile1.Identity) should not exist in $(WasmShellOutputDistPath)" />
-		<Error Condition="!exists('$(WasmShellOutputDistPath)\AdditionalContent\SomeContent03.txt')" Text="AdditionalContent/SomeContent03.txt does not exist in $(WasmShellOutputDistPath)" />
-		<Error Condition="exists('$(WasmShellOutputDistPath)\AdditionalContent\SomeContent04.txt')" Text="AdditionalContent/SomeContent04.txt should not exist in $(WasmShellOutputDistPath)" />
-		<Message Importance="high" Text="Output dist validated" />
-	</Target>
+	<Import Project="..\Uno.Wasm.Sample\sample.common.props" />
 
 	<ItemGroup>
 		<LinkerDescriptor Include="LinkerConfig.xml" />
 	</ItemGroup>
-
-	<ItemGroup>
-		<ProjectReference Include="..\Uno.Wasm.Bootstrap.Cli\Uno.Wasm.Bootstrap.Cli.csproj">
-			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-			<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-			<UndefineProperties>TargetFramework</UndefineProperties>
-		</ProjectReference>
-		<ProjectReference Include="..\Uno.Wasm.Bootstrap\Uno.Wasm.Bootstrap.csproj">
-			<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-			<SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-			<UndefineProperties>TargetFramework</UndefineProperties>
-		</ProjectReference>
-	</ItemGroup>
 </Project>

src/Uno.Wasm.SampleNet6/LinkerConfig.xml

@@ -0,0 +1,4 @@
+<linker>
+	<assembly fullname="Uno.Wasm.SampleNet5"/>
+	<assembly fullname="System.Private.CoreLib"/>
+</linker>

src/Uno.Wasm.SampleNet6/Uno.Wasm.SampleNet6.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<OutputType>Exe</OutputType>
+		<IsPackable>false</IsPackable>
+		<StartupObject>Uno.Wasm.Sample.Program</StartupObject>
+		<WasmShellWebAppBasePath>/</WasmShellWebAppBasePath>
+		<!--<WasmShellMonoRuntimeExecutionMode>InterpreterAndAOT</WasmShellMonoRuntimeExecutionMode>-->
+		<!--<WasmShellEnableEmccProfiling>true</WasmShellEnableEmccProfiling>-->
+		<!--<WasmPWAManifestFile>manifest.json</WasmPWAManifestFile>-->
+		<!--<WasmShellGenerateAOTProfile>true</WasmShellGenerateAOTProfile>-->
+		<MonoRuntimeDebuggerEnabled Condition="'$(Configuration)'=='Debug'">true</MonoRuntimeDebuggerEnabled>
+		<!--<WasmShellILLinkerEnabled>false</WasmShellILLinkerEnabled>-->
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Identity.Client" Version="4.14.0" />
+		<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+		<PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.1" />
+	</ItemGroup>
+
+	<Import Project="..\Uno.Wasm.Sample\Uno.Wasm.Sample.projitems" Label="Shared" />
+
+	<Import Project="..\Uno.Wasm.Sample\sample.common.props" />
+
+	<ItemGroup>
+		<LinkerDescriptor Include="LinkerConfig.xml" />
+	</ItemGroup>
+</Project>