Fixed failing tests.

QuantumDeveloper · Dec 26, 2015 · 072cb01 · 072cb01
1 parent 7925fa8
commit 072cb01
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 6 deletions.
diff --git a/Perspex.sln b/Perspex.sln
@@ -140,6 +140,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.LeakTests", "tests\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ControlCatalog", "samples\ControlCatalog\ControlCatalog.csproj", "{61BEC86C-F307-4295-B5B8-9428610D7D55}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perspex.PerfTests", "tests\Perspex.PerfTests\Perspex.PerfTests.csproj", "{2136D059-4BB5-4CA8-A59C-244722F8610C}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{fb05ac90-89ba-4f2f-a924-f37875fb547c}*SharedItemsImports = 4
@@ -148,18 +150,19 @@ Global
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{e4d9629c-f168-4224-3f51-a5e482ffbc42}*SharedItemsImports = 13
 		src\Skia\Perspex.Skia\Perspex.Skia.projitems*{2f59f3d0-748d-4652-b01e-e0d954756308}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{db070a10-bf39-4752-8456-86e9d5928478}*SharedItemsImports = 4
-		src\Skia\Perspex.Skia\Perspex.Skia.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4
+		src\Skia\Perspex.Skia\Perspex.Skia.projitems*{925dd807-b651-475f-9f7c-cbeb974ce43d}*SharedItemsImports = 4
 		samples\TestApplicationShared\TestApplicationShared.projitems*{78345174-5b52-4a14-b9fd-d5f2428137f0}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{54f237d5-a70a-4752-9656-0c70b1a7b047}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{811a76cf-1cf6-440f-963b-bbe31bd72a82}*SharedItemsImports = 4
-		src\Skia\Perspex.Skia\Perspex.Skia.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4
+		src\Skia\Perspex.Skia\Perspex.Skia.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4
 		samples\TestApplicationShared\TestApplicationShared.projitems*{8c923867-8a8f-4f6b-8b80-47d9e8436166}*SharedItemsImports = 4
 		samples\TestApplicationShared\TestApplicationShared.projitems*{e3a1060b-50d0-44e8-88b6-f44ef2e5bd72}*SharedItemsImports = 4
-		src\Skia\Perspex.Skia\Perspex.Skia.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4
+		src\Shared\PlatformSupport\PlatformSupport.projitems*{2136d059-4bb5-4ca8-a59c-244722f8610c}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4
+		src\Skia\Perspex.Skia\Perspex.Skia.projitems*{bd43f7c0-396b-4aa1-bad9-dfde54d51298}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{e1aa3dbf-9056-4530-9376-18119a7a3ffe}*SharedItemsImports = 4
 	EndGlobalSection
@@ -1293,6 +1296,30 @@ Global
 		{61BEC86C-F307-4295-B5B8-9428610D7D55}.Release|iPhone.Build.0 = Release|Any CPU
 		{61BEC86C-F307-4295-B5B8-9428610D7D55}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
 		{61BEC86C-F307-4295-B5B8-9428610D7D55}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Ad-Hoc|Any CPU.ActiveCfg = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Ad-Hoc|Any CPU.Build.0 = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Ad-Hoc|iPhone.ActiveCfg = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Ad-Hoc|iPhone.Build.0 = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Ad-Hoc|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.AppStore|Any CPU.ActiveCfg = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.AppStore|Any CPU.Build.0 = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.AppStore|iPhone.ActiveCfg = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.AppStore|iPhone.Build.0 = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.AppStore|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.AppStore|iPhoneSimulator.Build.0 = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Release|iPhone.Build.0 = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{2136D059-4BB5-4CA8-A59C-244722F8610C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1337,5 +1364,6 @@ Global
 		{8C923867-8A8F-4F6B-8B80-47D9E8436166} = {0CB0B92E-6CFF-4240-80A5-CCAFE75D91E1}
 		{E1AA3DBF-9056-4530-9376-18119A7A3FFE} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 		{61BEC86C-F307-4295-B5B8-9428610D7D55} = {9B9E3891-2366-4253-A952-D08BCEB71098}
+		{2136D059-4BB5-4CA8-A59C-244722F8610C} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Shared/PlatformSupport/AssetLoader.cs b/src/Shared/PlatformSupport/AssetLoader.cs
@@ -20,9 +20,13 @@ class AssemblyDescriptor
             public AssemblyDescriptor(Assembly assembly)
             {
                 Assembly = assembly;
-                Resources = assembly.GetManifestResourceNames()
-                    .ToDictionary(n => n, n => (IAssetDescriptor)new AssemblyResourceDescriptor(assembly, n));
-                Name = assembly.GetName().Name;
+
+                if (assembly != null)
+                {
+                    Resources = assembly.GetManifestResourceNames()
+                        .ToDictionary(n => n, n => (IAssetDescriptor)new AssemblyResourceDescriptor(assembly, n));
+                    Name = assembly.GetName().Name;
+                }
             }
 
             public Assembly Assembly { get; }