Merge pull request #387 from FUSEEProjectTeam/release/0.11.2

Release/0.11.2

.github/workflows/ci.yml

@@ -131,6 +131,18 @@ jobs:
       uses: microsoft/setup-msbuild@v1.1
       with:
         vs-version: '[17.0,]'  
+#    - name: Setup dotnet macos workload
+#      run: dotnet workload install macos
+#    - name: Build Release-Blazor
+#      run: dotnet build -c Release-Blazor Fusee.sln
+#    - name: Setup 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: Build F.T.B.Blazorpatch
+#      run: dotnet build -c Release src/Tools/Build/Blazorpatch/Fusee.Tools.Build.Blazorpatch.csproj
+#    - name: Patch Blazor
+#      run: dotnet bin/Release/Tools/Build/Blazorpatch/net6.0/Fusee.Tools.Build.Blazorpatch.dll -p bin/Release/Player/Blazor/net6.0/publish/wwwroot -t All
     - name: Build F.E.Player.Desktop
       run: dotnet publish -c Release -p:PublishProfile=win-x64-release src\Engine\Player\Desktop\Fusee.Engine.Player.Desktop.csproj
     - name: Pack Fusee.sln NuGet

BuildNuget.cmd

@@ -12,6 +12,9 @@ IF %ERRORLEVEL% EQU 9009 GOTO ERRORMSBUILD
 git >NUL 2>NUL
 IF %ERRORLEVEL% EQU 9009 GOTO ERRORGIT
 
+rem dotnet workload install macos
+rem dotnet workload install wasm-tools
+
 echo This will be cleaning up the repository (git clean -xdf), this will DELETE all untracked files. (Ctrl-C to abort)
 pause
 
@@ -22,6 +25,10 @@ mkdir bin\Release\nuget
 echo Building distribution.
 dotnet publish -c Release -p:PublishProfile=win-x64-release src\Engine\Player\Desktop\Fusee.Engine.Player.Desktop.csproj
 
+rem dotnet publish -c Release -p:PublishProfile=FolderProfileRelease src/Engine/Player/Blazor/Fusee.Engine.Player.Blazor.csproj
+rem dotnet build -c Release src/Tools/Build/Blazorpatch/Fusee.Tools.Build.Blazorpatch.csproj
+rem dotnet bin/Release/Tools/Build/Blazorpatch/net6.0/Fusee.Tools.Build.Blazorpatch.dll -p bin/Release/Player/Blazor/net6.0/publish/wwwroot -t All
+
 dotnet pack Fusee.sln -c Release-NuGet
 msbuild src\Base\Imp\Android\Fusee.Base.Imp.Android.csproj -t:restore,pack -p:Configuration=Release
 msbuild src\Engine\Imp\Graphics\Android\Fusee.Engine.Imp.Graphics.Android.csproj -t:restore,pack -p:Configuration=Release

Directory.Build.props

@@ -9,10 +9,10 @@
 		<Authors>FuseeProjectTeam</Authors>
 		<Company>Furtwangen University</Company>
 		<Product>FUSEE</Product>
-		<Version>0.11.1</Version>
-		<AssemblyVersion>0.11.1</AssemblyVersion>
-		<FileVersion>0.11.1</FileVersion>
-		<PackageVersion>0.11.1</PackageVersion>
+		<Version>0.11.2</Version>
+		<AssemblyVersion>0.11.2</AssemblyVersion>
+		<FileVersion>0.11.2</FileVersion>
+		<PackageVersion>0.11.2</PackageVersion>
 		<Copyright>Copyright 2013-2021</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageProjectUrl>https://fusee3d.org/</PackageProjectUrl>

dis/DnTemplate/template/Fusee_App.csproj

@@ -9,6 +9,6 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Fusee.Desktop" Version="0.11.1" />
+    <PackageReference Include="Fusee.Desktop" Version="0.11.2" />
   </ItemGroup>
 </Project>

dis/VSTemplate/VSIX/Properties/AssemblyInfo.cs

@@ -29,5 +29,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.11.1")]
-[assembly: AssemblyFileVersion("0.11.1")]
+[assembly: AssemblyVersion("0.11.2")]
+[assembly: AssemblyFileVersion("0.11.2")]

