Skip to content

Commit f72cfb2

Browse files
EricAtMSFTEricAtMSFT
authored
Merge branch 'master' into preview-docs
2 parents bdeba82 + 4ae5fb5 commit f72cfb2

File tree

229 files changed

+6935
-2857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

229 files changed

+6935
-2857
lines changed

‎LICENSE

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
1-
MIT License
2-
3-
Copyright (c) Microsoft Corporation. All rights reserved.
4-
5-
Permission is hereby granted, free of charge, to any person obtaining a copy
6-
of this software and associated documentation files (the "Software"), to deal
7-
in the Software without restriction, including without limitation the rights
8-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9-
copies of the Software, and to permit persons to whom the Software is
10-
furnished to do so, subject to the following conditions:
11-
12-
The above copyright notice and this permission notice shall be included in all
13-
copies or substantial portions of the Software.
14-
15-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE
1+
------------------------------ START OF LICENSE -----------------------------
2+
3+
Microsoft OpenAPI.NET
4+
5+
Copyright (c) Microsoft Corporation
6+
7+
All rights reserved.
8+
9+
MIT License
10+
11+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the Software), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
12+
13+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
16+
17+
------------------------------- END OF LICENSE ------------------------------

‎src/Microsoft.OpenApi.Readers/Interface/IDiagnostic.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// ------------------------------------------------------------
2-
// Copyright (c) Microsoft Corporation. All rights reserved.
3-
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
4-
// ------------------------------------------------------------
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
53

