Fixed display of version at top of app. App version is updated using …

…Automatic Versions 1 addon for Visual Studio 2017. https://marketplace.visualstudio.com/items?itemName=PrecisionInfinity.AutomaticVersions
include-pty-ltd · Apr 5, 2019 · 37417bc · 37417bc
1 parent eb3d0ba
commit 37417bc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Form1.cs b/Form1.cs
@@ -35,7 +35,8 @@ private void btnExit_Click(object sender, EventArgs e)
         private void frmViewrModLoader_Load(object sender, EventArgs e)
         {
             string[] parts = Application.ProductVersion.Split('.');
-            this.Text += $" v.{parts[1]}{parts[2]}{(parts[3] == "0" ? "" : "." + parts[3])}";
+
+            this.Text += $" v.{parts[0].PadLeft(2,'0')}{parts[1].PadLeft(2, '0')}{(parts[2].PadLeft(2, '0'))}";
             RefreshData();
         }
 

diff --git a/Properties/AssemblyInfo.cs b/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.1902.27.0")]
-[assembly: AssemblyFileVersion("1.1902.27.0")]
+[assembly: AssemblyVersion("19.4.5.0")]
+[assembly: AssemblyFileVersion("19.4.5.0")]
diff --git a/ViewRModInstaller.csproj b/ViewRModInstaller.csproj
@@ -47,8 +47,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -85,6 +85,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="packages.config" />
     <None Include="resources\assets\configs\Beat Saber.zip" />
     <None Include="resources\assets\configs\SUPERHOTVR.zip" />
     <None Include="resources\assets\configs\viewrcamera.cfg" />
@@ -93,7 +94,6 @@
     <None Include="resources\assets\IPA.zip" />
     <None Include="resources\assets\viewr.asset" />
     <None Include="resources\games.json" />
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -132,7 +132,7 @@ rem copy /Y $(SolutionDir)resources\assets\configs $(TargetDir)assets\configs</P
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="True" />
+      <UserProperties BuildVersion_UseGlobalSettings="True" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
diff --git a/packages.config b/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net452" />
 </packages>