Skip to content

Commit

Permalink
Applied a culture fix in the Offset parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
assassin316 committed Jul 27, 2021
1 parent 6b92791 commit 2bf756c
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 13 deletions.
5 changes: 3 additions & 2 deletions XamlFlair.Shared/Entities/Offset.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Globalization;
using System.Text;

#if __WPF__
Expand Down Expand Up @@ -67,14 +68,14 @@ internal static Offset Create(string offsetValue)
OffsetFactor = 1.0
};
}
else if (offsetValue.EndsWith("*") && double.TryParse(offsetValue.TrimEnd('*'), out var result))
else if (offsetValue.EndsWith("*") && double.TryParse(offsetValue.TrimEnd('*'), NumberStyles.Number, CultureInfo.InvariantCulture, out var result))
{
return new Offset()
{
OffsetFactor = result
};
}
else if (double.TryParse(offsetValue, out var dbl))
else if (double.TryParse(offsetValue, NumberStyles.Number, CultureInfo.InvariantCulture, out var dbl ))
{
return new Offset()
{
Expand Down
Binary file modified XamlFlair.UWP/Properties/AssemblyInfo.cs
Binary file not shown.
4 changes: 2 additions & 2 deletions XamlFlair.UWP/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!--*-->
<id>XamlFlair.UWP</id>
<!--*-->
<version>1.2.6</version>
<version>1.2.7</version>
<title>XamlFlair.UWP</title>
<!--*-->
<authors>XamlFlair</authors>
Expand All @@ -20,7 +20,7 @@
<!--*-->
<description>XamlFlair animation library for the UWP platform.</description>
<!--*-->
<releaseNotes>Version bump.</releaseNotes>
<releaseNotes>Applied a culture fix for Offset parsing.</releaseNotes>
<copyright>Copyright © 2021</copyright>
<tags>
</tags>
Expand Down
8 changes: 4 additions & 4 deletions XamlFlair.Uno/XamlFlair.Uno.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
<Copyright>Copyright © 2021</Copyright>
<PackageId>XamlFlair.Uno</PackageId>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<PackageReleaseNotes>Version bump.</PackageReleaseNotes>
<Version>1.2.9</Version>
<PackageReleaseNotes>Applied a culture fix for Offset parsing.</PackageReleaseNotes>
<Version>1.2.10</Version>
<PackageProjectUrl>https://github.com/XamlFlair/XamlFlair</PackageProjectUrl>
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
<Company>XamlFlair</Company>
<PackageIconUrl>https://github.com/XamlFlair/XamlFlair/blob/master/nuget_logo.png?raw=true</PackageIconUrl>
<Authors>XamlFlair</Authors>
<FileVersion>1.2.9</FileVersion>
<AssemblyVersion>1.2.9</AssemblyVersion>
<FileVersion>1.2.10</FileVersion>
<AssemblyVersion>1.2.10</AssemblyVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
<DefineConstants>$(DefineConstants);__WASM__</DefineConstants>
Expand Down
4 changes: 2 additions & 2 deletions XamlFlair.Uno/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!--*-->
<id>XamlFlair.Uno</id>
<!--*-->
<version>1.2.9</version>
<version>1.2.10</version>
<title>XamlFlair.Uno</title>
<!--*-->
<authors>XamlFlair</authors>
Expand All @@ -20,7 +20,7 @@
<!--*-->
<description>XamlFlair animation library for the Uno platform.</description>
<!--*-->
<releaseNotes>Version bump.</releaseNotes>
<releaseNotes>Applied a culture fix for Offset parsing.</releaseNotes>
<copyright>Copyright © 2021</copyright>
<tags>
</tags>
Expand Down
Binary file modified XamlFlair.WPF/Properties/AssemblyInfo.cs
Binary file not shown.
2 changes: 1 addition & 1 deletion XamlFlair.WPF/XamlFlair.WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ApplicationIcon>Logo.ico</ApplicationIcon>
<PackageId>XamlFlair.WPF</PackageId>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<PackageReleaseNotes>Version bump.</PackageReleaseNotes>
<PackageReleaseNotes>Applied a culture fix for Offset parsing.</PackageReleaseNotes>
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance>
<Authors>XamlFlair.WPF</Authors>
<PackageProjectUrl>https://github.com/XamlFlair/XamlFlair</PackageProjectUrl>
Expand Down
4 changes: 2 additions & 2 deletions XamlFlair.WPF/package.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!--*-->
<id>XamlFlair.WPF</id>
<!--*-->
<version>1.2.11</version>
<version>1.2.12</version>
<title>XamlFlair.WPF</title>
<!--*-->
<authors>XamlFlair.WPF</authors>
Expand All @@ -18,7 +18,7 @@
<!--*-->
<description>XamlFlair animation library for the WPF platform.</description>
<!--*-->
<releaseNotes>Version bump.</releaseNotes>
<releaseNotes>Applied a culture fix for Offset parsing.</releaseNotes>
<copyright>Copyright © 2021</copyright>
<tags>
</tags>
Expand Down

0 comments on commit 2bf756c

Please sign in to comment.