Merge branch 'master' into bugfix#319-V2Deserializer-should-handle-invalid-host-value-gracefully

Author: senthilkumarmohan

src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFrameworks>net46; netstandard2.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -10,7 +10,7 @@
         <Company>Microsoft</Company>
         <Title>Microsoft.OpenApi.Readers</Title>
         <PackageId>Microsoft.OpenApi.Readers</PackageId>
-        <Version>1.1.0</Version>
+        <Version>1.1.1</Version>
         <Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
         <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
         <PackageTags>OpenAPI .NET</PackageTags>

src/Microsoft.OpenApi.Readers/ParseNodes/ValueNode.cs

@@ -2,8 +2,8 @@
 // Licensed under the MIT license. 
 
 using System;
+using System.Globalization;
 using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Readers.Exceptions;
 using SharpYaml.Serialization;
 
@@ -52,28 +52,26 @@ public override IOpenApiAny CreateAny()
                 return new OpenApiBoolean(false);
             }
 
-            if (int.TryParse(value, 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, 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, out var dblValue))
+            if (double.TryParse(value, NumberStyles.Float | NumberStyles.AllowThousands, CultureInfo.InvariantCulture, out var doubleValue))
             {
-                return
-                    new OpenApiDouble(
-                        dblValue); // Note(darrmi): This may be better as decimal. Further investigation required.
+                return new OpenApiDouble(doubleValue); 
             }
 
-            if (DateTimeOffset.TryParse(value, out var datetimeValue))
+            if (DateTimeOffset.TryParse(value, CultureInfo.InvariantCulture, DateTimeStyles.None, out var dateTimeValue))
             {
-                return new OpenApiDateTime(datetimeValue);
+                return new OpenApiDateTime(dateTimeValue);
             }
 
             // if we can't identify the type of value, return it as string.

src/Microsoft.OpenApi/Microsoft.OpenApi.csproj

@@ -10,7 +10,7 @@
         <Company>Microsoft</Company>
         <Title>Microsoft.OpenApi</Title>
         <PackageId>Microsoft.OpenApi</PackageId>
-        <Version>1.1.0</Version>
+        <Version>1.1.1</Version>
         <Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
         <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
         <PackageTags>OpenAPI .NET</PackageTags>

test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs

@@ -5,9 +5,9 @@
 using System.Globalization;
 using System.Threading;
 using FluentAssertions;
+using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers.Exceptions;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -86,6 +86,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
 info: 
   title: Simple Document
   version: 0.9.1
+  x-extension: 2.335
 definitions:
   sampleSchema:
     type: object
@@ -105,7 +106,11 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
                     Info = new OpenApiInfo
                     {
                         Title = "Simple Document",
-                        Version = "0.9.1"
+                        Version = "0.9.1",
+                        Extensions =
+                        {
+                            ["x-extension"] = new OpenApiDouble(2.335)
+                        }
                     },
                     Components = new OpenApiComponents()
                     {