wip 1.3.2

Yttrium-tYcLief · Oct 17, 2016 · 9ccca59 · 9ccca59
1 parent c9ab5c0
commit 9ccca59
Show file tree

Hide file tree

Showing 55 changed files with 1,698 additions and 899 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,7 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
+
+#VS build folders
+obj
+bin
diff --git a/Project/.vs/CompVMInstaller/v14/.suo b/Project/.vs/CompVMInstaller/v14/.suo
diff --git a/Project/CompVMInstaller.sln b/Project/CompVMInstaller.sln
@@ -8,11 +8,13 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Publish|Any CPU = Publish|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C4CA4387-FB90-4C54-BBE6-5716626319EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C4CA4387-FB90-4C54-BBE6-5716626319EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C4CA4387-FB90-4C54-BBE6-5716626319EB}.Publish|Any CPU.ActiveCfg = Publish|Any CPU
 		{C4CA4387-FB90-4C54-BBE6-5716626319EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C4CA4387-FB90-4C54-BBE6-5716626319EB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

diff --git a/Project/CompVMInstaller/AboutBox1.Designer.vb b/Project/CompVMInstaller/AboutBox1.Designer.vb
diff --git a/Project/CompVMInstaller/AboutBox1.vb b/Project/CompVMInstaller/AboutBox1.vb
@@ -13,7 +13,11 @@
         ' TODO: Customize the application's assembly information in the "Application" pane of the project 
         '    properties dialog (under the "Project" menu).
         Label1.Text = My.Application.Info.ProductName
-        Label3.Text = "Version " & Form2.Version
+        If Form2.DevMode Then
+            Label3.Text = "Version " & Form2.Version & " - DEV MODE"
+        Else
+            Label3.Text = "Version " & Form2.Version
+        End If
         Label2.Text = My.Application.Info.Copyright
     End Sub
 

diff --git a/Project/CompVMInstaller/App.config b/Project/CompVMInstaller/App.config
@@ -1,6 +1,45 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+            <section name="CompVMInstaller.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
     <startup>
 
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
+    <userSettings>
+        <CompVMInstaller.My.MySettings>
+            <setting name="ScoutScatterguns" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ScoutDoubleBarrels" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ScoutShortstop" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ScoutShortstopPush" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="ScoutPrimaryInspects" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="ScoutPistols" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="ScoutThrowables" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="ScoutConsumables" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="ScoutSecondaryInspects" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="ScoutMelee" serializeAs="String">
+                <value />
+            </setting>
+        </CompVMInstaller.My.MySettings>
+    </userSettings>
 </configuration>
diff --git a/Project/CompVMInstaller/CompVMInstaller.vbproj b/Project/CompVMInstaller/CompVMInstaller.vbproj
@@ -13,6 +13,22 @@
     <MyType>WindowsForms</MyType>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>C:\Users\alex\Documents\GitHub\CompVMInstaller\</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>1</ApplicationRevision>
+    <ApplicationVersion>1.3.2.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -21,9 +37,11 @@
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>CompVMInstaller.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
+    <WarningLevel>0</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,9 +50,11 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>CompVMInstaller.xml</DocumentationFile>
+    <DocumentationFile>
+    </DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
     <Prefer32Bit>false</Prefer32Bit>
+    <WarningLevel>0</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
     <OptionExplicit>On</OptionExplicit>
@@ -51,6 +71,38 @@
   <PropertyGroup>
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Publish|AnyCPU'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>..\..\</OutputPath>
+    <DocumentationFile>
+    </DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>false</Prefer32Bit>
+    <WarningLevel>0</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>075890E74209D0B3E69E3564794BC993BAC68BD4</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>CompVMInstaller_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -89,13 +141,6 @@
     <Compile Include="Dialog1.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Form1.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.vb">
-      <DependentUpon>Form1.vb</DependentUpon>
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="Form2.Designer.vb">
       <DependentUpon>Form2.vb</DependentUpon>
     </Compile>
@@ -131,9 +176,6 @@
     <EmbeddedResource Include="Dialog1.resx">
       <DependentUpon>Dialog1.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Form2.resx">
       <DependentUpon>Form2.vb</DependentUpon>
     </EmbeddedResource>
@@ -148,6 +190,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="CompVMInstaller_TemporaryKey.pfx" />
     <None Include="My Project\app.manifest" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
@@ -390,6 +433,24 @@
   <ItemGroup>
     <None Include="Resources\compviewmodelbannersmall.jpg" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %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>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="icon.ico" />
+    <None Include="Resources\icon.png" />
+    <None Include="Resources\icon.ico" />
+    <Content Include="test.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/Project/CompVMInstaller/CompVMInstaller.vbproj.user b/Project/CompVMInstaller/CompVMInstaller.vbproj.user
@@ -1,3 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>C:\Users\alex\Documents\GitHub\CompVMInstaller\|publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>en-US</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+  <PropertyGroup>
+    <EnableSecurityDebugging>false</EnableSecurityDebugging>
+  </PropertyGroup>
 </Project>
diff --git a/Project/CompVMInstaller/CompVMInstaller_TemporaryKey.pfx b/Project/CompVMInstaller/CompVMInstaller_TemporaryKey.pfx
diff --git a/Project/CompVMInstaller/Form2.Designer.vb b/Project/CompVMInstaller/Form2.Designer.vb