2.0.6

maxim-saplin · Feb 1, 2019 · f09be8a · f09be8a
1 parent a014f05
commit f09be8a
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 27 deletions.
diff --git a/CrossPlatformDiskTest.sln b/CrossPlatformDiskTest.sln
@@ -8,7 +8,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Saplin.CPDT.Mac", "Saplin.C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Saplin.CPDT.Android", "Saplin.CPDT.Android\Saplin.CPDT.Android.csproj", "{6A84BA8D-A85D-4293-BC21-EE856012ADA3}"
 EndProject
-Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Saplin.CPDT.WPF", "Saplin.CPDT.WPF\Saplin.CPDT.WPF.csproj", "{05D74C71-E0CB-4449-A343-04C828A148C7}"
+Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "Saplin.CPDT.WPF", "Saplin.CPDT.WPF\Saplin.CPDT.WPF.csproj", "{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -78,22 +78,22 @@ Global
 		{6A84BA8D-A85D-4293-BC21-EE856012ADA3}.Release|x86.ActiveCfg = Release|Any CPU
 		{6A84BA8D-A85D-4293-BC21-EE856012ADA3}.Release|x86.Build.0 = Release|Any CPU
 		{6A84BA8D-A85D-4293-BC21-EE856012ADA3}.Release|x86.Deploy.0 = Release|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Debug|ARM.ActiveCfg = Debug|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Debug|ARM.Build.0 = Debug|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Debug|x64.Build.0 = Debug|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Debug|x86.Build.0 = Debug|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Release|ARM.ActiveCfg = Release|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Release|ARM.Build.0 = Release|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Release|x64.ActiveCfg = Release|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Release|x64.Build.0 = Release|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Release|x86.ActiveCfg = Release|Any CPU
-		{05D74C71-E0CB-4449-A343-04C828A148C7}.Release|x86.Build.0 = Release|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Debug|ARM.Build.0 = Debug|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Debug|x64.Build.0 = Debug|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Debug|x86.Build.0 = Debug|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Release|ARM.ActiveCfg = Release|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Release|ARM.Build.0 = Release|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Release|x64.ActiveCfg = Release|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Release|x64.Build.0 = Release|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Release|x86.ActiveCfg = Release|Any CPU
+		{FB5C19CB-C882-4F5C-9797-7E2B51E3EFAC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -104,6 +104,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 	EndGlobalSection
 	GlobalSection(MonoDevelopProperties) = preSolution
-		version = 2.0.4
+		version = 2.0.6
 	EndGlobalSection
 EndGlobal
diff --git a/Saplin.CPDT.Android/Properties/AndroidManifest.xml b/Saplin.CPDT.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="8" android:versionName="2.0.4" package="com.Saplin.CPDT" android:installLocation="auto">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="10" android:versionName="2.0.6" package="com.Saplin.CPDT" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="27" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<application android:label="Cross Platform Disk Test" android:icon="@mipmap/ic_launcher" android:largeHeap="true"></application>

diff --git a/Saplin.CPDT.Android/Saplin.CPDT.Android.csproj b/Saplin.CPDT.Android/Saplin.CPDT.Android.csproj
@@ -17,7 +17,7 @@
     <TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <ReleaseVersion>2.0.4</ReleaseVersion>
+    <ReleaseVersion>2.0.5</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Saplin.CPDT.Mac/Saplin.CPDT.Mac.csproj b/Saplin.CPDT.Mac/Saplin.CPDT.Mac.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>CPDT</AssemblyName>
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-    <ReleaseVersion>2.0.2</ReleaseVersion>
+    <ReleaseVersion>2.0.6</ReleaseVersion>
     <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/Saplin.CPDT.UICore/Saplin.CPDT.UICore.csproj b/Saplin.CPDT.UICore/Saplin.CPDT.UICore.csproj
@@ -7,10 +7,10 @@
     </UpgradeBackupLocation>
     <OldToolsVersion>2.0</OldToolsVersion>
     <DebugType>pdbonly</DebugType>
-    <ReleaseVersion>2.0.4</ReleaseVersion>
-    <Version>2.0.4</Version>
-    <AssemblyVersion>2.0.4.0</AssemblyVersion>
-    <FileVersion>2.0.4.0</FileVersion>
+    <ReleaseVersion>2.0.5</ReleaseVersion>
+    <Version>2.0.6</Version>
+    <AssemblyVersion>2.0.6.0</AssemblyVersion>
+    <FileVersion>2.0.6.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Forms" Version="3.2.0.871581" />

diff --git a/Saplin.CPDT.UICore/ViewModels/ResultsDbViewModel.cs b/Saplin.CPDT.UICore/ViewModels/ResultsDbViewModel.cs
@@ -2,6 +2,7 @@
 using System;
 using System.ComponentModel;
 using System.IO;
+using System.Reflection;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
 using System.Windows.Input;
@@ -24,6 +25,8 @@ public class ResultsDbViewModel : PopupViewModel
         const string cpu_param = "cpu=";
         const string ram_param = "ram=";
         const string mdl_param = "mdl=";
+        const string v_param = "v=";
+        const string d_param = "d=";
         const string close_param = "close";
 
         WebView webView;
@@ -73,7 +76,9 @@ private string GetParams()
                         (ViewModelContainer.OptionsViewModel.WhiteThemeBool ?
                             "&" + white_theme_param :
                             "") +
-                         "&" + i_param + ViewModelContainer.OptionsViewModel.IID;
+                         "&" + i_param + ViewModelContainer.OptionsViewModel.IID +
+                         "&" + v_param + Assembly.GetExecutingAssembly().GetName().Version.ToString().Substring(0, 5).Replace(".","") +
+                         "&" + d_param + DateTime.UtcNow.ToString("ddMMyyHHmmss");
 
             var di = DependencyService.Get<IDeviceInfo>();
 
@@ -132,6 +137,7 @@ internal class CompareJson
             [DataMember] public double free; // Free space GB
             [DataMember] public double total; // Total space GB
             [DataMember] public double size; // file size GB
+            [DataMember] public string drive; // drive path
         }
 
         public string GetCompareUrl(TestSession session)
@@ -146,6 +152,7 @@ public string GetCompareUrl(TestSession session)
                 free = Math.Round((double)session.FreeSpaceBytes /1024/1024/1024, 1),
                 total = Math.Round((double)session.TotalSpaceBytes / 1024 / 1024 / 1024, 1),
                 size = Math.Round((double)session.FileSizeBytes / 1024 / 1024 / 1024, 1),
+                drive = session.DriveName
             };
 
             var json = "";

diff --git a/Saplin.CPDT.WPF/Saplin.CPDT.WPF.csproj b/Saplin.CPDT.WPF/Saplin.CPDT.WPF.csproj
@@ -30,7 +30,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>2.0.4.0</ApplicationVersion>
+    <ApplicationVersion>2.0.6.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>