Rename Locator to SquirrelLocator so you don't end up with 1230234 co…

…nflicts in your file
Squirrel · Aug 20, 2020 · af96781 · af96781
1 parent 2b4142c
commit af96781
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/Squirrel/SimpleSplat/Logging.cs b/src/Squirrel/SimpleSplat/Logging.cs
@@ -102,7 +102,7 @@ public class DefaultLogManager : ILogManager
 
         public DefaultLogManager(IDependencyResolver dependencyResolver = null)
         {
-            dependencyResolver = dependencyResolver ?? Locator.Current;
+            dependencyResolver = dependencyResolver ?? SquirrelLocator.Current;
 
             loggerCache = new MemoizingMRUCache<Type, IFullLogger>((type, _) => {
                 var ret = dependencyResolver.GetService<ILogger>();
@@ -191,7 +191,7 @@ public static class LogHost
             get {
                 if (suppressLogging) return nullLogger;
 
-                var factory = Locator.Current.GetService<ILogManager>();
+                var factory = SquirrelLocator.Current.GetService<ILogManager>();
                 if (factory == null) {
                     throw new Exception("ILogManager is null. This should never happen, your dependency resolver is broken");
                 }
@@ -207,7 +207,7 @@ public static class LogHost
         {
             if (suppressLogging) return nullLogger;
 
-            var factory = Locator.Current.GetService<ILogManager>();
+            var factory = SquirrelLocator.Current.GetService<ILogManager>();
             if (factory == null) {
                 throw new Exception("ILogManager is null. This should never happen, your dependency resolver is broken");
             }

diff --git a/src/Squirrel/SimpleSplat/ServiceLocation.cs b/src/Squirrel/SimpleSplat/ServiceLocation.cs
@@ -5,21 +5,21 @@
 
 namespace Squirrel.SimpleSplat
 {
-    public static class Locator
+    public static class SquirrelLocator
     {
         [ThreadStatic] static IDependencyResolver unitTestDependencyResolver;
         static IDependencyResolver dependencyResolver;
 
         static readonly List<Action> resolverChanged = new List<Action>();
 
-        static Locator()
+        static SquirrelLocator()
         {
             var r = new ModernDependencyResolver();
             dependencyResolver = r;
 
             RegisterResolverCallbackChanged(() => {
-                if (Locator.CurrentMutable == null) return;
-                Locator.CurrentMutable.InitializeSplat();
+                if (SquirrelLocator.CurrentMutable == null) return;
+                SquirrelLocator.CurrentMutable.InitializeSplat();
             });
         }
 
@@ -175,10 +175,10 @@ public static IDisposable ServiceRegistrationCallback(this IMutableDependencyRes
         /// <param name="resolver">The test resolver to use.</param>
         public static IDisposable WithResolver(this IDependencyResolver resolver)
         {
-            var origResolver = Locator.Current;
-            Locator.Current = resolver;
+            var origResolver = SquirrelLocator.Current;
+            SquirrelLocator.Current = resolver;
 
-            return new ActionDisposable(() => Locator.Current = origResolver);
+            return new ActionDisposable(() => SquirrelLocator.Current = origResolver);
         }
 
         public static void RegisterConstant(this IMutableDependencyResolver This, object value, Type serviceType, string contract = null)

diff --git a/src/Squirrel/Utility.cs b/src/Squirrel/Utility.cs
@@ -673,7 +673,7 @@ public static Task<T> ErrorIfThrows<T>(this IEnableLogger This, Func<Task<T>> bl
         static IFullLogger Log()
         {
             return logger ??
-                (logger = Locator.CurrentMutable.GetService<ILogManager>().GetLogger(typeof(Utility)));
+                (logger = SquirrelLocator.CurrentMutable.GetService<ILogManager>().GetLogger(typeof(Utility)));
         }
 
         [DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]

diff --git a/src/SyncReleases/Program.cs b/src/SyncReleases/Program.cs
@@ -36,7 +36,7 @@ public static int Main(string[] args)
         async Task<int> main(string[] args)
         {
             using (var logger = new SetupLogLogger(false) { Level = Squirrel.SimpleSplat.LogLevel.Info }) {
-                Squirrel.SimpleSplat.Locator.CurrentMutable.Register(() => logger, typeof(Squirrel.SimpleSplat.ILogger));
+                Squirrel.SimpleSplat.SquirrelLocator.CurrentMutable.Register(() => logger, typeof(Squirrel.SimpleSplat.ILogger));
 
                 var releaseDir = default(string);
                 var repoUrl = default(string);

diff --git a/src/Update/Program.cs b/src/Update/Program.cs
@@ -44,7 +44,7 @@ int main(string[] args)
                 opt = new StartupOption(args);
             } catch (Exception ex) {
                 using (var logger = new SetupLogLogger(true, "OptionParsing") { Level = LogLevel.Info }) {
-                    Locator.CurrentMutable.Register(() => logger, typeof(Squirrel.SimpleSplat.ILogger));
+                    SquirrelLocator.CurrentMutable.Register(() => logger, typeof(Squirrel.SimpleSplat.ILogger));
                     logger.Write($"Failed to parse command line options. {ex.Message}", LogLevel.Error);
                 }
                 throw;
@@ -55,7 +55,7 @@ int main(string[] args)
             bool isUninstalling = opt.updateAction == UpdateAction.Uninstall;
 
             using (var logger = new SetupLogLogger(isUninstalling, opt.updateAction.ToString()) {Level = LogLevel.Info}) {
-                Locator.CurrentMutable.Register(() => logger, typeof (SimpleSplat.ILogger));
+                SquirrelLocator.CurrentMutable.Register(() => logger, typeof (SimpleSplat.ILogger));
 
                 try {
                     return executeCommandLine(args);