Merge branch 'vnext' into vnext

darrelmiller · web-flow · commit 9c859a302784 · 2021-05-01T16:50:21.000-04:00
diff --git a/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V2/OpenApiSchemaDeserializer.cs
@@ -26,13 +26,13 @@ internal static partial class OpenApiV2Deserializer
             {
                 "multipleOf", (o, n) =>
                 {
-                    o.MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                    o.MultipleOf = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
                 "maximum", (o, n) =>
                 {
-                    o.Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                    o.Maximum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
@@ -44,7 +44,7 @@ internal static partial class OpenApiV2Deserializer
             {
                 "minimum", (o, n) =>
                 {
-                    o.Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                    o.Minimum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
diff --git a/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs b/src/Microsoft.OpenApi.Readers/V3/OpenApiSchemaDeserializer.cs
@@ -33,7 +33,7 @@ internal static partial class OpenApiV3Deserializer
             {
                 "maximum", (o, n) =>
                 {
-                    o.Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                    o.Maximum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
@@ -45,7 +45,7 @@ internal static partial class OpenApiV3Deserializer
             {
                 "minimum", (o, n) =>
                 {
-                    o.Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);
+                    o.Minimum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
             },
             {
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
@@ -96,7 +96,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
       sampleProperty:
         type: double
         minimum: 100.54
-        maximum: 60,000,000.35
+        maximum: 60000000.35
         exclusiveMaximum: true
         exclusiveMinimum: false
 paths: {}",
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
@@ -82,7 +82,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
         sampleProperty:
           type: double
           minimum: 100.54
-          maximum: 60,000,000.35
+          maximum: 60000000.35
           exclusiveMaximum: true
           exclusiveMinimum: false
 paths: {}",

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ internal static partial class OpenApiV2Deserializer`
`26`	`26`	`{`
`27`	`27`	`"multipleOf", (o, n) =>`
`28`	`28`	`{`
`29`		`- o.MultipleOf = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`29`	`+ o.MultipleOf = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`30`	`30`	`}`
`31`	`31`	`},`
`32`	`32`	`{`
`33`	`33`	`"maximum", (o, n) =>`
`34`	`34`	`{`
`35`		`- o.Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`35`	`+ o.Maximum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`36`	`36`	`}`
`37`	`37`	`},`
`38`	`38`	`{`
`@@ -44,7 +44,7 @@ internal static partial class OpenApiV2Deserializer`
`44`	`44`	`{`
`45`	`45`	`"minimum", (o, n) =>`
`46`	`46`	`{`
`47`		`- o.Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`47`	`+ o.Minimum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`48`	`48`	`}`
`49`	`49`	`},`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ internal static partial class OpenApiV3Deserializer`
`33`	`33`	`{`
`34`	`34`	`"maximum", (o, n) =>`
`35`	`35`	`{`
`36`		`- o.Maximum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`36`	`+ o.Maximum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`37`	`37`	`}`
`38`	`38`	`},`
`39`	`39`	`{`
`@@ -45,7 +45,7 @@ internal static partial class OpenApiV3Deserializer`
`45`	`45`	`{`
`46`	`46`	`"minimum", (o, n) =>`
`47`	`47`	`{`
`48`		`- o.Minimum = decimal.Parse(n.GetScalarValue(), CultureInfo.InvariantCulture);`
	`48`	`+ o.Minimum = decimal.Parse(n.GetScalarValue(), NumberStyles.Float, CultureInfo.InvariantCulture);`
`49`	`49`	`}`
`50`	`50`	`},`
`51`	`51`	`{`