Merge pull request #316 from FUSEEProjectTeam/feature/clean_wasm_on_d…

…evelop

WebAssembly build via Blazor/Razor backend, updated solution to net6.0, netstandard2.1 dual target

.github/workflows/ci.yml

@@ -13,13 +13,17 @@ on:
 
 jobs:
   lint:
-    runs-on: windows-latest
+    runs-on: windows-2022
     name: Linting
     env:
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       DOTNET_NOLOGO: true
     steps:
     - uses: actions/checkout@v2
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: dotnet tool restore
       run: dotnet tool restore
     - name: dotnet format folder
@@ -44,11 +48,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ 'windows-latest', 'ubuntu-latest', 'macos-latest' ]
+        os: [ 'windows-2022', 'ubuntu-latest', 'macos-latest' ]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
       uses: actions/checkout@v2
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: AssetStorage
       run: dotnet test -c Release src/Tests/AssetStorage/Desktop/Fusee.Tests.AssetStorage.Desktop.csproj
     - name: Math
@@ -73,11 +81,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ 'windows-latest', 'ubuntu-latest', 'macos-latest' ]
+        os: [ 'windows-2022', 'ubuntu-latest', 'macos-latest' ]
     runs-on: ${{ matrix.os }}
     steps:
     - name: Checkout
       uses: actions/checkout@v2
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Build Release-Desktop
       run: dotnet build -c Release-Desktop Fusee.sln
     - name: Upload Player-Artifact
@@ -96,16 +108,56 @@ jobs:
         name: fusee-desktop-${{ matrix.os }}-examples
         path: bin/Release/Examples/**/Desktop/
 
+  buildblazor:
+    needs: [tests]
+    name: Build Blazor
+    env:
+      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+      DOTNET_NOLOGO: true
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ 'windows-2022', 'ubuntu-latest', 'macos-latest' ]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+    - name: Setup dotnet macos workload
+      run: dotnet workload install macos
+    - name: Build Release-Blazor
+      run: dotnet build -c Release-Blazor Fusee.sln
+    - name: Install wasm-tools workload
+      run: dotnet workload install wasm-tools
+    - name: Publish F.E.Player.Blazor
+      run: dotnet publish -c Release -p:PublishProfile=FolderProfileRelease src/Engine/Player/Blazor/Fusee.Engine.Player.Blazor.csproj
+    - name: Upload Player-Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: fusee-blazor-${{ matrix.os }}-player
+        path: bin/Release/Player/Blazor/net6.0/publish/
+
   buildandroid:
     name: Build Android
     needs: [tests]
     env:
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       DOTNET_NOLOGO: true
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
     - name: Checkout
       uses: actions/checkout@v2
+    - name: Add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1.1
+      with:
+        vs-version: '[17.0,]'  
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1
     - name: Build with MSBuild
@@ -117,14 +169,18 @@ jobs:
     env:
       DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
       DOTNET_NOLOGO: true
