Skip to content

Regular master -> vNext merge #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PerthCharern merged 17 commits into from
Oct 26, 2018
Merged

Regular master -> vNext merge #334

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ea3b619
Adding OData processor to readme.
EricAtMSFT Sep 28, 2018
7a5c39a
changing working
EricAtMSFT Sep 28, 2018
aaf4161
Merge pull request #322 from Microsoft/perthcharern/fixDateTimeJson
PerthCharern Sep 28, 2018
c0ee405
Merge branch 'master' into add-odata
PerthCharern Sep 28, 2018
9aa3e97
Merge pull request #324 from Microsoft/add-odata
EricAtMSFT Sep 28, 2018
1a8cdc9
Parse decimals and ints with CultureInfo.InvariantCulture since JSON/…
PerthCharern Oct 2, 2018
e8f55b1
Merge pull request #326 from Microsoft/perthcharern/FixCultureInfo
PerthCharern Oct 2, 2018
8b99269
- Ensure that null in "in" in parameter object is parsed to a null In…
PerthCharern Oct 9, 2018
08c05fa
Fix serializing a null In
PerthCharern Oct 9, 2018
772c98e
add quote for path
PerthCharern Oct 11, 2018
f1864c6
Merge pull request #329 from Microsoft/perthcharern/AllowParsingNullF…
PerthCharern Oct 12, 2018
b98e4cc
Update Package Version to 1.1.1
PerthCharern Oct 17, 2018
2553508
Add CultureInfo.InvariantCulture in the TryParse's in CreateAny.
PerthCharern Oct 17, 2018
328c380
Fix the numberstyles
PerthCharern Oct 17, 2018
235be5c
Merge pull request #335 from Microsoft/perthcharern/fixTryParseCulture
PerthCharern Oct 24, 2018
9537942
Merge branch 'master' into perthcharern/updateVersionOneOneOne
PerthCharern Oct 24, 2018
7ada65a
Merge pull request #333 from Microsoft/perthcharern/updateVersionOneO…
PerthCharern Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix the numberstyles
  • Loading branch information
@PerthCharern
PerthCharern committed Oct 17, 2018
commit 328c380efb95104db022e24ffdcffe8322599d64
16 changes: 7 additions & 9 deletions src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,23 +52,21 @@ public override IOpenApiAny CreateAny()
return new OpenApiBoolean(false);
}

if (int.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out var intValue))
// The NumberStyles below are the default ones based on
// https://docs.microsoft.com/en-us/dotnet/api/?view=netframework-4.7.2
if (int.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var intValue))
{
return new OpenApiInteger(intValue);
}

if (long.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out var longValue))
if (long.TryParse(value, NumberStyles.Integer, CultureInfo.InvariantCulture, out var longValue))
{
return
new OpenApiLong(
longValue);
return new OpenApiLong(longValue);
}

if (double.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out var doubleValue))
if (double.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out var doubleValue))
{
return
new OpenApiDouble(
doubleValue); // Note(darrmi): This may be better as decimal. Further investigation required.
return new OpenApiDouble(doubleValue);
}

if (DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTimeValue))
Expand Down