Update to latest version of ZoraSharp

Author: kabili207

ZoraGenWpf/GitHubReleaseJsonConverter.cs

@@ -1,7 +1,7 @@
-/*
+/*
  * Copyright © 2013-2018, Amy Nagle.
  * All rights reserved.
- * 
+ *
  * This file is part of ZoraGen WPF.
  *
  * ZoraGen WPF is free software: you can redistribute it and/or modify
@@ -13,7 +13,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with ZoraGen WPF.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -26,7 +26,7 @@
 
 namespace Zyrenth.ZoraGen.Wpf
 {
-	class GitHubReleaseJsonConverter
+	internal class GitHubReleaseJsonConverter
 	{
 		public IEnumerable<Type> SupportedTypes
 		{

ZoraGenWpf/MainWindow.xaml.cs

@@ -183,7 +183,7 @@ private void CheckForUpdates(bool silentCheck)
 				Extensions.SetAllowUnsafeHeaderParsing();
 
 				// GitHub requires a user agent
-				((HttpWebRequest)request).UserAgent = "ZoraGen updater";
+				( (HttpWebRequest)request ).UserAgent = "ZoraGen updater";
 
 
 				using (Stream objStream = request.GetResponse().GetResponseStream())

ZoraGenWpf/Properties/AssemblyInfo.cs

@@ -1,7 +1,7 @@
-/*
+/*
  * Copyright © 2013-2018, Amy Nagle.
  * All rights reserved.
- * 
+ *
  * This file is part of ZoraGen WPF.
  *
  * ZoraGen WPF is free software: you can redistribute it and/or modify
@@ -13,7 +13,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with ZoraGen WPF.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -24,24 +24,24 @@
 using System.Runtime.InteropServices;
 using System.Windows;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("ZoraGen WPF")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ZoraGen WPF")]
-[assembly: AssemblyCopyright("Copyright © Amy Nagle 2013 - 2018")]
+[assembly: AssemblyCopyright("Copyright © Amy Nagle 2013 - 2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
-//In order to begin building localizable applications, set 
+//In order to begin building localizable applications, set
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
 //inside a <PropertyGroup>.  For example, if you are using US english
 //in your source files, set the <UICulture> to en-US.  Then uncomment
@@ -53,22 +53,22 @@
 
 [assembly: ThemeInfo(
 	ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-	//(used if a resource is not found in the page, 
+	//(used if a resource is not found in the page,
 	// or application resource dictionaries)
 	ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-	//(used if a resource is not found in the page, 
+	//(used if a resource is not found in the page,
 	// app, or any theme specific resource dictionaries)
 )]
 
 
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
-//      Minor Version 
+//      Minor Version
 //      Build Number
 //      Revision
 //
-// You can specify all the values or you can default the Build and Revision Numbers 
+// You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("2.2.0.*")]

ZoraGenWpf/Properties/Resources.Designer.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright © 2013-2018, Amy Nagle.
  * All rights reserved.
  * 
@@ -30,7 +30,7 @@
 
 namespace Zyrenth.ZoraGen.Wpf
 {
-	class RingImageConverter : IValueConverter
+	internal class RingImageConverter : IValueConverter
 	{
 		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 		{

ZoraGenWpf/Properties/Settings.Designer.cs

@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright © 2013-2018, Amy Nagle.
  * All rights reserved.
  *
@@ -39,7 +39,7 @@ namespace Zyrenth.ZoraGen.Wpf
 	/// </summary>
 	public partial class ViewSecretsWindow : Window
 	{
-		GameInfo _info;
+		private GameInfo _info;
 
 		public ViewSecretsWindow()
 		{

ZoraGenWpf/RingImageConverter.cs

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Zyrenth.ZoraGen.Wpf</RootNamespace>
     <AssemblyName>ZoraGen</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -46,6 +46,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -55,6 +56,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Farore.ico</ApplicationIcon>

ZoraGenWpf/ViewSecretsWindow.xaml.cs

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