Release v1.11.0

dziemborowicz · Sep 24, 2021 · d931d22 · d931d22
2 parents 87e6d2a + 525ca4c
commit d931d22
Show file tree

Hide file tree

Showing 32 changed files with 1,031 additions and 136 deletions.
diff --git a/Hourglass.Bundle/Bundle.wxs b/Hourglass.Bundle/Bundle.wxs
@@ -3,7 +3,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
   <Bundle Name="Hourglass"
-          Version="1.10.0.0"
+          Version="1.11.0.0"
           Manufacturer="Chris Dziemborowicz"
           UpgradeCode="f1d002c9-cfc9-40fb-84af-96e7aec26e0b"
           IconSourceFile="$(var.Hourglass.ProjectDir)Resources\AppIcon.ico">
@@ -15,7 +15,7 @@
       <bal:WixStandardBootstrapperApplication LicenseFile="MIT.rtf" LogoFile="Logo.png" />
     </BootstrapperApplicationRef>
     <Chain>
-      <PackageGroupRef Id="NetFx40ClientWeb" />
+      <PackageGroupRef Id="NetFx45Web" />
       <MsiPackage Id="HourglassSetup" SourceFile="$(var.Hourglass.Setup.TargetPath)">
         <!-- Pass this selection down to the Hourglass.Setup msi -->
         <MsiProperty Name="APPLICATIONFOLDER" Value="[InstallFolder]" />

diff --git a/Hourglass.Bundle/Hourglass.Bundle.wixproj b/Hourglass.Bundle/Hourglass.Bundle.wixproj
@@ -28,6 +28,10 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Signed|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <SignCabs>true</SignCabs>
     <SignOutput>true</SignOutput>
   </PropertyGroup>
@@ -68,15 +72,15 @@
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <Target Name="SignCabs">
-    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 CE0BA5E4B388D469012D010B514D493DBA91B022 /t http://timestamp.comodoca.com/authenticode &quot;%(SignCabs.FullPath)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 B77A97E1103C36360CDC8D49CF0D3D5BBBE6827E /t http://timestamp.digicert.com &quot;%(SignCabs.FullPath)&quot;" />
   </Target>
   <Target Name="SignMsi">
-    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 CE0BA5E4B388D469012D010B514D493DBA91B022 /t http://timestamp.comodoca.com/authenticode &quot;%(SignMsi.FullPath)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 B77A97E1103C36360CDC8D49CF0D3D5BBBE6827E /t http://timestamp.digicert.com &quot;%(SignMsi.FullPath)&quot;" />
   </Target>
   <Target Name="SignBundleEngine">
-    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 CE0BA5E4B388D469012D010B514D493DBA91B022 /t http://timestamp.comodoca.com/authenticode &quot;@(SignBundleEngine)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 B77A97E1103C36360CDC8D49CF0D3D5BBBE6827E /t http://timestamp.digicert.com &quot;@(SignBundleEngine)&quot;" />
   </Target>
   <Target Name="SignBundle">
-    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 CE0BA5E4B388D469012D010B514D493DBA91B022 /t http://timestamp.comodoca.com/authenticode &quot;@(SignBundle)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 B77A97E1103C36360CDC8D49CF0D3D5BBBE6827E /t http://timestamp.digicert.com &quot;@(SignBundle)&quot;" />
   </Target>
 </Project>
diff --git a/Hourglass.Setup/Hourglass.Setup.wixproj b/Hourglass.Setup/Hourglass.Setup.wixproj
@@ -28,6 +28,10 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Signed|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <SignCabs>true</SignCabs>
     <SignOutput>true</SignOutput>
   </PropertyGroup>
@@ -52,15 +56,15 @@
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <Target Name="SignCabs">
-    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 CE0BA5E4B388D469012D010B514D493DBA91B022 /t http://timestamp.comodoca.com/authenticode &quot;%(SignCabs.FullPath)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 B77A97E1103C36360CDC8D49CF0D3D5BBBE6827E /t http://timestamp.digicert.com &quot;%(SignCabs.FullPath)&quot;" />
   </Target>
   <Target Name="SignMsi">
-    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 CE0BA5E4B388D469012D010B514D493DBA91B022 /t http://timestamp.comodoca.com/authenticode &quot;%(SignMsi.FullPath)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 B77A97E1103C36360CDC8D49CF0D3D5BBBE6827E /t http://timestamp.digicert.com &quot;%(SignMsi.FullPath)&quot;" />
   </Target>
   <Target Name="SignBundleEngine">
-    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 CE0BA5E4B388D469012D010B514D493DBA91B022 /t http://timestamp.comodoca.com/authenticode &quot;@(SignBundleEngine)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 B77A97E1103C36360CDC8D49CF0D3D5BBBE6827E /t http://timestamp.digicert.com &quot;@(SignBundleEngine)&quot;" />
   </Target>
   <Target Name="SignBundle">
-    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 CE0BA5E4B388D469012D010B514D493DBA91B022 /t http://timestamp.comodoca.com/authenticode &quot;@(SignBundle)&quot;" />
+    <Exec Command="&quot;$(SignToolPath)&quot; sign /sha1 B77A97E1103C36360CDC8D49CF0D3D5BBBE6827E /t http://timestamp.digicert.com &quot;@(SignBundle)&quot;" />
   </Target>
 </Project>
