New: if no intenter connection, check %temp%\<shortname>.json for def…

…inition
rzander · Aug 6, 2018 · d3ff910 · d3ff910
1 parent cd1fba5
commit d3ff910
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/RZUpdate/Properties/AssemblyInfo.cs b/RZUpdate/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // 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("1.6.1.*")]
-[assembly: AssemblyFileVersion("1.6.1.6")]
+[assembly: AssemblyVersion("1.6.2.*")]
+[assembly: AssemblyFileVersion("1.6.2.7")]
diff --git a/RZUpdate/RZUpdate.cs b/RZUpdate/RZUpdate.cs
@@ -409,9 +409,21 @@ public SWUpdate(string Shortname)
                 var oGetSW = RZRestAPI.SWGet(Shortname).FirstOrDefault(); ;
 
                 SW = new AddSoftware();
-                SW.ProductName = oGetSW.ProductName;
-                SW.ProductVersion = oGetSW.ProductVersion;
-                SW.Manufacturer = oGetSW.Manufacturer;
+
+                if (oGetSW == null)
+                {
+                    if (File.Exists(Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), Shortname + ".json")))
+                    {
+                        string sSWFile = Path.Combine(Environment.ExpandEnvironmentVariables("%TEMP%"), Shortname + ".json");
+                        SW = new SWUpdate(RZUpdater.ParseJSON(sSWFile)).SW;
+                    }
+                }
+                else
+                {
+                    SW.ProductName = oGetSW.ProductName;
+                    SW.ProductVersion = oGetSW.ProductVersion;
+                    SW.Manufacturer = oGetSW.Manufacturer;
+                }
 
                 //Get Install-type
                 GetInstallType();

diff --git a/RZUpdate/RZUpdate.csproj b/RZUpdate/RZUpdate.csproj
@@ -33,7 +33,7 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -43,6 +43,7 @@
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -52,6 +53,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Download &amp; Upgrade.ico</ApplicationIcon>