From 0e98bd376461bd11f8e08e26546aeac944ebb6c7 Mon Sep 17 00:00:00 2001
From: Bitl <bitlblox@gmail.com>
Date: Mon, 13 Apr 2020 15:54:25 -0700
Subject: [PATCH] fixes

---
 NovetusLauncher/NovetusCMD/NovetusCMD.csproj  |  4 ++-
 .../NovetusLauncher/NovetusLauncher.csproj    | 36 +++++++++++++++++--
 NovetusLauncher/NovetusURI/Form1.cs           |  4 ++-
 NovetusLauncher/NovetusURI/NovetusURI.csproj  | 14 ++++----
 4 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/NovetusLauncher/NovetusCMD/NovetusCMD.csproj b/NovetusLauncher/NovetusCMD/NovetusCMD.csproj
index 5b570a9..2a23e5c 100644
--- a/NovetusLauncher/NovetusCMD/NovetusCMD.csproj
+++ b/NovetusLauncher/NovetusCMD/NovetusCMD.csproj
@@ -61,10 +61,12 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x86</PlatformTarget>
+    <DefineConstants>TRACE;DEBUG;CMD;NOVETUS_APPS</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DefineConstants>TRACE;CMD;NOVETUS_APPS</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
diff --git a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj
index 7ae26c9..f6a2370 100644
--- a/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj
+++ b/NovetusLauncher/NovetusLauncher/NovetusLauncher.csproj
@@ -21,6 +21,21 @@
     <SignAssembly>False</SignAssembly>
     <DelaySign>False</DelaySign>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -50,10 +65,11 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <Prefer32Bit>false</Prefer32Bit>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
     <Prefer32Bit>false</Prefer32Bit>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
@@ -205,7 +221,23 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 4.5</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="..\NovetusFuncs\NovetusFuncs.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
diff --git a/NovetusLauncher/NovetusURI/Form1.cs b/NovetusLauncher/NovetusURI/Form1.cs
index 06ba842..ef3d0bd 100644
--- a/NovetusLauncher/NovetusURI/Form1.cs
+++ b/NovetusLauncher/NovetusURI/Form1.cs
@@ -19,16 +19,18 @@ namespace NovetusURI
                     string loadstring = GlobalVars.BasePath + "/" + AppDomain.CurrentDomain.FriendlyName;
                     SecurityFuncs.RegisterURLProtocol("Novetus", loadstring, "Novetus URI");
 
-                    MessageBox.Show("URI and Library Successfully Installed and Registered!", "Novetus - Install URI", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show("URI successfully installed and registered!", "Novetus - Install URI", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
                 catch (Exception ex) when (!Env.Debugging)
                 {
                     MessageBox.Show("Failed to register. (Error: " + ex.Message + ")", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    Close();
                 }
             }
             else
             {
                 MessageBox.Show("Failed to register. (Error: Did not run as Administrator)", "Novetus - Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                Close();
             }
         }
     }
diff --git a/NovetusLauncher/NovetusURI/NovetusURI.csproj b/NovetusLauncher/NovetusURI/NovetusURI.csproj
index 4abcc7f..35f3113 100644
--- a/NovetusLauncher/NovetusURI/NovetusURI.csproj
+++ b/NovetusLauncher/NovetusURI/NovetusURI.csproj
@@ -15,24 +15,26 @@
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
+    <DefineConstants>TRACE;DEBUG;URI;NOVETUS_APPS</DefineConstants>
+    <ErrorReport>none</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>none</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE;URI;NOVETUS_APPS</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
+    <ErrorReport>none</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <FileAlignment>4096</FileAlignment>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>NovetusIcon.ico</ApplicationIcon>