Merge branch '1.5' into dotnet7

# Conflicts:
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins
#	Source/Platforms/DotNet/NUnit/nunit.engine.api.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.core.dll
#	Source/Platforms/DotNet/NUnit/nunit.engine.dll
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe
#	Source/Platforms/DotNet/NUnit/nunit3-console.exe.config
#	Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll
#	Source/Tools/Flax.Build/Deps/Downloader.cs
#	Source/Tools/Flax.Stats/CodeFrame.cs
#	Source/Tools/Flax.Stats/CodeFrameNode.cs
#	Source/Tools/Flax.Stats/Flax.Stats.Build.cs
#	Source/Tools/Flax.Stats/Languages.cs
#	Source/Tools/Flax.Stats/Program.cs
#	Source/Tools/Flax.Stats/TaskType.cs
#	Source/Tools/Flax.Stats/Tools.cs
#	Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs

.github/workflows/tests.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
 
-  # Tests
+  # Tests on Linux
   tests-linux:
     if: ${{ false }}
     name: Tests (Linux)
@@ -44,3 +44,34 @@ jobs:
       run: |
         ./Development/Scripts/Linux/CallBuildTool.sh -build -log -arch=x64 -platform=Linux -configuration=Development -buildtargets=FlaxTestsTarget -UseLargeWorlds=true
         Binaries/Editor/Linux/Development/FlaxTests
+
+  # Tests on Windows
+  tests-windows:
+    name: Tests (Windows)
+    runs-on: "windows-2022"
+    steps:
+    - name: Checkout repo
+      uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: 7.0.x
+    - name: Print .NET info
+      run: |
+        dotnet --info
+    - name: Checkout LFS
+      run: |
+        git lfs version
+        git lfs pull
+    - name: Build
+      run: |
+        .\GenerateProjectFiles.bat -vs2022
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Development -buildtargets=FlaxTestsTarget
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Debug -buildtargets=FlaxEditor -BuildBindingsOnly
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Debug -buildtargets="FlaxEngine.Tests"
+        .\Development\Scripts\Windows\CallBuildTool.bat -build -log -arch=x64 -platform=Windows -configuration=Debug -buildtargets="Flax.Build.Tests"
+    - name: Test
+      run: |
+        Binaries\Editor\Win64\Development\FlaxTests.exe
+        Source\Platforms\DotNet\NUnit\nunit3-netcore-console.exe Binaries\Tools\FlaxEngine.Tests.dll
+        Source\Platforms\DotNet\NUnit\nunit3-netcore-console.exe Binaries\Tools\Flax.Build.Tests.dll

Development/Scripts/Linux/CallBuildTool.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 set -e
 

Development/Scripts/Mac/CallBuildTool.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved
+# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved
 
 set -e
 

Development/Scripts/Mac/XCodeBuild.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved
+# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved
 
 # Fix mono bin to be in a path
 export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH

Development/Scripts/Windows/CallBuildTool.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 if not exist "Development\Scripts\Windows\GetMSBuildPath.bat" goto Error_InvalidLocation
 

Development/Scripts/Windows/GetMSBuildPath.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 set MSBUILD_PATH=
 

Flax.flaxproj

@@ -2,11 +2,11 @@
   "Name": "Flax",
   "Version": {
     "Major": 1,
-    "Minor": 5,
+    "Minor": 6,
-    "Build": 6335
+    "Build": 6340
   },
   "Company": "Flax",
-  "Copyright": "Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.",
+  "Copyright": "Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.",
   "GameTarget": "FlaxGame",
   "EditorTarget": "FlaxEditor",
   "Configuration": {

GenerateProjectFiles.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd

GenerateProjectFiles.command

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 set -e
 

GenerateProjectFiles.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 set -e
 

PackageAll.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd

PackageEditor.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd

PackageEditor.command

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 set -e
 

PackageEditor.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 set -e
 

PackagePlatforms.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd

PackagePlatforms.command

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 set -e
 

PackagePlatforms.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 set -e
 

RegisterEngineLocation.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd %~dp0

Source/Editor/Analytics/EditorAnalytics.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 #include "EditorAnalytics.h"
 #include "EditorAnalyticsController.h"

Source/Editor/Analytics/EditorAnalytics.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 #pragma once
 

Source/Editor/Analytics/EditorAnalyticsController.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 #include "EditorAnalyticsController.h"
 #include "Editor/Cooker/GameCooker.h"

Source/Editor/Analytics/EditorAnalyticsController.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 #pragma once
 

Source/Editor/Content/AssetItemConverter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using Newtonsoft.Json;

Source/Editor/Content/Create/CreateFileEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 namespace FlaxEditor.Content.Create
 {

Source/Editor/Content/Create/CreateFilesDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Create/ParticleEmitterCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;

Source/Editor/Content/Create/SettingsCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Create/VisualScriptCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/GUI/ContentNavigationButton.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEditor.GUI;
 using FlaxEditor.GUI.Drag;

Source/Editor/Content/GUI/ContentView.DragDrop.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEditor.GUI.Drag;
 using FlaxEditor.SceneGraph;

Source/Editor/Content/GUI/ContentView.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/IFileEntryAction.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Import/AssetImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 namespace FlaxEditor.Content.Import
 {

Source/Editor/Content/Import/AudioImportSettings.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System.ComponentModel;
 using System.Reflection;

Source/Editor/Content/Import/FolderImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System.IO;
 

Source/Editor/Content/Import/ImportFileEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using System.IO;

Source/Editor/Content/Import/ImportFilesDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Import/ModelImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.ComponentModel;

Source/Editor/Content/Import/Request.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Import/TextureImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Items/AssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;

Source/Editor/Content/Items/BinaryAssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Text;

Source/Editor/Content/Items/CSharpScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/ContentFolder.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Items/ContentItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Items/CppScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/FileItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/JsonAssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/NewItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/PrefabItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/SceneItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/ScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System.Text;
 

Source/Editor/Content/Items/ShaderSourceItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/VisualScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/PreviewsCache.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 #include "PreviewsCache.h"
 #include "Engine/Core/Log.h"

Source/Editor/Content/PreviewsCache.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/PreviewsCache.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 #pragma once
 

Source/Editor/Content/Proxy/AnimationGraphFunctionProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Windows;

Source/Editor/Content/Proxy/AnimationGraphProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Windows;

Source/Editor/Content/Proxy/AnimationProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;

Source/Editor/Content/Proxy/AssetProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Content.Thumbnails;

Source/Editor/Content/Proxy/AudioClipProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Proxy/BinaryAssetProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Proxy/CSharpScriptProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;