From f09be8aaadac11f584ef49951ba56010015da8bd Mon Sep 17 00:00:00 2001 From: sdfsfd Date: Fri, 1 Feb 2019 19:04:21 +0300 Subject: [PATCH] 2.0.6 --- CrossPlatformDiskTest.sln | 36 +++++++++---------- .../Properties/AndroidManifest.xml | 2 +- .../Saplin.CPDT.Android.csproj | 2 +- Saplin.CPDT.Mac/Saplin.CPDT.Mac.csproj | 2 +- Saplin.CPDT.UICore/Saplin.CPDT.UICore.csproj | 8 ++--- .../ViewModels/ResultsDbViewModel.cs | 9 ++++- Saplin.CPDT.WPF/Saplin.CPDT.WPF.csproj | 2 +- 7 files changed, 34 insertions(+), 27 deletions(-) diff --git a/CrossPlatformDiskTest.sln b/CrossPlatformDiskTest.sln index 371e4300..f8f49a69 100644 --- 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 index 6802636f..0581af95 100644 --- a/Saplin.CPDT.Android/Properties/AndroidManifest.xml +++ b/Saplin.CPDT.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/Saplin.CPDT.Android/Saplin.CPDT.Android.csproj b/Saplin.CPDT.Android/Saplin.CPDT.Android.csproj index 80973d9e..8b7cd949 100644 --- a/Saplin.CPDT.Android/Saplin.CPDT.Android.csproj +++ b/Saplin.CPDT.Android/Saplin.CPDT.Android.csproj @@ -17,7 +17,7 @@ v8.1 - 2.0.4 + 2.0.5 true diff --git a/Saplin.CPDT.Mac/Saplin.CPDT.Mac.csproj b/Saplin.CPDT.Mac/Saplin.CPDT.Mac.csproj index 815290c8..259ba648 100644 --- a/Saplin.CPDT.Mac/Saplin.CPDT.Mac.csproj +++ b/Saplin.CPDT.Mac/Saplin.CPDT.Mac.csproj @@ -11,7 +11,7 @@ CPDT Resources v2.0 - 2.0.2 + 2.0.6 Xamarin.Mac diff --git a/Saplin.CPDT.UICore/Saplin.CPDT.UICore.csproj b/Saplin.CPDT.UICore/Saplin.CPDT.UICore.csproj index dc5cd1c0..8e0d6d4a 100644 --- a/Saplin.CPDT.UICore/Saplin.CPDT.UICore.csproj +++ b/Saplin.CPDT.UICore/Saplin.CPDT.UICore.csproj @@ -7,10 +7,10 @@ 2.0 pdbonly - 2.0.4 - 2.0.4 - 2.0.4.0 - 2.0.4.0 + 2.0.5 + 2.0.6 + 2.0.6.0 + 2.0.6.0 diff --git a/Saplin.CPDT.UICore/ViewModels/ResultsDbViewModel.cs b/Saplin.CPDT.UICore/ViewModels/ResultsDbViewModel.cs index 7b7704cc..953dcec2 100644 --- 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(); @@ -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 index f02dc243..5ed80e80 100644 --- a/Saplin.CPDT.WPF/Saplin.CPDT.WPF.csproj +++ b/Saplin.CPDT.WPF/Saplin.CPDT.WPF.csproj @@ -30,7 +30,7 @@ false true 0 - 2.0.4.0 + 2.0.6.0 false true