64
namespace Microsoft.OpenApi.Readers.Interface
75
{

‎src/Microsoft.OpenApi.Readers/Interface/IOpenApiReader.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// ------------------------------------------------------------
2-
// Copyright (c) Microsoft Corporation. All rights reserved.
3-
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
4-
// ------------------------------------------------------------
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
53

64
using Microsoft.OpenApi.Models;
75

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

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,52 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net46; netstandard2.0</TargetFrameworks>
4-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
5-
<Authors></Authors>
6-
<Company>Microsoft</Company>
7-
<Product>Microsoft.OpenApi.Readers</Product>
8-
<PackageId>Microsoft.OpenApi.Readers</PackageId>
9-
<Version>1.0.0-beta008</Version>
10-
<Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
11-
<AssemblyName>Microsoft.OpenApi.Readers</AssemblyName>
12-
<RootNamespace>Microsoft.OpenApi.Readers</RootNamespace>
13-
<SignAssembly>true</SignAssembly>
14-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFrameworks>net46; netstandard2.0</TargetFrameworks>
4+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
5+
<Authors></Authors>
6+
<Company>Microsoft</Company>
7+
<Product>Microsoft.OpenApi.Readers</Product>
8+
<PackageId>Microsoft.OpenApi.Readers</PackageId>
9+
<Version>1.0.0-beta008</Version>
10+
<Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
11+
<AssemblyName>Microsoft.OpenApi.Readers</AssemblyName>
12+
<RootNamespace>Microsoft.OpenApi.Readers</RootNamespace>
13+
<SignAssembly>true</SignAssembly>
14+
</PropertyGroup>
1515

16-
<PropertyGroup>
17-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Microsoft.OpenApi.xml</DocumentationFile>
18-
<AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
19-
</PropertyGroup>
16+
<PropertyGroup>
17+
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\Microsoft.OpenApi.xml</DocumentationFile>
18+
<AssemblyOriginatorKeyFile>..\Microsoft.OpenApi.snk</AssemblyOriginatorKeyFile>
19+
</PropertyGroup>
2020

21-
<ItemGroup>
22-
<Compile Remove="ReferenceServices\OpenApiReferenceServiceBase.cs" />
23-
</ItemGroup>
21+
<ItemGroup>
22+
<Compile Remove="ReferenceServices\OpenApiReferenceServiceBase.cs" />
23+
</ItemGroup>
2424

25-
<ItemGroup>
26-
<PackageReference Include="SharpYaml" Version="1.6.1" />
27-
</ItemGroup>
25+
<ItemGroup>
26+
<PackageReference Include="SharpYaml" Version="1.6.1" />
27+
</ItemGroup>
2828

29-
<ItemGroup>
30-
<ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
31-
</ItemGroup>
29+
<ItemGroup>
30+
<ProjectReference Include="..\Microsoft.OpenApi\Microsoft.OpenApi.csproj" />
31+
</ItemGroup>
3232

33-
<ItemGroup>
34-
<Compile Update="Properties\Resource.Designer.cs">
35-
<DesignTime>True</DesignTime>
36-
<AutoGen>True</AutoGen>
37-
<DependentUpon>Resource.resx</DependentUpon>
38-
</Compile>
39-
<Compile Update="Properties\SRResource.Designer.cs">
40-
<DesignTime>True</DesignTime>
41-
<AutoGen>True</AutoGen>
42-
<DependentUpon>SRResource.resx</DependentUpon>
43-
</Compile>
44-
</ItemGroup>
33+
<ItemGroup>
34+
<Compile Update="Properties\Resource.Designer.cs">
35+
<DesignTime>True</DesignTime>
36+
<AutoGen>True</AutoGen>
37+
<DependentUpon>Resource.resx</DependentUpon>
38+
</Compile>
39+
<Compile Update="Properties\SRResource.Designer.cs">
40+
<DesignTime>True</DesignTime>
41+
<AutoGen>True</AutoGen>
42+
<DependentUpon>SRResource.resx</DependentUpon>
43+
</Compile>
44+
</ItemGroup>
4545

46-
<ItemGroup>
47-
<EmbeddedResource Update="Properties\SRResource.resx">
48-
<Generator>ResXFileCodeGenerator</Generator>
49-
<LastGenOutput>SRResource.Designer.cs</LastGenOutput>
50-
</EmbeddedResource>
51-
</ItemGroup>
46+
<ItemGroup>
47+
<EmbeddedResource Update="Properties\SRResource.resx">
48+
<Generator>ResXFileCodeGenerator</Generator>
49+
<LastGenOutput>SRResource.Designer.cs</LastGenOutput>
50+
</EmbeddedResource>
51+
</ItemGroup>
5252
</Project>

‎src/Microsoft.OpenApi.Readers/OpenApiDiagnostic.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// ------------------------------------------------------------
2-
// Copyright (c) Microsoft Corporation. All rights reserved.
3-
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
4-
// ------------------------------------------------------------
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
53

64
using System.Collections.Generic;
75
using Microsoft.OpenApi.Readers.Interface;

‎src/Microsoft.OpenApi.Readers/OpenApiError.cs

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// ------------------------------------------------------------
2-
// Copyright (c) Microsoft Corporation. All rights reserved.
3-
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
4-
// ------------------------------------------------------------
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
53

64
using Microsoft.OpenApi.Exceptions;
75

@@ -12,16 +10,6 @@ namespace Microsoft.OpenApi.Readers
1210
/// </summary>
1311
public class OpenApiError
1412
{
15-
/// <summary>
16-
/// Message explaining the error.
17-
/// </summary>
18-
public string Message { get; set; }
19-
20-
/// <summary>
21-
/// Pointer to the location of the error.
22-
/// </summary>
23-
public string Pointer { get; set; }
24-
2513
/// <summary>
2614
/// Initializes the <see cref="OpenApiError"/> class using the message and pointer from the given exception.
2715
/// </summary>
@@ -36,10 +24,20 @@ public OpenApiError(OpenApiException exception)
3624
/// </summary>
3725
public OpenApiError(string pointer, string message)
3826
{
39-
this.Pointer = pointer;
40-
this.Message = message;
27+
Pointer = pointer;
28+
Message = message;
4129
}
4230

31+
/// <summary>
32+
/// Message explaining the error.
33+
/// </summary>
34+
public string Message { get; set; }
35+
36+
/// <summary>
37+
/// Pointer to the location of the error.
38+
/// </summary>
39+
public string Pointer { get; set; }
40+
4341
/// <summary>
4442
/// Gets the string representation of <see cref="OpenApiError"/>.
4543
/// </summary>

‎src/Microsoft.OpenApi.Readers/OpenApiStreamReader.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// ------------------------------------------------------------
2-
// Copyright (c) Microsoft Corporation. All rights reserved.
3-
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
4-
// ------------------------------------------------------------
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
53

64
using System.IO;
75
using System.Linq;

‎src/Microsoft.OpenApi.Readers/OpenApiStringReader.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
// ------------------------------------------------------------
2-
// Copyright (c) Microsoft Corporation. All rights reserved.
3-
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
4-
// ------------------------------------------------------------
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
53

64
using System.IO;
7-
using Microsoft.OpenApi.Readers.Interface;
85
using Microsoft.OpenApi.Models;
6+
using Microsoft.OpenApi.Readers.Interface;
97

108
namespace Microsoft.OpenApi.Readers
119
{

‎src/Microsoft.OpenApi.Readers/ParseNodes/FixedFieldMap.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// ------------------------------------------------------------
2-
// Copyright (c) Microsoft Corporation. All rights reserved.
3-
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
4-
// ------------------------------------------------------------
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
53

64
using System;
75
using System.Collections.Generic;

‎src/Microsoft.OpenApi.Readers/ParseNodes/JsonPointerExtensions.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
// ------------------------------------------------------------
2-
// Copyright (c) Microsoft Corporation. All rights reserved.
3-
// Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
4-
// ------------------------------------------------------------
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
2+
// Licensed under the MIT license.
53

64
using System;
75
using SharpYaml.Serialization;

0 commit comments

Comments
 (0)