[Assets] Some improvements so that unit tests can compile

sources/assets/Xenko.Core.Assets/Package.cs

@@ -555,8 +555,7 @@ internal static Package LoadRaw(ILogger log, string filePath)
 
             if (!File.Exists(filePath))
             {
-                log.Error($"Package file [{filePath}] was not found");
-                return null;
+                throw new FileNotFoundException($"Package file [{filePath}] was not found");
             }
 
             try
@@ -577,10 +576,8 @@ internal static Package LoadRaw(ILogger log, string filePath)
             }
             catch (Exception ex)
             {
-                log.Error($"Error while pre-loading package [{filePath}]", ex);
+                throw new InvalidOperationException($"Error while pre-loading package [{filePath}]", ex);
             }
-
-            return null;
         }
 
         public static PackageContainer LoadProject(ILogger log, string filePath)
@@ -999,17 +996,21 @@ private void LoadAssemblyReferencesForPackage(ILogger log, PackageLoadParameters
             if (LoadedAssemblies.Any(x => x.ProjectReference == projectReference))
                 return;
 
-            string assemblyPath = null;
+            string assemblyPath = project.TargetPath;
             var fullProjectLocation = project.FullPath.ToWindowsPath();
 
             try
             {
                 var forwardingLogger = new ForwardingLoggerResult(log);
-                assemblyPath = VSProjectHelper.GetOrCompileProjectAssembly(Session?.SolutionPath, fullProjectLocation, forwardingLogger, "Build", loadParameters.AutoCompileProjects, loadParameters.BuildConfiguration, extraProperties: loadParameters.ExtraCompileProperties, onlyErrors: true);
-                if (String.IsNullOrWhiteSpace(assemblyPath))
+
+                if (loadParameters.AutoCompileProjects || string.IsNullOrWhiteSpace(assemblyPath))
                 {
-                    log.Error($"Unable to locate assembly reference for project [{fullProjectLocation}]");
-                    return;
+                    assemblyPath = VSProjectHelper.GetOrCompileProjectAssembly(Session?.SolutionPath, fullProjectLocation, forwardingLogger, "Build", loadParameters.AutoCompileProjects, loadParameters.BuildConfiguration, extraProperties: loadParameters.ExtraCompileProperties, onlyErrors: true);
+                    if (string.IsNullOrWhiteSpace(assemblyPath))
+                    {
+                        log.Error($"Unable to locate assembly reference for project [{fullProjectLocation}]");
+                        return;
+                    }
                 }
 
                 var loadedAssembly = new PackageLoadedAssembly(projectReference, assemblyPath);
@@ -1180,7 +1181,7 @@ public static List<PackageLoadingAssetFile> ListAssetFiles(ILogger log, Package
                         var ext = fileUPath.GetFileExtension();
 
                         //make sure to add default shaders in this case, since we don't have a csproj for them
-                        if (AssetRegistry.IsProjectCodeGeneratorAssetFileExtension(ext) && !(package.Container is SolutionProject))
+                        if (AssetRegistry.IsProjectCodeGeneratorAssetFileExtension(ext) && (!(package.Container is SolutionProject) || package.IsSystem))
                         {
                             listFiles.Add(new PackageLoadingAssetFile(fileUPath, sourceFolder) { CachedFileSize = filePath.Length });
                             continue;

sources/assets/Xenko.Core.Assets/PackageSession.Dependencies.cs

@@ -95,13 +95,14 @@ private async Task PreLoadPackageDependencies(ILogger log, SolutionProject proje
             try
             {
                 // Load a project without specifying a platform to make sure we get the correct platform type
-                var msProject = VSProjectHelper.LoadProject(project.FullPath, platform: "NoPlatform");
+                var msProject = VSProjectHelper.LoadProject(project.FullPath);
                 try
                 {
                     var packageVersion = msProject.GetPropertyValue("PackageVersion");
                     if (!string.IsNullOrEmpty(packageVersion))
                         package.Meta.Version = new PackageVersion(packageVersion);
 
+                    project.TargetPath = msProject.GetPropertyValue("TargetPath");
                     package.Meta.Name = msProject.GetPropertyValue("PackageId") ?? msProject.GetPropertyValue("AssemblyName") ?? package.Meta.Name;
 
                     var projectIsExecutable = msProject.GetPropertyValue("OutputType");

sources/assets/Xenko.Core.Assets/PackageSession.cs

@@ -320,6 +320,8 @@ public SolutionProject([NotNull] Package package, VisualStudio.Project vsProject
 
         public string Name => VSProject.Name;
 
+        public string TargetPath { get; set; }
+
         public UFile FullPath => VSProject.FullPath;
 
         private void DirectDependencies_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)

sources/engine/Xenko.Assets.Tests2/GameAssets/GameSettings.xkgamesettings

@@ -19,26 +19,8 @@ Defaults:
         RenderingMode: HDR
     - !Xenko.Assets.Textures.TextureSettings,Xenko.Assets
         TextureQuality: Fast
-    - !Xenko.Physics.PhysicsSettings,Xenko.Physics
-        Flags: None
-        MaxSubSteps: 1
-        FixedTimeStep: 0.0166666675
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Navigation.NavigationSettings,Xenko.Navigation
-        EnableDynamicNavigationMesh: false
-        IncludedCollisionGroups: AllFilter
-        BuildSettings:
-            CellHeight: 0.2
-            CellSize: 0.3
-            TileSize: 32
-            MinRegionArea: 2
-            RegionMergeArea: 20
-            MaxEdgeLen: 12.0
-            MaxEdgeError: 1.3
-            DetailSamplingDistance: 6.0
-            MaxDetailSamplingError: 1.0
-        Groups: []
     - !Xenko.Streaming.StreamingSettings,Xenko.Engine
         Enabled: false
         ManagerUpdatesInterval: 0:00:00:00.0330000

sources/engine/Xenko.Assets.Tests2/GameAssets/GraphicsCompositor.xkgfxcomp

@@ -61,18 +61,8 @@ RenderFeatures:
             11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
                 RenderStage: ref!! 37288a03-f47b-4a2a-a16a-a3bf315e519f
                 EffectName: Test
-    93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
-        RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
-                RenderStage: ref!! 1f81e62c-336a-4654-9916-b4b50b59a3fc
-                EffectName: Test
-    9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
-        RenderStageSelectors:
-            af1bd241305893ef8ff7952184e1cb0b: !Xenko.Particles.Rendering.ParticleEmitterTransparentRenderStageSelector,Xenko.Particles
-                OpaqueRenderStage: ref!! 37288a03-f47b-4a2a-a16a-a3bf315e519f
-                TransparentRenderStage: ref!! 1f81e62c-336a-4654-9916-b4b50b59a3fc
-                EffectName: null
-        PipelineProcessors: {}
+    93933ad00d0c357d4915ad462cbfd04c: ~(Deleted)
+    9013eab3ea0ef6c98bf133b86c173d45: ~(Deleted)
 SharedRenderers:
     60459475d3a3adaf2d1ba5d99913ca75: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
         Id: 72bf6aa7-581a-4e8e-aea5-15b8fce7f24c

sources/engine/Xenko.Assets.Tests2/Xenko.Assets.Tests2.csproj

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import Project="..\..\targets\Xenko.PreSettings.UnitTests.targets" />
   <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="1.6.55" />
   <PropertyGroup>
@@ -33,86 +33,9 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\assets\Xenko.Core.Assets\Xenko.Core.Assets.csproj">
-      <Project>{1E54A9A2-4439-4444-AE57-6D2ED3C0DC47}</Project>
-      <Name>Xenko.Core.Assets</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.Design\Xenko.Core.Design.csproj">
-      <Project>{66581dad-70ad-4475-ae47-c6c0df1ec5e2}</Project>
-      <Name>Xenko.Core.Design</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.IO\Xenko.Core.IO.csproj">
-      <Project>{1DE01410-22C9-489B-9796-1ADDAB1F64E5}</Project>
-      <Name>Xenko.Core.IO</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.Mathematics\Xenko.Core.Mathematics.csproj">
-      <Project>{1677b922-ccf0-44de-b57e-1cdd3d2b8e8a}</Project>
-      <Name>Xenko.Core.Mathematics</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core.Serialization\Xenko.Core.Serialization.csproj">
-      <Project>{5210FB81-B807-49BB-AF0D-31FB6A83A572}</Project>
-      <Name>Xenko.Core.Serialization</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\core\Xenko.Core\Xenko.Core.csproj">
-      <Project>{0E916AB7-5A6C-4820-8AB1-AA492FE66D68}</Project>
-      <Name>Xenko.Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\tools\Xenko.TextureConverter\Xenko.TextureConverter.csproj">
-      <Project>{7F7BFF79-C400-435F-B359-56A2EF8956E0}</Project>
-      <Name>Xenko.TextureConverter</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Assets\Xenko.Assets.csproj">
-      <Project>{39ae9c77-e94b-404f-8768-b6261b3c1e0e}</Project>
-      <Name>Xenko.Assets</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj">
-      <Project>{C121A566-555E-42B9-9B0A-1696529A9088}</Project>
-      <Name>Xenko.Engine</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Games\Xenko.Games.csproj">
-      <Project>{42780CBD-3FE7-48E3-BD5B-59945EA20137}</Project>
-      <Name>Xenko.Games</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj">
-      <Project>{d002feb1-00a6-4ab1-a83f-1f253465e64d}</Project>
-      <Name>Xenko.Graphics.Regression</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Graphics\Xenko.Graphics.csproj">
-      <Project>{FB06C76A-6BB7-40BE-9AFA-FEC13B045FB5}</Project>
-      <Name>Xenko.Graphics</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Assets.Models\Xenko.Assets.Models.csproj">
-      <Project>{C904D2C6-5A15-4E0B-8432-33967E1735AA}</Project>
-      <Name>Xenko.Assets.Models</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Particles\Xenko.Particles.csproj">
-      <Project>{f32fda80-b6dd-47a8-8681-437e2c0d3f31}</Project>
-      <Name>Xenko.Particles</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Shaders.Compiler\Xenko.Shaders.Compiler.csproj">
-      <Project>{E8B3553F-A79F-4E50-B75B-ACEE771C320C}</Project>
-      <Name>Xenko.Shaders.Compiler</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Shaders\Xenko.Shaders.csproj">
-      <Project>{273bdd15-7392-4078-91f0-af23594a3d7b}</Project>
-      <Name>Xenko.Shaders</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.SpriteStudio.Runtime\Xenko.SpriteStudio.Runtime.csproj">
-      <Project>{9bc63bec-f305-451d-bb31-262938ea964d}</Project>
-      <Name>Xenko.SpriteStudio.Runtime</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko.Video\Xenko.Video.csproj">
-      <Project>{DA355C86-866F-4843-9B4D-63A173C750FB}</Project>
-      <Name>Xenko.Video</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xenko\Xenko.csproj">
-      <Project>{72390339-B2A1-4F61-A800-31ED0975B515}</Project>
-      <Name>Xenko</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\sources\engine\Xenko.Navigation\Xenko.Navigation.csproj">
-      <Project>{fbe1fa7b-e699-4bb2-9c8f-41f4c9f3f088}</Project>
-      <Name>Xenko.Navigation</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Xenko.Engine\Xenko.Engine.csproj" />
+    <ProjectReference Include="..\Xenko.Graphics.Regression\Xenko.Graphics.Regression.csproj" />
+    <ProjectReference Include="..\Xenko.Assets\Xenko.Assets.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />

sources/engine/Xenko.Assets.Tests2/Xenko.Assets.Tests2.xkpkg

@@ -1,37 +1,8 @@
 !Package
 Id: 04ed1618-1a06-4a69-ac34-1006a978af11
-SerializedVersion: {Assets: 0.0.4}
-Meta:
-    Name: Xenko.Assets.Tests2
-    Version: 1.0.0.0
-    Authors: []
-    Owners: []
-    Dependencies:
-        -   Name: Xenko
-            Version: 2.3.0.1-dev
-            RootAssets: []
-LocalDependencies: []
-Profiles:
-    -   Name: Shared
-        Platform: Shared
-        InheritProfiles: []
-        AssetFolders:
-            -   Path: GameAssets
-        OutputGroupDirectories: {}
-        ProjectReferences:
-            -   Id: 117bf9f8-d2d9-4d32-9702-251c3e038090
-                Location: Xenko.Assets.Tests2.csproj
-                Type: Library
-    -   Name: Windows
-        Platform: Windows
-        InheritProfiles: []
-        AssetFolders:
-            -   Path: GameAssets
-        OutputGroupDirectories: {}
-        ProjectReferences:
-            -   Id: 117bf9f8-d2d9-4d32-9702-251c3e038090
-                Location: Xenko.Assets.Tests2.csproj
-                Type: Executable
+SerializedVersion: {Assets: 3.1.0.0}
+AssetFolders:
+    -   Path: !dir GameAssets
 ExplicitFolders: []
 Bundles: []
 TemplateFolders: []

sources/engine/Xenko.Audio.Tests/AudioAssets/GameSettings.xkgamesettings

@@ -19,26 +19,8 @@ Defaults:
         RenderingMode: HDR
     - !Xenko.Assets.Textures.TextureSettings,Xenko.Assets
         TextureQuality: Fast
-    - !Xenko.Physics.PhysicsSettings,Xenko.Physics
-        Flags: None
-        MaxSubSteps: 1
-        FixedTimeStep: 0.0166666675
     - !Xenko.Audio.AudioEngineSettings,Xenko.Audio
         HrtfSupport: false
-    - !Xenko.Navigation.NavigationSettings,Xenko.Navigation
-        EnableDynamicNavigationMesh: false
-        IncludedCollisionGroups: AllFilter
-        BuildSettings:
-            CellHeight: 0.2
-            CellSize: 0.3
-            TileSize: 32
-            MinRegionArea: 2
-            RegionMergeArea: 20
-            MaxEdgeLen: 12.0
-            MaxEdgeError: 1.3
-            DetailSamplingDistance: 6.0
-            MaxDetailSamplingError: 1.0
-        Groups: []
     - !Xenko.Streaming.StreamingSettings,Xenko.Engine
         Enabled: false
         ManagerUpdatesInterval: 0:00:00:00.0330000

sources/engine/Xenko.Audio.Tests/AudioAssets/GraphicsCompositor.xkgfxcomp

@@ -61,18 +61,8 @@ RenderFeatures:
             11c8b8ccb522e3cd1dd6688016062a6d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
                 RenderStage: ref!! 44dfb4e9-0bdf-4d8e-b2b8-8773263eb8ba
                 EffectName: Test
-    93933ad00d0c357d4915ad462cbfd04c: !Xenko.Rendering.UI.UIRenderFeature,Xenko.UI
-        RenderStageSelectors:
-            14a071694411235038a102ac3794bb4d: !Xenko.Rendering.SimpleGroupToRenderStageSelector,Xenko.Engine
-                RenderStage: ref!! 50614c2b-56c4-4aa4-be26-12f20f459b73
-                EffectName: Test
-    9013eab3ea0ef6c98bf133b86c173d45: !Xenko.Particles.Rendering.ParticleEmitterRenderFeature,Xenko.Particles
-        RenderStageSelectors:
-            af1bd241305893ef8ff7952184e1cb0b: !Xenko.Particles.Rendering.ParticleEmitterTransparentRenderStageSelector,Xenko.Particles
-                OpaqueRenderStage: ref!! 44dfb4e9-0bdf-4d8e-b2b8-8773263eb8ba
-                TransparentRenderStage: ref!! 50614c2b-56c4-4aa4-be26-12f20f459b73
-                EffectName: null
-        PipelineProcessors: {}
+    93933ad00d0c357d4915ad462cbfd04c: ~(Deleted)
+    9013eab3ea0ef6c98bf133b86c173d45: ~(Deleted)
 SharedRenderers:
     60459475d3a3adaf2d1ba5d99913ca75: !Xenko.Rendering.Compositing.ForwardRenderer,Xenko.Engine
         Id: 7164d940-04f9-46f1-9a30-44b9fa9148c0

sources/engine/Xenko.Audio.Tests/Xenko.Audio.Tests.Windows.xkpkg

@@ -0,0 +1,31 @@
+!Package
+Id: 637e7e88-bc09-4ddd-95eb-00114fd32e5e
+SerializedVersion: {Assets: 3.1.0.0}
+AssetFolders:
+    -   Path: AudioAssets
+ExplicitFolders: []
+Bundles: []
+TemplateFolders: []
+RootAssets:
+    - 0da08544-184f-4a10-bce9-4f9bfcd391c2:MusicBipMp3
+    - 0da08544-184f-4a10-bce9-4f9bfcdc91c2:MusicBip
+    - 0da08544-184f-4b10-bce9-4f9bfcdc91c2:MusicStereo
+    - 1f788b16-a3f2-495e-ae1e-3ec93c57c0d9:Effect44100Hz
+    - 231da8ca-3e3f-4fdf-abe1-e9abc2d54272:EffectBip
+    - 51109a5d-b9ee-4484-a1be-41a98474b49e:Effect22050HzStereo
+    - 655e3113-9f85-4989-85e3-03c9755f743c:Effect11025HzStereo
+    - 6909b9f2-f7cc-4f68-baf5-1fa221d48f5a:EffectSurround5Dot1
+    - 6df0e4b8-ed18-4c60-8a5d-43e5d0a97ba6:MainScene
+    - 77791b33-0037-4b28-b2fb-9a97eaeb04e8:EffectToneE
+    - 803f9930-27d0-4178-8ce3-dfdf8b235cb5:EffectStereoOgg
+    - 8b123cb8-508d-46e5-8bb0-4619e3318835:Effect11025Hz
+    - 8d338636-2ff9-4114-8a05-a59cca7f0ae4:EffectStereo
+    - 936e91c4-ec14-42e2-93be-2a8bbb41f312:MusicSurround5Dot1
+    - b8d9bdda-80be-428a-b0b7-fea6049f0047:MusicFishLampMp3
+    - b93284cf-ebfc-4f64-ab6a-11be7c13e4b9:EffectToneA
+    - d631e4e2-38ad-4135-ae47-d1885ba7779e:Effect48000Hz
+    - d73c134e-847c-48b3-985f-860e871999e6:Effect22050Hz
+    - d9ce7b4e-ac45-4e2f-a2df-aaf3d17a8de8:EffectToneAE
+    - de6d53ce-5ee6-4269-af43-09efc2a9569e:EffectFishLamp
+    - e8e56ef6-5725-4ef4-8d21-d88b53c6eb92:MusicToneA
+    - f75ac34b-39fa-4db9-8734-e5bace3680ca:GraphicsCompositor