Revert .Net 4.6.1 specific changes

christianrondeau · Mar 12, 2016 · 28937df · 28937df
1 parent f673678
commit 28937df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/GoToWindow/Squirrel/SquirrelUpdater.cs b/GoToWindow/Squirrel/SquirrelUpdater.cs
@@ -79,7 +79,7 @@ static SquirrelUpdater()
 		    Enabled = executablePath.StartsWith(appDataPath, StringComparison.InvariantCultureIgnoreCase);
 
 		    if (!Enabled)
-		        Log.Info($"Updates are disabled because GoToWindow is not running from the AppData directory. Executable: {executablePath}, App Data: {appDataPath}");
+		        Log.Info(String.Format("Updates are disabled because GoToWindow is not running from the AppData directory. Executable: {0}, App Data: {1}", executablePath, appDataPath));
 		}
 
 		public SquirrelUpdater(string updateUrl)

diff --git a/GoToWindow/ViewModels/MainViewModel.cs b/GoToWindow/ViewModels/MainViewModel.cs
@@ -148,9 +148,15 @@ public void AskClose()
 
         private ISearchResult GetEntryAt(int index)
         {
-            var items = Windows?.View?.Cast<ISearchResult>().ToArray();
+			if (Windows == null || Windows.View == null)
+				return null;
 
-            return index < items?.Length ? items[index] : null;
+            var items = Windows.View.Cast<ISearchResult>().ToArray();
+
+            if (index < items.Length)
+                return items[index];
+
+            return null;
         }
 
         private void GoToWindowEntryShortcutCommand_Executed(object sender, EventArgs e)

diff --git a/GoToWindow/packages.config b/GoToWindow/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DeltaCompressionDotNet" version="2.0.0.0-rc1" targetFramework="net45" />
+  <package id="DeltaCompressionDotNet" version="1.0.0" targetFramework="net45" />
   <package id="Hardcodet.NotifyIcon.Wpf" version="1.0.5" targetFramework="net45" />
   <package id="log4net" version="2.0.5" targetFramework="net45" />
   <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />