It`s 2017, time for .NET 4.6

- Fixes #86

Author: bitbeans

SimpleDnsCrypt/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
     </startup>
-</configuration>
+</configuration>

SimpleDnsCrypt/Properties/Resources.Designer.cs

@@ -9,12 +9,13 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SimpleDnsCrypt</RootNamespace>
     <AssemblyName>SimpleDnsCrypt</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>

SimpleDnsCrypt/Properties/Settings.Designer.cs

@@ -616,22 +616,24 @@ public async void BuildDomainBlacklist()
 		{
 			try
 			{
-				//
 				if (IsWorking) return;
 				IsWorking = true;
 				DomainBlacklistPathInfoString = LocalizationEx.GetUiString("blacklist_building_list",
 					Thread.CurrentThread.CurrentCulture);
 				var domainBlacklist = await GenerateDomainBlacklist(DomainBlacklist).ConfigureAwait(false);
-				File.WriteAllLines(Path.Combine("data", Global.DomainBlacklistFile), domainBlacklist);
-				DomainBlacklistPath = Path.Combine(Directory.GetCurrentDirectory(), "data", Global.DomainBlacklistFile);
-				UpdateDomainBlacklistPathInfoString();
-				if (DomainBlacklistPlugin)
+				if (domainBlacklist != null)
 				{
-					SavePlugin();
+					File.WriteAllLines(Path.Combine("data", Global.DomainBlacklistFile), domainBlacklist);
+					DomainBlacklistPath = Path.Combine(Directory.GetCurrentDirectory(), "data", Global.DomainBlacklistFile);
+					UpdateDomainBlacklistPathInfoString();
+					if (DomainBlacklistPlugin)
+					{
+						SavePlugin();
+					}
 				}
 				IsWorking = false;
 			}
-			catch (Exception)
+			catch (Exception exception)
 			{
 				IsWorking = false;
 			}
@@ -663,11 +665,19 @@ public void BuildAddressBlacklist()
 
 		private static async Task<string> FetchRemoteList(string requestUri)
 		{
-			using (var client = new HttpClient())
+			try
+			{
+				using (var client = new HttpClient())
+				{
+					var getDataTask = client.GetStringAsync(requestUri);
+					return await getDataTask.ConfigureAwait(false);
+				}
+			}
+			catch (Exception)
 			{
-				var getDataTask = client.GetStringAsync(requestUri);
-				return await getDataTask.ConfigureAwait(false);
+
 			}
+			return null;
 		}
 
 
@@ -703,8 +713,11 @@ public static async Task<List<string>> GenerateDomainBlacklist(DomainBlacklist d
 				foreach (var remoteRule in domainBlacklist.RemoteRules)
 				{
 					var r = await FetchRemoteList(remoteRule.Rule).ConfigureAwait(false);
-					var remote = ParseBlacklist(r);
-					allNames.AddUnique(remote);
+					if (r != null)
+					{
+						var remote = ParseBlacklist(r);
+						allNames.AddUnique(remote);
+					}
 				}
 
 				return allNames;