-    runs-on: windows-latest
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
         language: [ 'csharp', 'python' ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
+      - name: Setup .NET 6.0
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 6.0.x
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1
         with:

BuildNuget.cmd

@@ -34,7 +34,7 @@ dotnet pack dis\DnTemplate\DnTemplate.csproj -c Release -o bin\Release\nuget
 msbuild dis\VSTemplate\VSTemplate.sln -t:restore,build -p:Configuration=Release
 copy /Y dis\VSTemplate\VSTemplate\bin\Release\ProjectTemplates\CSharp\1033\Fusee.Template.VS.zip bin\Release\nuget\ >nul
 copy /Y dis\VSTemplate\VSIX\bin\Release\Fusee.Template.VS.vsix bin\Release\nuget\ >nul
-tar -c -a -f bin\Release\nuget\io_export_fus.zip -C bin\Release\Tools\CmdLine\netcoreapp3.1\BlenderScripts\addons *
+tar -c -a -f bin\Release\nuget\io_export_fus.zip -C bin\Release\Tools\CmdLine\net6.0\BlenderScripts\addons *
 goto END
 
 :ERRORDOTNET

Examples/Complete/AdvancedUI/Android/Fusee.Examples.AdvancedUI.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <RootNamespace>Fusee.Examples.AdvancedUI.Android</RootNamespace>

Examples/Complete/AdvancedUI/Core/AdvancedUI.cs

@@ -121,6 +121,7 @@ public override void Init()
 
             _gui = CreateGui();
 
+
             // Create the interaction handler
             _sih = new SceneInteractionHandler(_gui);
 
@@ -357,7 +358,7 @@ private SceneContainer CreateGui()
             btnFuseeLogo.OnMouseDown += BtnLogoDown;
 
             Texture guiFuseeLogo = new(AssetStorage.Get<ImageData>("FuseeText.png"));
-            TextureNode fuseeLogo = new(
+            TextureNode fuseeLogo = TextureNode.Create(
                 "fuseeLogo",
                 guiFuseeLogo,
                 GuiElementPosition.GetAnchors(AnchorPos.TopTopLeft),

Examples/Complete/AdvancedUI/Core/Fusee.Examples.AdvancedUI.Core.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
     <OutputPath>$(BaseOutputPath)\Examples\AdvancedUI\Core\</OutputPath>
   </PropertyGroup>
 

Examples/Complete/AdvancedUI/Core/UserInterfaceHelper.cs

@@ -119,7 +119,7 @@ internal static void CreateAndAddCircleAnnotationAndLine(SceneNode parentUiEleme
 
         private static SceneNode CreateAnnotation(float2 pos, float borderScaleFactor, string text, Texture iconTex, Texture frameTex)
         {
-            TextureNode icon = new(
+            TextureNode icon = TextureNode.Create(
                 "icon",
                 iconTex,
                 new MinMaxRect
@@ -131,7 +131,7 @@ private static SceneNode CreateAnnotation(float2 pos, float borderScaleFactor, s
                 float2.One
             );
 
-            TextNode annotationText = new(
+            TextNode annotationText = TextNode.Create(
                 text,
                 "annotation text",
                 new MinMaxRect
@@ -145,7 +145,7 @@ private static SceneNode CreateAnnotation(float2 pos, float borderScaleFactor, s
                 HorizontalTextAlignment.Center,
                 VerticalTextAlignment.Center);
 
-            TextureNode annotation = new(
+            TextureNode annotation = TextureNode.Create(
                 "Annotation",
                 frameTex,
                 new MinMaxRect

Examples/Complete/AdvancedUI/Desktop/Fusee.Examples.AdvancedUI.Desktop.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+
     <OutputType>Exe</OutputType>
     <OutputPath>$(BaseOutputPath)\Examples\AdvancedUI\Desktop\</OutputPath>
   </PropertyGroup>

Examples/Complete/AdvancedUI/Desktop/Main.cs

@@ -7,6 +7,7 @@
 using Fusee.Serialization;
 using System.IO;
 using System.Reflection;
+using System.Threading.Tasks;
 
 namespace Fusee.Examples.AdvancedUI.Desktop
 {
@@ -17,18 +18,19 @@ public static void Main()
             // Inject Fusee.Engine.Base InjectMe dependencies
             IO.IOImp = new IOImp();
 
-            FileAssetProvider fap = new("Assets");
+            var fap = new Fusee.Base.Imp.Desktop.FileAssetProvider("Assets");
             fap.RegisterTypeHandler(
                 new AssetHandler
                 {
                     ReturnedType = typeof(Font),
+                    DecoderAsync = async (string id, object storage) =>
+                    {
+                        if (!Path.GetExtension(id).Contains("ttf", System.StringComparison.OrdinalIgnoreCase)) return null;
+                        return await Task.FromResult(new Font { _fontImp = new FontImp((Stream)storage) });
+                    },
                     Decoder = (string id, object storage) =>
                     {
-                        if (!Path.GetExtension(id).Contains("ttf", System.StringComparison.OrdinalIgnoreCase))
-                        {
-                            return null;
-                        }
-
+                        if (!Path.GetExtension(id).Contains("ttf", System.StringComparison.OrdinalIgnoreCase)) return null;
                         return new Font { _fontImp = new FontImp((Stream)storage) };
                     },
                     Checker = id => Path.GetExtension(id).Contains("ttf", System.StringComparison.OrdinalIgnoreCase)
@@ -37,12 +39,16 @@ public static void Main()
                 new AssetHandler
                 {
                     ReturnedType = typeof(SceneContainer),
+                    DecoderAsync = async (string id, object storage) =>
+                    {
+                        if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
+                        return await FusSceneConverter.ConvertFromAsync(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
+                    },
                     Decoder = (string id, object storage) =>
                     {
                         if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
                         return FusSceneConverter.ConvertFrom(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
                     },
-
                     Checker = id => Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)
                 });
 

Examples/Complete/BoneAnimation/Android/Fusee.Examples.BoneAnimation.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <RootNamespace>Fusee.Examples.Bone.Android</RootNamespace>

Examples/Complete/BoneAnimation/Core/Fusee.Examples.BoneAnimation.Core.csproj

@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
     <OutputPath>$(BaseOutputPath)\Examples\Bone\Core\</OutputPath>
     <TargetFramework>netstandard2.1</TargetFramework>
     <OutputPath>$(BaseOutputPath)\Examples\BoneAnimation\Core\</OutputPath>

Examples/Complete/BoneAnimation/Desktop/Fusee.Examples.BoneAnimation.Desktop.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <OutputPath>$(BaseOutputPath)\Examples\BoneAnimation\Desktop\</OutputPath>
   </PropertyGroup>

Examples/Complete/BoneAnimation/Desktop/Main.cs

@@ -7,6 +7,7 @@
 using Fusee.Serialization;
 using System.IO;
 using System.Reflection;
+using System.Threading.Tasks;
 
 namespace Fusee.Examples.BoneAnimation.Desktop
 {
@@ -22,6 +23,11 @@ public static void Main()
                 new AssetHandler
                 {
                     ReturnedType = typeof(Font),
+                    DecoderAsync = async (string id, object storage) =>
+                    {
+                        if (!Path.GetExtension(id).Contains("ttf", System.StringComparison.OrdinalIgnoreCase)) return null;
+                        return await Task.FromResult(new Font { _fontImp = new FontImp((Stream)storage) });
+                    },
                     Decoder = (string id, object storage) =>
                     {
                         if (!Path.GetExtension(id).Contains("ttf", System.StringComparison.OrdinalIgnoreCase)) return null;
@@ -33,6 +39,11 @@ public static void Main()
                 new AssetHandler
                 {
                     ReturnedType = typeof(SceneContainer),
+                    DecoderAsync = async (string id, object storage) =>
+                    {
+                        if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;
+                        return await FusSceneConverter.ConvertFromAsync(ProtoBuf.Serializer.Deserialize<FusFile>((Stream)storage), id);
+                    },
                     Decoder = (string id, object storage) =>
                     {
                         if (!Path.GetExtension(id).Contains("fus", System.StringComparison.OrdinalIgnoreCase)) return null;

Examples/Complete/Camera/Android/Fusee.Examples.Camera.Android.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <RootNamespace>Fusee.Examples.Camera.Android</RootNamespace>

Examples/Complete/Camera/Blazor/App.razor

@@ -0,0 +1,10 @@
+<Router AppAssembly="@typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
+    </Found>
+    <NotFound>
+        <LayoutView Layout="@typeof(MainLayout)">
+            <p>Sorry, there's nothing at this address.</p>
+        </LayoutView>
+    </NotFound>
+</Router>

Examples/Complete/Camera/Blazor/Fusee.Examples.Camera.Blazor.csproj

@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
+		<BlazorEnableCompression>false</BlazorEnableCompression>
+        <BlazorCacheBootResources>false</BlazorCacheBootResources>
+        <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+        <Nullable>disable</Nullable>
+        <Platforms>AnyCPU</Platforms>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <OutputPath>$(BaseOutputPath)\Examples\Camera\Blazor\</OutputPath>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.JSInterop.WebAssembly" Version="6.0.0" />
+
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="$(FuseeEngineRoot)\src\Base\Imp\Blazor\Fusee.Base.Imp.Blazor.csproj" />
+        <ProjectReference Include="..\Core\Fusee.Examples.Camera.Core.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ServiceWorker Include="wwwroot\service-worker.js" PublishedContent="wwwroot\service-worker.published.js" />
+    </ItemGroup>
+
+    <Target Name="MovingAssetsToServerRoot" BeforeTargets="PostBuildEvent">
+        <ItemGroup>
+            <AssetsDir Include="$(OutputPath)$(TargetFramework)\Assets\**\*.*" />
+        </ItemGroup>
+        <Message Text="Moving 'Assets' folder to http server root folder" Importance="high" />
+        <Move SourceFiles="@(AssetsDir)" DestinationFolder="$(OutputPath)$(TargetFramework)\wwwroot\Assets\%(RecursiveDir)" />
+        <RemoveDir Directories="$(OutputPath)$(TargetFramework)\Assets" />
+    </Target>
+
+</Project>