Skip to content

Commit

Permalink
Version 2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
nachmore committed Feb 28, 2021
1 parent 06fcf89 commit 0234ca8
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 9 deletions.
2 changes: 1 addition & 1 deletion ChimeHelper/ChimeHelperUX/AboutWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<chxaml:HyperlinkAuto NavigateUri="https://github.com/nachmore/AmazonChimeHelper">https://github.com/nachmore/AmazonChimeHelper</chxaml:HyperlinkAuto>
</TextBlock>

<TextBlock HorizontalAlignment="Right" Margin="0,10,5,0"2020, Oren Nachman</TextBlock>
<TextBlock HorizontalAlignment="Right" Margin="0,10,5,0"2021, Oren Nachman</TextBlock>

</StackPanel>
</Window>
2 changes: 1 addition & 1 deletion ChimeHelper/ChimeHelperUX/ChimeHelperState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ private enum TimerState { STOPPED, FIRST, SECOND, ONGOING }
private static Version _version = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
private static double _versionDouble = Double.Parse($"{_version.Major}.{_version.Minor}");
private static string _versionString = $"v{_version.Major}.{_version.Minor}";
private static DateTime _versionBuildDate = new DateTime(2020, 1, 1).AddDays(_version.Build).AddMinutes(_version.MinorRevision);
private static DateTime _versionBuildDate = new DateTime(2021, 1, 1).AddDays(_version.Build).AddMinutes(_version.MinorRevision);

public double Version { get { return _versionDouble; } }
public string VersionString { get { return _versionString; } }
Expand Down
13 changes: 8 additions & 5 deletions ChimeHelper/ChimeHelperUX/ChimeHelperUX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
<AssemblyTitle>ChimeHelper</AssemblyTitle>
<Product>Chime Helper</Product>
<Copyright>Copyright © 2019, 2020</Copyright>
<Copyright>Copyright © 2019, 2020, 2021</Copyright>
<Deterministic>false</Deterministic>

<!--
Expand All @@ -41,7 +41,7 @@
<DateSuffix>
$(
[System.DateTime]::UtcNow.Subtract(
$([System.DateTime]::Parse(2020-01-01))
$([System.DateTime]::Parse(2021-01-01))
).Days
)
</DateSuffix>
Expand Down Expand Up @@ -79,8 +79,8 @@
<TimeSuffix>$(TimeSuffix.Trim())</TimeSuffix>
<DateSuffix>$(DateSuffix.Trim())</DateSuffix>

<AssemblyVersion>2.1.267.102</AssemblyVersion>
<FileVersion>2.1.267.111</FileVersion>
<AssemblyVersion>2.2.$(DateSuffix).$(TimeSuffix)</AssemblyVersion>
<FileVersion>2.2.$(DateSuffix).$(TimeSuffix)</FileVersion>
<OutputPath>bin\$(Configuration)\</OutputPath>
<UseWPF>true</UseWPF>
<PreBuildEvent />
Expand All @@ -104,7 +104,7 @@
</PropertyGroup>
<PropertyGroup>
<PreBuildEvent />
<Version>2.1</Version>
<Version>2.2</Version>
<Authors>Oren Nachman</Authors>
<Company>nachmore</Company>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down Expand Up @@ -150,4 +150,7 @@
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="if $(ConfigurationName) == Release (&quot;C:\Program Files (x86)\NSIS\makensis.exe&quot; $(SolutionDir)\InstallScript\ChimeHelperInstaller.nsi)" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion ChimeHelper/ChimeHelperUX/Properties/app.manifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
<assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
<assemblyIdentity version="1.0.0.0" name="ChimeHelper.app" />
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
Expand Down
2 changes: 1 addition & 1 deletion ChimeHelper/ChimeHelperUX/SettingsWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Icon="/Icons/fan.ico"
Title="Chime Helper Settings" Height="400" Width="400">
Title="Chime Helper Settings" Height="300" Width="400">
<StackPanel>
<Border Background="#192A38" BorderBrush="Black" BorderThickness="1" HorizontalAlignment="Left" Height="42" VerticalAlignment="Top" Width="574">
<StackPanel Orientation="Horizontal">
Expand Down

0 comments on commit 0234ca8

Please sign in to comment.