diff --git a/.gitignore b/.gitignore index ca7563a..e68c463 100644 --- a/.gitignore +++ b/.gitignore @@ -9,8 +9,8 @@ *.user *.suo *.pdb -*.msi +#*.msi obj/ [Dd]ebug*/ -[Rr]elease*/ -![Rr]elease*/*.msi \ No newline at end of file +#[Rr]elease*/ +#![Rr]elease*/*.msi \ No newline at end of file diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 9350a7f..a74b880 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -45,5 +45,5 @@ // Revision // // Aug 2011 starting with 4.6.4.00, we are using Visual Studio 2010 and dotNet 3.5 -[assembly: AssemblyVersion("4.10.0.0")] -[assembly: AssemblyFileVersion("4.10.0.0")] +[assembly: AssemblyVersion("4.10.0.1")] +[assembly: AssemblyFileVersion("4.10.0.1")] diff --git a/Tripoli-Installer/Release/Tripoli-4-10-0-0-Installer.msi b/Tripoli-Installer/Release/Tripoli-4-10-0-1-Installer.msi similarity index 72% rename from Tripoli-Installer/Release/Tripoli-4-10-0-0-Installer.msi rename to Tripoli-Installer/Release/Tripoli-4-10-0-1-Installer.msi index f3ad40d..04828ca 100644 Binary files a/Tripoli-Installer/Release/Tripoli-4-10-0-0-Installer.msi and b/Tripoli-Installer/Release/Tripoli-4-10-0-1-Installer.msi differ diff --git a/Tripoli-Installer/Tripoli-Installer.vdproj b/Tripoli-Installer/Tripoli-Installer.vdproj index 8dff387..e262931 100644 --- a/Tripoli-Installer/Tripoli-Installer.vdproj +++ b/Tripoli-Installer/Tripoli-Installer.vdproj @@ -118,7 +118,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_3FA7EBA5605B1462176FCF03256C3B5E" + "OwnerKey" = "8:_2C7097541F1C25FB7776693D3AADD77F" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -130,7 +130,7 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_2C7097541F1C25FB7776693D3AADD77F" + "OwnerKey" = "8:_3FA7EBA5605B1462176FCF03256C3B5E" "MsmSig" = "8:_UNDEFINED" } } @@ -178,7 +178,7 @@ "DisplayName" = "8:Release" "IsDebugOnly" = "11:FALSE" "IsReleaseOnly" = "11:TRUE" - "OutputFilename" = "8:Release\\Tripoli-4-10-0-0-Installer.msi" + "OutputFilename" = "8:Release\\Tripoli-4-10-0-1-Installer.msi" "PackageFilesAs" = "3:2" "PackageFileSize" = "3:-2147483648" "CabType" = "3:1" @@ -339,11 +339,6 @@ "AssemblyAsmDisplayName" = "8:PowerCollections, Version=1.0.2141.24679, Culture=neutral, processorArchitecture=MSIL" "ScatterAssemblies" { - "_2C7097541F1C25FB7776693D3AADD77F" - { - "Name" = "8:PowerCollections.dll" - "Attributes" = "3:512" - } } "SourcePath" = "8:PowerCollections.dll" "TargetName" = "8:" @@ -737,15 +732,15 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Tripoli" - "ProductCode" = "8:{93C14649-025B-436C-B063-3640B515B6F8}" - "PackageCode" = "8:{BC7BFD54-1407-4DC3-970E-74AB1EADCE1D}" + "ProductCode" = "8:{AE75394F-2822-4200-976B-4F395ECFADF0}" + "PackageCode" = "8:{2E0A991A-5BEE-462F-9F7E-D11A70820EC9}" "UpgradeCode" = "8:{523FD083-CBAF-4DF5-BE7E-A8841C1AC28D}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:TRUE" - "ProductVersion" = "8:4.10.0" + "ProductVersion" = "8:4.10.1" "Manufacturer" = "8:Sunchex Systems" "ARPHELPTELEPHONE" = "8:843-608-1399 (voice or sms)" "ARPHELPLINK" = "8:https://cirdles.org" @@ -806,7 +801,7 @@ "Condition" = "8:" "Transitive" = "11:TRUE" "ValueTypes" = "3:1" - "Value" = "8:4.10.0.0" + "Value" = "8:4.10.0.1" } } } diff --git a/source/vendors_data/IsotopXPhoeniX_ImportedTIMSDPDataFile.cs b/source/vendors_data/IsotopXPhoeniX_ImportedTIMSDPDataFile.cs index d0068f8..17653c0 100644 --- a/source/vendors_data/IsotopXPhoeniX_ImportedTIMSDPDataFile.cs +++ b/source/vendors_data/IsotopXPhoeniX_ImportedTIMSDPDataFile.cs @@ -131,11 +131,26 @@ public override TripoliWorkProduct LoadRatios() { string[] lineInfo = line.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries); string[] dateTimeInfo = lineInfo[1].Split(new string[] { " " }, StringSplitOptions.RemoveEmptyEntries); - string[] dateInfo = dateTimeInfo[0].Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries); + // new logic to see if we have yyyy-mm-dd or mm/dd/yyyy + string[] dateInfo; + if (dateTimeInfo[0].Contains("-")) + { + dateInfo = dateTimeInfo[0].Split(new string[] { "-" }, StringSplitOptions.RemoveEmptyEntries); + myDayOfMonth = dateInfo[2].Trim(); + myMonth = dateInfo[1].Trim(); + myYear = dateInfo[0].Trim(); + } + else + { + dateInfo = dateTimeInfo[0].Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries); + myDayOfMonth = dateInfo[1].Trim(); + myMonth = dateInfo[0].Trim(); + myYear = dateInfo[2].Trim(); + } + + string[] timeInfo = dateTimeInfo[1].Split(new string[] { ":" }, StringSplitOptions.RemoveEmptyEntries); - myDayOfMonth = dateInfo[1].Trim(); - myMonth = dateInfo[0].Trim(); - myYear = dateInfo[2].Trim(); + myHours = timeInfo[0].Trim(); myMinutes = timeInfo[1].Trim(); mySeconds = timeInfo[2].Trim(); @@ -153,7 +168,7 @@ public override TripoliWorkProduct LoadRatios() } catch (ArgumentException argExc) { - // Assume broken by European date and switch month and day + // Assume broken by European date in dd/mm/yyyy format and switch month and day retval.TimeStamp = new DateTime(// Convert.ToInt32(myYear), // Convert.ToInt32(myDayOfMonth), //