dis/VSTemplate/VSIX/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="-1" Version="0.11.1" Language="en-US" Publisher="FUSEEProjectTeam" />
+        <Identity Id="-1" Version="0.11.2" Language="en-US" Publisher="FUSEEProjectTeam" />
         <DisplayName>Fusee.Template.VS</DisplayName>
         <Description xml:space="preserve">Fusee Project Template</Description>
         <Tags>template</Tags>

dis/VSTemplate/VSTemplate/Android/Android.csproj

@@ -58,7 +58,7 @@
   </ItemGroup>
   <!-- Fusee References -->
   <ItemGroup>
-	  <PackageReference Include="Fusee.Android" Version="0.11.1" />
+	  <PackageReference Include="Fusee.Android" Version="0.11.2" />
 	  <ProjectReference Include="..\Core\Core.csproj" />
   </ItemGroup>
   <!-- Assets -->

dis/VSTemplate/VSTemplate/Core/Core.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fusee.Core" Version="0.11.1" />
+    <PackageReference Include="Fusee.Core" Version="0.11.2" />
   </ItemGroup>
 
 </Project>

dis/VSTemplate/VSTemplate/Desktop/Desktop.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fusee.Desktop" Version="0.11.1" />
+    <PackageReference Include="Fusee.Desktop" Version="0.11.2" />
   </ItemGroup>
 
   <ItemGroup>

dis/VSTemplate/VSTemplate/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.11.1")]
-[assembly: AssemblyFileVersion("0.11.1")]
+[assembly: AssemblyVersion("0.11.2")]
+[assembly: AssemblyFileVersion("0.11.2")]

dis/fusee-wasm-aot-precompiled/wwwroot/_framework/blazor.boot.json

