Remove DefaultPlatformProvider and throw exception. Resolves #248

Caliburn-Micro · Nov 16, 2015 · 5744025 · 5744025
1 parent c437f13
commit 5744025
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 97 deletions.
diff --git a/src/Caliburn.Micro/Caliburn.Micro.NET40.csproj b/src/Caliburn.Micro/Caliburn.Micro.NET40.csproj
@@ -67,7 +67,6 @@
     <Compile Include="DeactivationEventArgs.cs" />
     <Compile Include="DebugLog.cs" />
     <Compile Include="DefaultCloseStrategy.cs" />
-    <Compile Include="DefaultPlatformProvider.cs" />
     <Compile Include="DelegateResult.cs" />
     <Compile Include="EnumerableExtensions.cs" />
     <Compile Include="EventAggregator.cs" />

diff --git a/src/Caliburn.Micro/Caliburn.Micro.SL5.csproj b/src/Caliburn.Micro/Caliburn.Micro.SL5.csproj
@@ -85,7 +85,6 @@
     <Compile Include="DeactivationEventArgs.cs" />
     <Compile Include="DebugLog.cs" />
     <Compile Include="DefaultCloseStrategy.cs" />
-    <Compile Include="DefaultPlatformProvider.cs" />
     <Compile Include="DelegateResult.cs" />
     <Compile Include="EnumerableExtensions.cs" />
     <Compile Include="EventAggregator.cs" />

diff --git a/src/Caliburn.Micro/Caliburn.Micro.csproj b/src/Caliburn.Micro/Caliburn.Micro.csproj
@@ -66,7 +66,6 @@
     <Compile Include="DeactivationEventArgs.cs" />
     <Compile Include="DebugLog.cs" />
     <Compile Include="DefaultCloseStrategy.cs" />
-    <Compile Include="DefaultPlatformProvider.cs" />
     <Compile Include="DelegateResult.cs" />
     <Compile Include="EnumerableExtensions.cs" />
     <Compile Include="EventAggregator.cs" />

diff --git a/src/Caliburn.Micro/DefaultPlatformProvider.cs b/src/Caliburn.Micro/DefaultPlatformProvider.cs
diff --git a/src/Caliburn.Micro/PlatformProvider.cs b/src/Caliburn.Micro/PlatformProvider.cs
@@ -1,15 +1,22 @@
-namespace Caliburn.Micro {
+using System;
+
+namespace Caliburn.Micro {
     /// <summary>
     /// Access the current <see cref="IPlatformProvider"/>.
     /// </summary>
     public static class PlatformProvider {
-        private static IPlatformProvider current = new DefaultPlatformProvider();
+        private static IPlatformProvider current;
 
         /// <summary>
         /// Gets or sets the current <see cref="IPlatformProvider"/>.
         /// </summary>
         public static IPlatformProvider Current {
-            get { return current; }
+            get
+            {
+                if (current == null)
+                    throw new InvalidOperationException("PlatformProvider.Current is not set, ensure Caliburn.Micro is correctly initialized");
+                return current;
+            }
             set { current = value; }
         }
     }