diff --git a/Hourglass.Setup/Product.wxs b/Hourglass.Setup/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-    <Product Id="*" Name="Hourglass" Language="1033" Version="1.10.0.0" Manufacturer="Chris Dziemborowicz" UpgradeCode="172d3713-8820-4374-8195-3e2374e7724f">
+    <Product Id="*" Name="Hourglass" Language="1033" Version="1.11.0.0" Manufacturer="Chris Dziemborowicz" UpgradeCode="172d3713-8820-4374-8195-3e2374e7724f">
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
 
         <Icon Id="AppIcon.exe" SourceFile="$(var.Hourglass.ProjectDir)Resources\AppIcon.ico"/>

diff --git a/Hourglass.Test/DateTimeTokenTest.cs b/Hourglass.Test/DateTimeTokenTest.cs
@@ -2549,7 +2549,7 @@ public void ParseWith1InputReturns1Colon00Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 1);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 1);
         }
 
         /// <summary>
@@ -2568,7 +2568,7 @@ public void ParseWith2InputReturns2Colon00Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 2);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 2);
         }
 
         /// <summary>
@@ -2587,7 +2587,7 @@ public void ParseWith3InputReturns3Colon00Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 3);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 3);
         }
 
         /// <summary>
@@ -2606,7 +2606,7 @@ public void ParseWith4InputReturns4Colon00Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 4);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 4);
         }
 
         /// <summary>
@@ -2625,7 +2625,7 @@ public void ParseWith5InputReturns5Colon00Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 5);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 5);
         }
 
         /// <summary>
@@ -2644,7 +2644,7 @@ public void ParseWith6InputReturns6Colon00Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 6);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 6);
         }
 
         /// <summary>
@@ -2663,7 +2663,7 @@ public void ParseWith7InputReturns7Colon00Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 7);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 7);
         }
 
         /// <summary>
@@ -2682,7 +2682,7 @@ public void ParseWith8InputReturns8Colon00Colon00Am()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Am, expectedHour: 8);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 8);
         }
 
         /// <summary>
@@ -2701,7 +2701,7 @@ public void ParseWith9InputReturns9Colon00Colon00Am()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Am, expectedHour: 9);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 9);
         }
 
         /// <summary>
@@ -2720,7 +2720,7 @@ public void ParseWith10InputReturns10Colon00Colon00Am()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Am, expectedHour: 10);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 10);
         }
 
         /// <summary>
@@ -2739,7 +2739,7 @@ public void ParseWith11InputReturns11Colon00Colon00Am()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Am, expectedHour: 11);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 11);
         }
 
         /// <summary>
@@ -2758,7 +2758,7 @@ public void ParseWith12InputReturns12Colon00Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 12);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 12);
         }
 
         /// <summary>
@@ -3655,7 +3655,7 @@ public void ParseWith230InputReturns2Colon30Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 2, expectedMinute: 30);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 2, expectedMinute: 30);
         }
 
         /// <summary>
@@ -3902,7 +3902,7 @@ public void ParseWith2Dot30InputReturns2Colon30Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 2, expectedMinute: 30);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 2, expectedMinute: 30);
         }
 
         /// <summary>
@@ -4149,7 +4149,7 @@ public void ParseWith2Colon30InputReturns2Colon30Colon00Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 2, expectedMinute: 30);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 2, expectedMinute: 30);
         }
 
         /// <summary>
@@ -4400,7 +4400,7 @@ public void ParseWith23015InputReturns2Colon30Colon15Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 2, expectedMinute: 30, expectedSecond: 15);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 2, expectedMinute: 30, expectedSecond: 15);
         }
 
         /// <summary>
@@ -4647,7 +4647,7 @@ public void ParseWith2Dot30Dot15InputReturns2Colon30Colon15Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 2, expectedMinute: 30, expectedSecond: 15);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 2, expectedMinute: 30, expectedSecond: 15);
         }
 
         /// <summary>
@@ -4894,7 +4894,7 @@ public void ParseWith2Colon30Colon15InputReturns2Colon30Colon15Pm()
 
             // Assert
             AssertIsEmpty(GetDateToken(actual));
-            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Pm, expectedHour: 2, expectedMinute: 30, expectedSecond: 15);
+            AssertAreEqual(GetTimeToken(actual), expectedHourPeriod: HourPeriod.Undefined, expectedHour: 2, expectedMinute: 30, expectedSecond: 15);
         }
 
         /// <summary>

diff --git a/Hourglass.Test/Hourglass.Test.csproj b/Hourglass.Test/Hourglass.Test.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -8,14 +8,15 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Hourglass.Test</RootNamespace>
     <AssemblyName>Hourglass.Test</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
     <IsCodedUITest>False</IsCodedUITest>
     <TestProjectType>UnitTest</TestProjectType>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -25,6 +26,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug Portable|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -34,6 +36,7 @@
     <DefineConstants>DEBUG;PORTABLE;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -42,6 +45,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Portable|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -50,6 +54,25 @@
     <DefineConstants>PORTABLE;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Signed|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Signed\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Signed Portable|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Signed Portable\</OutputPath>
+    <DefineConstants>PORTABLE;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/Hourglass.Test/Properties/AssemblyInfo.cs b/Hourglass.Test/Properties/AssemblyInfo.cs
@@ -12,10 +12,10 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("Hourglass.Test")]
-[assembly: AssemblyCopyright("Copyright © 2018 Chris Dziemborowicz")]
+[assembly: AssemblyCopyright("Copyright © 2021 Chris Dziemborowicz")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("002a4be7-7323-4bf9-ab08-5fc8978d9eb0")]
-[assembly: AssemblyVersion("1.10.0.0")]
-[assembly: AssemblyFileVersion("1.10.0.0")]
+[assembly: AssemblyVersion("1.11.0.0")]
+[assembly: AssemblyFileVersion("1.11.0.0")]