@@ -7,21 +7,21 @@
   "linkerEnabled": true,
   "resources": {
     "assembly": {
-      "Fusee.Base.Common.dll": "sha256-NWZdb3k5hHtzjZijqCcO53dGbniczKvrpE+QWhYg3T8=",
-      "Fusee.Base.Core.dll": "sha256-3xE7btG2dGP1k2LGO7Z3Lp5s+Jro53cDQIo11kd6BPk=",
-      "Fusee.Base.Imp.Blazor.dll": "sha256-aJeBcF85agzkZsDOs99b1AN8u4jIplyMmKd3VGRgU6M=",
-      "Fusee.Engine.Common.dll": "sha256-NhkEaCEU8nLXSAlRf9aaATO3qQviGYCwPdXjakTnEA8=",
-      "Fusee.Engine.Core.dll": "sha256-ZuSZXdOgQMNZi6S\/6xiDIySGf0HzXV\/pxon+coaHSVc=",
-      "Fusee.Engine.Gui.dll": "sha256-XraeDN\/1kI3th56ilIUVG0EhoxngCWbWJ7eTOzdo4Ig=",
-      "Fusee.Engine.Imp.Graphics.Blazor.dll": "sha256-LJvFbRGrXKwzT7DC+nF3qmwzP\/qVLoi2fZ7AY8rEcfM=",
-      "Fusee.Engine.Player.Blazor.dll": "sha256-e4RdqknVC\/9IekvYJLSeYjPCbfx7hRO+e0QjEF3Iivc=",
-      "Fusee.Engine.Player.Core.dll": "sha256-R7Wo+zGVWQ6VAlaewfO0q5oEOPbfyxX0739uK0wV98U=",
-      "Fusee.Jometri.dll": "sha256-wMjOo4CnLgZHhe\/QYze7+vGXVRubHbWNfqtFKiMyrVw=",
-      "Fusee.Math.Core.dll": "sha256-zZi4fn\/hH03QxW6uq95OjnjQnyqa7HcwlKMQEISbxp0=",
-      "Fusee.Serialization.dll": "sha256-IN16lHQXGQy2ZH8iuurDNVBZiu\/47PsMH5xtY5jK4dU=",
-      "Fusee.Structures.dll": "sha256-zy0\/nbIo2daCzuIQPtbbT9R0dVos1yJvc6Bs3eJKxgQ=",
-      "Fusee.Xene.dll": "sha256-BRduFKN8JUfdMxmorUebPWwCOlggC14sjfG\/jFBYc48=",
-      "Fusee.Xirkit.dll": "sha256-JvZ\/v8I9KABoLchySWeEIOi3UHPWVRhulM1r++hW81s=",
+      "Fusee.Base.Common.dll": "sha256-bAZRgv7eJXxNW96m3bL230PoGuuFEJRb\/uldgyurQ2A=",
+      "Fusee.Base.Core.dll": "sha256-bbcWTzwLptVgmF2uAMKN+3HEY5wahQIvlZc8cwalQaE=",
+      "Fusee.Base.Imp.Blazor.dll": "sha256-Q4nYooHZKeoWRob2PPZpvzBs8ATV\/b37\/g7fYq1n7XE=",
+      "Fusee.Engine.Common.dll": "sha256-Rjm57mXXOnE7EKcMXUww0TSx0Ozp4K38VYPkb5HMxJU=",
+      "Fusee.Engine.Core.dll": "sha256-5YtFlgUX2ey\/rOc7TweD6oNsM1GR8KQNIUJLFHfT6lA=",
+      "Fusee.Engine.Gui.dll": "sha256-d1Q8NaPpIuEx\/MAjzRPR4y1XhxiqMX8h3ojS81Crxtk=",
+      "Fusee.Engine.Imp.Graphics.Blazor.dll": "sha256-8E9Y4iHk40VnTBK4wh+1L8uJ+EyHl9B\/v9EP1exY93g=",
+      "Fusee.Engine.Player.Blazor.dll": "sha256-X\/JK9YUfVnHtQKsTaya16YhLts4W44jZJ7qT0BtxYoI=",
+      "Fusee.Engine.Player.Core.dll": "sha256-2mGFLLqbGDW8QYfOEIC87PFIHnCZtZSGDYgUCMt0cN4=",
+      "Fusee.Jometri.dll": "sha256-W2qttSRfKl64xymU16TpfDTqtjOO7xsgN2bjtPlh1fI=",
+      "Fusee.Math.Core.dll": "sha256-1kjBJCbvLe3uIbEEUqWmy+kgkeTWCE5pCSoC1xYbbR4=",
+      "Fusee.Serialization.dll": "sha256-+Kzt2i7NW4lamPTR6RtrH3AT6H5TRFv1zi9YGWxbj\/0=",
+      "Fusee.Structures.dll": "sha256-WsFCZlBDYY6+Ybx76uCynQKZOO+dyH9AlG+3F5ASEUM=",
+      "Fusee.Xene.dll": "sha256-ssfA3aYZ22ybujPFdYXkQSlHX2pHcNNgs4fcJPLk4RE=",
+      "Fusee.Xirkit.dll": "sha256-Ro1IUFwubdYowAXh5RF2EwrOAq2JKlMsa0fDu2T4SLI=",
       "Microsoft.AspNetCore.Components.dll": "sha256-9CPuYjVIICkfZDHcwDKJjJNh2do7qY74nbFIr38vCv8=",
       "Microsoft.AspNetCore.Components.Web.dll": "sha256-dGE6E8lp4OgSRD8HxpnhQtwrKe1jYbi6HN9vQz2evQ0=",
       "Microsoft.AspNetCore.Components.WebAssembly.dll": "sha256-Ph2ZOl\/LOY2cCUG\/S2iA61YUWIsDlcAHFxzdTG43rPw=",
@@ -92,7 +92,7 @@
     "runtime": {
       "dotnet.6.0.0.zdfjpxgr7a.js": "sha256-CZ3h71Xv+WHVVXG8eYconcYQOElnEgldOEXe6jQk+C4=",
       "dotnet.timezones.blat": "sha256-MSlKZuLHfzsKLVF\/3omAUcZ57QL0puRif12PGTAXwDY=",
-      "dotnet.wasm": "sha256-xL5JeH6zmLp6uEldA+P+VCdigSDMSVUzJua\/MxKrJDY=",
+      "dotnet.wasm": "sha256-45NAIcFz27nVC1ST7diEwS9gO9673iTBZsB9L0FumjI=",
       "icudt_CJK.dat": "sha256-WPyI4hWDPnOw62Nr27FkzGjdbucZnQD+Ph+GOPhAedw=",
       "icudt_EFIGS.dat": "sha256-4RwaPx87Z4dvn77ie\/ro3\/QzyS+\/gGmO3Y\/0CSAXw4k=",
       "icudt_no_CJK.dat": "sha256-OxylFgLJlFqixsj+nLxYVsv5iZLvfIKMpLf9hrWaChA=",

dis/fusee-wasm-aot-precompiled/wwwroot/index.html

@@ -4,7 +4,6 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <title>Fusee.Engine.Player.Blazor</title>
-    <base href="/" />
     <link href="manifest.json" rel="manifest" />
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>

dis/fusee-wasm-aot-precompiled/wwwroot/service-worker-assets.js

@@ -25,67 +25,67 @@
       "url": "_framework\/icudt.dat"
     },
     {
-      "hash": "sha256-OHjiKK8Y9xlTcKW5JZZLdPQgq97b2h+mtGZS8KpO53c=",
+      "hash": "sha256-keP8HowYqkEDq3AuOhLOZgMZMqoEqX9ZX5cM60aphBg=",
       "url": "_framework\/blazor.boot.json"
     },
     {
-      "hash": "sha256-NWZdb3k5hHtzjZijqCcO53dGbniczKvrpE+QWhYg3T8=",
+      "hash": "sha256-bAZRgv7eJXxNW96m3bL230PoGuuFEJRb\/uldgyurQ2A=",
       "url": "_framework\/Fusee.Base.Common.dll"
     },
     {
-      "hash": "sha256-3xE7btG2dGP1k2LGO7Z3Lp5s+Jro53cDQIo11kd6BPk=",
+      "hash": "sha256-bbcWTzwLptVgmF2uAMKN+3HEY5wahQIvlZc8cwalQaE=",
       "url": "_framework\/Fusee.Base.Core.dll"
     },
     {
-      "hash": "sha256-aJeBcF85agzkZsDOs99b1AN8u4jIplyMmKd3VGRgU6M=",
+      "hash": "sha256-Q4nYooHZKeoWRob2PPZpvzBs8ATV\/b37\/g7fYq1n7XE=",
       "url": "_framework\/Fusee.Base.Imp.Blazor.dll"
     },
     {
-      "hash": "sha256-NhkEaCEU8nLXSAlRf9aaATO3qQviGYCwPdXjakTnEA8=",
+      "hash": "sha256-Rjm57mXXOnE7EKcMXUww0TSx0Ozp4K38VYPkb5HMxJU=",
       "url": "_framework\/Fusee.Engine.Common.dll"
     },
     {
-      "hash": "sha256-ZuSZXdOgQMNZi6S\/6xiDIySGf0HzXV\/pxon+coaHSVc=",
+      "hash": "sha256-5YtFlgUX2ey\/rOc7TweD6oNsM1GR8KQNIUJLFHfT6lA=",
       "url": "_framework\/Fusee.Engine.Core.dll"
     },
     {
-      "hash": "sha256-XraeDN\/1kI3th56ilIUVG0EhoxngCWbWJ7eTOzdo4Ig=",
+      "hash": "sha256-d1Q8NaPpIuEx\/MAjzRPR4y1XhxiqMX8h3ojS81Crxtk=",
       "url": "_framework\/Fusee.Engine.Gui.dll"
     },
     {
-      "hash": "sha256-LJvFbRGrXKwzT7DC+nF3qmwzP\/qVLoi2fZ7AY8rEcfM=",
+      "hash": "sha256-8E9Y4iHk40VnTBK4wh+1L8uJ+EyHl9B\/v9EP1exY93g=",
       "url": "_framework\/Fusee.Engine.Imp.Graphics.Blazor.dll"
     },
     {
-      "hash": "sha256-e4RdqknVC\/9IekvYJLSeYjPCbfx7hRO+e0QjEF3Iivc=",
+      "hash": "sha256-X\/JK9YUfVnHtQKsTaya16YhLts4W44jZJ7qT0BtxYoI=",
       "url": "_framework\/Fusee.Engine.Player.Blazor.dll"
     },
     {
-      "hash": "sha256-R7Wo+zGVWQ6VAlaewfO0q5oEOPbfyxX0739uK0wV98U=",
+      "hash": "sha256-2mGFLLqbGDW8QYfOEIC87PFIHnCZtZSGDYgUCMt0cN4=",
       "url": "_framework\/Fusee.Engine.Player.Core.dll"
     },
     {
-      "hash": "sha256-wMjOo4CnLgZHhe\/QYze7+vGXVRubHbWNfqtFKiMyrVw=",
+      "hash": "sha256-W2qttSRfKl64xymU16TpfDTqtjOO7xsgN2bjtPlh1fI=",
       "url": "_framework\/Fusee.Jometri.dll"
     },
     {
-      "hash": "sha256-zZi4fn\/hH03QxW6uq95OjnjQnyqa7HcwlKMQEISbxp0=",
+      "hash": "sha256-1kjBJCbvLe3uIbEEUqWmy+kgkeTWCE5pCSoC1xYbbR4=",
       "url": "_framework\/Fusee.Math.Core.dll"
     },
     {
-      "hash": "sha256-IN16lHQXGQy2ZH8iuurDNVBZiu\/47PsMH5xtY5jK4dU=",
+      "hash": "sha256-+Kzt2i7NW4lamPTR6RtrH3AT6H5TRFv1zi9YGWxbj\/0=",
       "url": "_framework\/Fusee.Serialization.dll"
     },
     {
-      "hash": "sha256-zy0\/nbIo2daCzuIQPtbbT9R0dVos1yJvc6Bs3eJKxgQ=",
+      "hash": "sha256-WsFCZlBDYY6+Ybx76uCynQKZOO+dyH9AlG+3F5ASEUM=",
       "url": "_framework\/Fusee.Structures.dll"
     },
     {
-      "hash": "sha256-BRduFKN8JUfdMxmorUebPWwCOlggC14sjfG\/jFBYc48=",
+      "hash": "sha256-ssfA3aYZ22ybujPFdYXkQSlHX2pHcNNgs4fcJPLk4RE=",
       "url": "_framework\/Fusee.Xene.dll"
     },
     {
-      "hash": "sha256-JvZ\/v8I9KABoLchySWeEIOi3UHPWVRhulM1r++hW81s=",
+      "hash": "sha256-Ro1IUFwubdYowAXh5RF2EwrOAq2JKlMsa0fDu2T4SLI=",
       "url": "_framework\/Fusee.Xirkit.dll"
     },
     {
@@ -341,7 +341,7 @@
       "url": "_framework\/dotnet.6.0.0.zdfjpxgr7a.js"
     },
     {
-      "hash": "sha256-xL5JeH6zmLp6uEldA+P+VCdigSDMSVUzJua\/MxKrJDY=",
+      "hash": "sha256-45NAIcFz27nVC1ST7diEwS9gO9673iTBZsB9L0FumjI=",
       "url": "_framework\/dotnet.wasm"
     },
     {
@@ -1001,5 +1001,5 @@
       "url": "_content\/Fusee.Engine.Imp.Graphics.Blazor\/Fusee.Engine.Imp.Graphics.Blazor.Native.js"
     }
   ],
-  "version": "euimhOqV"
+  "version": "S4FhYqlw"
 };

dis/fusee-wasm-aot-precompiled/wwwroot/service-worker.js

@@ -46,4 +46,4 @@ async function onFetch(event) {
 
     return cachedResponse || fetch(event.request);
 }
-/* Manifest version: euimhOqV */
+/* Manifest version: S4FhYqlw */

src/Tools/BlenderScripts/addons/io_export_fus/__init__.py

@@ -5,7 +5,7 @@
 bl_info = {
     "name": ".fus format",
     "author": "The FUSEE Project Team",
-    "version": (0, 11, 1),
+    "version": (0, 11, 2),
     "blender": (2, 80, 0),
     "location": "File > Import-Export",
     "description": "Export to the FUSEE .fus format/as a FUSEE Web application",