From 1cac51f46604dcf895065590d695372c486c9cdc Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 13 Oct 2017 13:48:29 -0700 Subject: [PATCH 1/2] Adjust the project strucutre 1. Move the test project to test folder 2. Change the project name --- Microsoft.OpenApi.sln | 23 ++++++++++++++----- build.cmd | 4 ++-- .../Callback.cs | 0 .../Components.cs | 0 .../Contact.cs | 0 .../DomainParseException.cs | 0 .../Example.cs | 0 .../ExternalDocs.cs | 0 .../GenericOpenApiExtension.cs | 0 .../Header.cs | 0 .../IOpenApiExtension.cs | 0 .../IReference.cs | 0 .../IReferenceService.cs | 0 .../Info.cs | 0 .../JsonPointer.cs | 0 .../License.cs | 0 .../Link.cs | 0 .../MediaType.cs | 0 .../Microsoft.OpenApi.Core.csproj} | 0 .../OpenApiDocument.cs | 0 .../OpenApiReference.cs | 0 .../Operation.cs | 0 .../OperationType.cs | 0 .../Parameter.cs | 0 .../PathItem.cs | 0 .../Paths.cs | 0 .../RequestBody.cs | 0 .../Response.cs | 0 .../RuntimeExpression.cs | 0 .../Schema.cs | 0 .../SecurityRequirement.cs | 0 .../SecurityScheme.cs | 0 .../Server.cs | 0 .../ServerVariable.cs | 0 .../Sevices/OpenAPIDiff.cs | 0 .../Sevices/OpenApiValidator.cs | 0 .../Sevices/OpenApiVisitorBase.cs | 0 .../Sevices/OpenApiWalker.cs | 0 .../Tag.cs | 0 .../Writers/IOpenApiWriter.cs | 0 .../Writers/IParseNodeWriter.cs | 0 .../Writers/IReferenceExtensions.cs | 0 .../Writers/JsonParseNodeWriter.cs | 0 .../Writers/OpenApiV2Writer.cs | 0 .../Writers/OpenApiV3Writer.cs | 0 .../Writers/WriterExtensions.cs | 0 .../Writers/YamlParseNodeWriter.cs | 0 .../ListNode.cs | 0 .../MapNode.cs | 0 .../Microsoft.OpenApi.Readers.csproj} | 2 +- .../OpenApiError.cs | 0 .../OpenApiParser.cs | 0 .../OpenApiV2Reader.cs | 0 .../OpenApiV3Reader.cs | 0 .../ParseNodes.cs | 0 .../ParsingContext.cs | 0 .../PropertyNode.cs | 0 .../ReferenceService.cs | 0 .../RootNode.cs | 0 .../ValueNode.cs | 0 .../YamlHelper.cs | 0 .../App.config | 0 .../App.xaml | 0 .../App.xaml.cs | 0 .../MainModel.cs | 0 .../MainWindow.xaml | 0 .../MainWindow.xaml.cs | 0 .../Microsoft.OpenApi.Workbench.csproj} | 8 +++---- .../Properties/AssemblyInfo.cs | 0 .../Properties/Resources.Designer.cs | 0 .../Properties/Resources.resx | 0 .../Properties/Settings.Designer.cs | 0 .../Properties/Settings.settings | 0 .../Themes/Metro/HowToApplyTheme.txt | 0 .../Metro/Metro.MSControls.Core.Implicit.xaml | 0 .../Metro.MSControls.Toolkit.Implicit.xaml | 0 .../Themes/Metro/Styles.Shared.xaml | 0 .../Themes/Metro/Styles.WPF.xaml | 0 .../Themes/Metro/Theme.Colors.xaml | 0 .../ExampleTests.cs | 0 .../Microsoft.OpenApi.Core.Tests.csproj | 11 +++++---- .../OpenApiDocumentTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../ValidationTests.cs | 0 .../BasicTests.cs | 0 .../CallbackTests.cs | 0 .../DownGradeTests.cs | 0 .../FixtureTests.cs | 0 .../InfoTests.cs | 0 .../JsonWriterTests.cs | 0 .../Microsoft.OpenApi.Readers.Tests.csproj | 8 +++---- .../OAIExampleTests.cs | 0 .../OpenApiReferenceTests.cs | 0 .../OperationTests.cs | 0 .../ParameterTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Samples/BrokenSimplest.yaml | 0 .../Samples/CallbackSample.yaml | 0 .../Samples/CallbackSampleWithRef.yaml | 0 .../Samples/CompleteHeader.yaml | 0 .../Samples/MultipleServers.yaml | 0 .../Samples/Simplest.yaml | 0 .../Samples/petstore30.yaml | 0 .../SchemaTests.cs | 0 .../V2Tests/V2Samples/host.2.yaml | 0 .../V2Tests/V2Samples/host.3.yaml | 0 .../V2Tests/V2Samples/parameterref2.yaml | 0 .../V2Tests/V2Samples/petstore.yaml | 0 .../V2Tests/V2Samples/simplest.2.yaml | 0 .../V2Tests/V2Samples/simplest.3.yaml | 0 .../V2Tests/V2Tests.cs | 0 .../YamlWriterTests.cs | 0 .../packages.config | 0 113 files changed, 34 insertions(+), 22 deletions(-) rename src/{OpenApi => Microsoft.OpenApi.Core}/Callback.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Components.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Contact.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/DomainParseException.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Example.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/ExternalDocs.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/GenericOpenApiExtension.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Header.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/IOpenApiExtension.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/IReference.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/IReferenceService.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Info.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/JsonPointer.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/License.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Link.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/MediaType.cs (100%) rename src/{OpenApi/OpenApi.csproj => Microsoft.OpenApi.Core/Microsoft.OpenApi.Core.csproj} (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/OpenApiDocument.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/OpenApiReference.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Operation.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/OperationType.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Parameter.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/PathItem.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Paths.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/RequestBody.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Response.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/RuntimeExpression.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Schema.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/SecurityRequirement.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/SecurityScheme.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Server.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/ServerVariable.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Sevices/OpenAPIDiff.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Sevices/OpenApiValidator.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Sevices/OpenApiVisitorBase.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Sevices/OpenApiWalker.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Tag.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Writers/IOpenApiWriter.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Writers/IParseNodeWriter.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Writers/IReferenceExtensions.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Writers/JsonParseNodeWriter.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Writers/OpenApiV2Writer.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Writers/OpenApiV3Writer.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Writers/WriterExtensions.cs (100%) rename src/{OpenApi => Microsoft.OpenApi.Core}/Writers/YamlParseNodeWriter.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/ListNode.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/MapNode.cs (100%) rename src/{OpenApi.Readers/OpenApi.Readers.csproj => Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj} (83%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/OpenApiError.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/OpenApiParser.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/OpenApiV2Reader.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/OpenApiV3Reader.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/ParseNodes.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/ParsingContext.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/PropertyNode.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/ReferenceService.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/RootNode.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/ValueNode.cs (100%) rename src/{OpenApi.Readers => Microsoft.OpenApi.Readers}/YamlHelper.cs (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/App.config (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/App.xaml (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/App.xaml.cs (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/MainModel.cs (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/MainWindow.xaml (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/MainWindow.xaml.cs (100%) rename src/{OpenApiWorkbench/OpenApiWorkbench.csproj => Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj} (95%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Properties/AssemblyInfo.cs (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Properties/Resources.Designer.cs (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Properties/Resources.resx (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Properties/Settings.Designer.cs (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Properties/Settings.settings (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Themes/Metro/HowToApplyTheme.txt (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Themes/Metro/Metro.MSControls.Core.Implicit.xaml (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Themes/Metro/Styles.Shared.xaml (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Themes/Metro/Styles.WPF.xaml (100%) rename src/{OpenApiWorkbench => Microsoft.OpenApi.Workbench}/Themes/Metro/Theme.Colors.xaml (100%) rename {src/OpenApi.Tests => test/Microsoft.OpenApi.Core.Tests}/ExampleTests.cs (100%) rename src/OpenApi.Tests/OpenApi.Tests.csproj => test/Microsoft.OpenApi.Core.Tests/Microsoft.OpenApi.Core.Tests.csproj (87%) rename {src/OpenApi.Tests => test/Microsoft.OpenApi.Core.Tests}/OpenApiDocumentTests.cs (100%) rename {src/OpenApi.Tests => test/Microsoft.OpenApi.Core.Tests}/Properties/AssemblyInfo.cs (100%) rename {src/OpenApi.Tests => test/Microsoft.OpenApi.Core.Tests}/ValidationTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/BasicTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/CallbackTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/DownGradeTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/FixtureTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/InfoTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/JsonWriterTests.cs (100%) rename src/OpenApi.Readers.Tests/OpenApi.Readers.Tests.csproj => test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj (95%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/OAIExampleTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/OpenApiReferenceTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/OperationTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/ParameterTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/Properties/AssemblyInfo.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/Samples/BrokenSimplest.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/Samples/CallbackSample.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/Samples/CallbackSampleWithRef.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/Samples/CompleteHeader.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/Samples/MultipleServers.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/Samples/Simplest.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/Samples/petstore30.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/SchemaTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/V2Tests/V2Samples/host.2.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/V2Tests/V2Samples/host.3.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/V2Tests/V2Samples/parameterref2.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/V2Tests/V2Samples/petstore.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/V2Tests/V2Samples/simplest.2.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/V2Tests/V2Samples/simplest.3.yaml (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/V2Tests/V2Tests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/YamlWriterTests.cs (100%) rename {src/OpenApi.Readers.Tests => test/Microsoft.OpenApi.Readers.Tests}/packages.config (100%) diff --git a/Microsoft.OpenApi.sln b/Microsoft.OpenApi.sln index 449fd3c5f..8de96bf54 100644 --- a/Microsoft.OpenApi.sln +++ b/Microsoft.OpenApi.sln @@ -1,9 +1,9 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.16 +VisualStudioVersion = 15.0.26730.3 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApi", "src\OpenApi\OpenApi.csproj", "{A8E50143-69B2-472A-9D45-3F9A05D13202}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Core", "src\Microsoft.OpenApi.Core\Microsoft.OpenApi.Core.csproj", "{A8E50143-69B2-472A-9D45-3F9A05D13202}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4AEDAD90-F854-4940-BFEE-6374CC92CAB0}" ProjectSection(SolutionItems) = preProject @@ -11,13 +11,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution readme.md = readme.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApiWorkbench", "src\OpenApiWorkbench\OpenApiWorkbench.csproj", "{6A5E91E5-0441-46EE-AEB9-8334981B7F08}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Workbench", "src\Microsoft.OpenApi.Workbench\Microsoft.OpenApi.Workbench.csproj", "{6A5E91E5-0441-46EE-AEB9-8334981B7F08}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApi.Readers", "src\OpenApi.Readers\OpenApi.Readers.csproj", "{79933258-0126-4382-8755-D50820ECC483}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Readers", "src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj", "{79933258-0126-4382-8755-D50820ECC483}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApi.Tests", "src\OpenApi.Tests\OpenApi.Tests.csproj", "{AD83F991-DBF3-4251-8613-9CC54C826964}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Core.Tests", "test\Microsoft.OpenApi.Core.Tests\Microsoft.OpenApi.Core.Tests.csproj", "{AD83F991-DBF3-4251-8613-9CC54C826964}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApi.Readers.Tests", "src\OpenApi.Readers.Tests\OpenApi.Readers.Tests.csproj", "{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Readers.Tests", "test\Microsoft.OpenApi.Readers.Tests\Microsoft.OpenApi.Readers.Tests.csproj", "{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E546B92F-20A8-49C3-8323-4B25BB78F3E1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6357D7FD-2DE4-4900-ADB9-ABC37052040A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -49,6 +53,13 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {A8E50143-69B2-472A-9D45-3F9A05D13202} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1} + {6A5E91E5-0441-46EE-AEB9-8334981B7F08} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1} + {79933258-0126-4382-8755-D50820ECC483} = {E546B92F-20A8-49C3-8323-4B25BB78F3E1} + {AD83F991-DBF3-4251-8613-9CC54C826964} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A} + {1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237} = {6357D7FD-2DE4-4900-ADB9-ABC37052040A} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9F171EFC-0DB5-4B10-ABFA-AF48D52CC565} EndGlobalSection diff --git a/build.cmd b/build.cmd index 6f70e9bba..8d6ce1af6 100644 --- a/build.cmd +++ b/build.cmd @@ -1,10 +1,10 @@ SET VERSION=0.9.1 -SET PROJ=%~dp0src\OpenApi\OpenApi.csproj +SET PROJ=%~dp0src\Microsoft.OpenApi.Core\Microsoft.OpenApi.Core.csproj msbuild %PROJ% /t:restore /p:Configuration=Release msbuild %PROJ% /t:build /p:Configuration=Release msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts;Version=%VERSION% -SET PROJ=%~dp0src\OpenApi.Readers\OpenApi.Readers.csproj +SET PROJ=%~dp0src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj msbuild %PROJ% /t:restore /p:Configuration=Release msbuild %PROJ% /t:build /p:Configuration=Release msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts;Version=%VERSION% \ No newline at end of file diff --git a/src/OpenApi/Callback.cs b/src/Microsoft.OpenApi.Core/Callback.cs similarity index 100% rename from src/OpenApi/Callback.cs rename to src/Microsoft.OpenApi.Core/Callback.cs diff --git a/src/OpenApi/Components.cs b/src/Microsoft.OpenApi.Core/Components.cs similarity index 100% rename from src/OpenApi/Components.cs rename to src/Microsoft.OpenApi.Core/Components.cs diff --git a/src/OpenApi/Contact.cs b/src/Microsoft.OpenApi.Core/Contact.cs similarity index 100% rename from src/OpenApi/Contact.cs rename to src/Microsoft.OpenApi.Core/Contact.cs diff --git a/src/OpenApi/DomainParseException.cs b/src/Microsoft.OpenApi.Core/DomainParseException.cs similarity index 100% rename from src/OpenApi/DomainParseException.cs rename to src/Microsoft.OpenApi.Core/DomainParseException.cs diff --git a/src/OpenApi/Example.cs b/src/Microsoft.OpenApi.Core/Example.cs similarity index 100% rename from src/OpenApi/Example.cs rename to src/Microsoft.OpenApi.Core/Example.cs diff --git a/src/OpenApi/ExternalDocs.cs b/src/Microsoft.OpenApi.Core/ExternalDocs.cs similarity index 100% rename from src/OpenApi/ExternalDocs.cs rename to src/Microsoft.OpenApi.Core/ExternalDocs.cs diff --git a/src/OpenApi/GenericOpenApiExtension.cs b/src/Microsoft.OpenApi.Core/GenericOpenApiExtension.cs similarity index 100% rename from src/OpenApi/GenericOpenApiExtension.cs rename to src/Microsoft.OpenApi.Core/GenericOpenApiExtension.cs diff --git a/src/OpenApi/Header.cs b/src/Microsoft.OpenApi.Core/Header.cs similarity index 100% rename from src/OpenApi/Header.cs rename to src/Microsoft.OpenApi.Core/Header.cs diff --git a/src/OpenApi/IOpenApiExtension.cs b/src/Microsoft.OpenApi.Core/IOpenApiExtension.cs similarity index 100% rename from src/OpenApi/IOpenApiExtension.cs rename to src/Microsoft.OpenApi.Core/IOpenApiExtension.cs diff --git a/src/OpenApi/IReference.cs b/src/Microsoft.OpenApi.Core/IReference.cs similarity index 100% rename from src/OpenApi/IReference.cs rename to src/Microsoft.OpenApi.Core/IReference.cs diff --git a/src/OpenApi/IReferenceService.cs b/src/Microsoft.OpenApi.Core/IReferenceService.cs similarity index 100% rename from src/OpenApi/IReferenceService.cs rename to src/Microsoft.OpenApi.Core/IReferenceService.cs diff --git a/src/OpenApi/Info.cs b/src/Microsoft.OpenApi.Core/Info.cs similarity index 100% rename from src/OpenApi/Info.cs rename to src/Microsoft.OpenApi.Core/Info.cs diff --git a/src/OpenApi/JsonPointer.cs b/src/Microsoft.OpenApi.Core/JsonPointer.cs similarity index 100% rename from src/OpenApi/JsonPointer.cs rename to src/Microsoft.OpenApi.Core/JsonPointer.cs diff --git a/src/OpenApi/License.cs b/src/Microsoft.OpenApi.Core/License.cs similarity index 100% rename from src/OpenApi/License.cs rename to src/Microsoft.OpenApi.Core/License.cs diff --git a/src/OpenApi/Link.cs b/src/Microsoft.OpenApi.Core/Link.cs similarity index 100% rename from src/OpenApi/Link.cs rename to src/Microsoft.OpenApi.Core/Link.cs diff --git a/src/OpenApi/MediaType.cs b/src/Microsoft.OpenApi.Core/MediaType.cs similarity index 100% rename from src/OpenApi/MediaType.cs rename to src/Microsoft.OpenApi.Core/MediaType.cs diff --git a/src/OpenApi/OpenApi.csproj b/src/Microsoft.OpenApi.Core/Microsoft.OpenApi.Core.csproj similarity index 100% rename from src/OpenApi/OpenApi.csproj rename to src/Microsoft.OpenApi.Core/Microsoft.OpenApi.Core.csproj diff --git a/src/OpenApi/OpenApiDocument.cs b/src/Microsoft.OpenApi.Core/OpenApiDocument.cs similarity index 100% rename from src/OpenApi/OpenApiDocument.cs rename to src/Microsoft.OpenApi.Core/OpenApiDocument.cs diff --git a/src/OpenApi/OpenApiReference.cs b/src/Microsoft.OpenApi.Core/OpenApiReference.cs similarity index 100% rename from src/OpenApi/OpenApiReference.cs rename to src/Microsoft.OpenApi.Core/OpenApiReference.cs diff --git a/src/OpenApi/Operation.cs b/src/Microsoft.OpenApi.Core/Operation.cs similarity index 100% rename from src/OpenApi/Operation.cs rename to src/Microsoft.OpenApi.Core/Operation.cs diff --git a/src/OpenApi/OperationType.cs b/src/Microsoft.OpenApi.Core/OperationType.cs similarity index 100% rename from src/OpenApi/OperationType.cs rename to src/Microsoft.OpenApi.Core/OperationType.cs diff --git a/src/OpenApi/Parameter.cs b/src/Microsoft.OpenApi.Core/Parameter.cs similarity index 100% rename from src/OpenApi/Parameter.cs rename to src/Microsoft.OpenApi.Core/Parameter.cs diff --git a/src/OpenApi/PathItem.cs b/src/Microsoft.OpenApi.Core/PathItem.cs similarity index 100% rename from src/OpenApi/PathItem.cs rename to src/Microsoft.OpenApi.Core/PathItem.cs diff --git a/src/OpenApi/Paths.cs b/src/Microsoft.OpenApi.Core/Paths.cs similarity index 100% rename from src/OpenApi/Paths.cs rename to src/Microsoft.OpenApi.Core/Paths.cs diff --git a/src/OpenApi/RequestBody.cs b/src/Microsoft.OpenApi.Core/RequestBody.cs similarity index 100% rename from src/OpenApi/RequestBody.cs rename to src/Microsoft.OpenApi.Core/RequestBody.cs diff --git a/src/OpenApi/Response.cs b/src/Microsoft.OpenApi.Core/Response.cs similarity index 100% rename from src/OpenApi/Response.cs rename to src/Microsoft.OpenApi.Core/Response.cs diff --git a/src/OpenApi/RuntimeExpression.cs b/src/Microsoft.OpenApi.Core/RuntimeExpression.cs similarity index 100% rename from src/OpenApi/RuntimeExpression.cs rename to src/Microsoft.OpenApi.Core/RuntimeExpression.cs diff --git a/src/OpenApi/Schema.cs b/src/Microsoft.OpenApi.Core/Schema.cs similarity index 100% rename from src/OpenApi/Schema.cs rename to src/Microsoft.OpenApi.Core/Schema.cs diff --git a/src/OpenApi/SecurityRequirement.cs b/src/Microsoft.OpenApi.Core/SecurityRequirement.cs similarity index 100% rename from src/OpenApi/SecurityRequirement.cs rename to src/Microsoft.OpenApi.Core/SecurityRequirement.cs diff --git a/src/OpenApi/SecurityScheme.cs b/src/Microsoft.OpenApi.Core/SecurityScheme.cs similarity index 100% rename from src/OpenApi/SecurityScheme.cs rename to src/Microsoft.OpenApi.Core/SecurityScheme.cs diff --git a/src/OpenApi/Server.cs b/src/Microsoft.OpenApi.Core/Server.cs similarity index 100% rename from src/OpenApi/Server.cs rename to src/Microsoft.OpenApi.Core/Server.cs diff --git a/src/OpenApi/ServerVariable.cs b/src/Microsoft.OpenApi.Core/ServerVariable.cs similarity index 100% rename from src/OpenApi/ServerVariable.cs rename to src/Microsoft.OpenApi.Core/ServerVariable.cs diff --git a/src/OpenApi/Sevices/OpenAPIDiff.cs b/src/Microsoft.OpenApi.Core/Sevices/OpenAPIDiff.cs similarity index 100% rename from src/OpenApi/Sevices/OpenAPIDiff.cs rename to src/Microsoft.OpenApi.Core/Sevices/OpenAPIDiff.cs diff --git a/src/OpenApi/Sevices/OpenApiValidator.cs b/src/Microsoft.OpenApi.Core/Sevices/OpenApiValidator.cs similarity index 100% rename from src/OpenApi/Sevices/OpenApiValidator.cs rename to src/Microsoft.OpenApi.Core/Sevices/OpenApiValidator.cs diff --git a/src/OpenApi/Sevices/OpenApiVisitorBase.cs b/src/Microsoft.OpenApi.Core/Sevices/OpenApiVisitorBase.cs similarity index 100% rename from src/OpenApi/Sevices/OpenApiVisitorBase.cs rename to src/Microsoft.OpenApi.Core/Sevices/OpenApiVisitorBase.cs diff --git a/src/OpenApi/Sevices/OpenApiWalker.cs b/src/Microsoft.OpenApi.Core/Sevices/OpenApiWalker.cs similarity index 100% rename from src/OpenApi/Sevices/OpenApiWalker.cs rename to src/Microsoft.OpenApi.Core/Sevices/OpenApiWalker.cs diff --git a/src/OpenApi/Tag.cs b/src/Microsoft.OpenApi.Core/Tag.cs similarity index 100% rename from src/OpenApi/Tag.cs rename to src/Microsoft.OpenApi.Core/Tag.cs diff --git a/src/OpenApi/Writers/IOpenApiWriter.cs b/src/Microsoft.OpenApi.Core/Writers/IOpenApiWriter.cs similarity index 100% rename from src/OpenApi/Writers/IOpenApiWriter.cs rename to src/Microsoft.OpenApi.Core/Writers/IOpenApiWriter.cs diff --git a/src/OpenApi/Writers/IParseNodeWriter.cs b/src/Microsoft.OpenApi.Core/Writers/IParseNodeWriter.cs similarity index 100% rename from src/OpenApi/Writers/IParseNodeWriter.cs rename to src/Microsoft.OpenApi.Core/Writers/IParseNodeWriter.cs diff --git a/src/OpenApi/Writers/IReferenceExtensions.cs b/src/Microsoft.OpenApi.Core/Writers/IReferenceExtensions.cs similarity index 100% rename from src/OpenApi/Writers/IReferenceExtensions.cs rename to src/Microsoft.OpenApi.Core/Writers/IReferenceExtensions.cs diff --git a/src/OpenApi/Writers/JsonParseNodeWriter.cs b/src/Microsoft.OpenApi.Core/Writers/JsonParseNodeWriter.cs similarity index 100% rename from src/OpenApi/Writers/JsonParseNodeWriter.cs rename to src/Microsoft.OpenApi.Core/Writers/JsonParseNodeWriter.cs diff --git a/src/OpenApi/Writers/OpenApiV2Writer.cs b/src/Microsoft.OpenApi.Core/Writers/OpenApiV2Writer.cs similarity index 100% rename from src/OpenApi/Writers/OpenApiV2Writer.cs rename to src/Microsoft.OpenApi.Core/Writers/OpenApiV2Writer.cs diff --git a/src/OpenApi/Writers/OpenApiV3Writer.cs b/src/Microsoft.OpenApi.Core/Writers/OpenApiV3Writer.cs similarity index 100% rename from src/OpenApi/Writers/OpenApiV3Writer.cs rename to src/Microsoft.OpenApi.Core/Writers/OpenApiV3Writer.cs diff --git a/src/OpenApi/Writers/WriterExtensions.cs b/src/Microsoft.OpenApi.Core/Writers/WriterExtensions.cs similarity index 100% rename from src/OpenApi/Writers/WriterExtensions.cs rename to src/Microsoft.OpenApi.Core/Writers/WriterExtensions.cs diff --git a/src/OpenApi/Writers/YamlParseNodeWriter.cs b/src/Microsoft.OpenApi.Core/Writers/YamlParseNodeWriter.cs similarity index 100% rename from src/OpenApi/Writers/YamlParseNodeWriter.cs rename to src/Microsoft.OpenApi.Core/Writers/YamlParseNodeWriter.cs diff --git a/src/OpenApi.Readers/ListNode.cs b/src/Microsoft.OpenApi.Readers/ListNode.cs similarity index 100% rename from src/OpenApi.Readers/ListNode.cs rename to src/Microsoft.OpenApi.Readers/ListNode.cs diff --git a/src/OpenApi.Readers/MapNode.cs b/src/Microsoft.OpenApi.Readers/MapNode.cs similarity index 100% rename from src/OpenApi.Readers/MapNode.cs rename to src/Microsoft.OpenApi.Readers/MapNode.cs diff --git a/src/OpenApi.Readers/OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj similarity index 83% rename from src/OpenApi.Readers/OpenApi.Readers.csproj rename to src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj index f87d15ba1..87080ce9d 100644 --- a/src/OpenApi.Readers/OpenApi.Readers.csproj +++ b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/OpenApi.Readers/OpenApiError.cs b/src/Microsoft.OpenApi.Readers/OpenApiError.cs similarity index 100% rename from src/OpenApi.Readers/OpenApiError.cs rename to src/Microsoft.OpenApi.Readers/OpenApiError.cs diff --git a/src/OpenApi.Readers/OpenApiParser.cs b/src/Microsoft.OpenApi.Readers/OpenApiParser.cs similarity index 100% rename from src/OpenApi.Readers/OpenApiParser.cs rename to src/Microsoft.OpenApi.Readers/OpenApiParser.cs diff --git a/src/OpenApi.Readers/OpenApiV2Reader.cs b/src/Microsoft.OpenApi.Readers/OpenApiV2Reader.cs similarity index 100% rename from src/OpenApi.Readers/OpenApiV2Reader.cs rename to src/Microsoft.OpenApi.Readers/OpenApiV2Reader.cs diff --git a/src/OpenApi.Readers/OpenApiV3Reader.cs b/src/Microsoft.OpenApi.Readers/OpenApiV3Reader.cs similarity index 100% rename from src/OpenApi.Readers/OpenApiV3Reader.cs rename to src/Microsoft.OpenApi.Readers/OpenApiV3Reader.cs diff --git a/src/OpenApi.Readers/ParseNodes.cs b/src/Microsoft.OpenApi.Readers/ParseNodes.cs similarity index 100% rename from src/OpenApi.Readers/ParseNodes.cs rename to src/Microsoft.OpenApi.Readers/ParseNodes.cs diff --git a/src/OpenApi.Readers/ParsingContext.cs b/src/Microsoft.OpenApi.Readers/ParsingContext.cs similarity index 100% rename from src/OpenApi.Readers/ParsingContext.cs rename to src/Microsoft.OpenApi.Readers/ParsingContext.cs diff --git a/src/OpenApi.Readers/PropertyNode.cs b/src/Microsoft.OpenApi.Readers/PropertyNode.cs similarity index 100% rename from src/OpenApi.Readers/PropertyNode.cs rename to src/Microsoft.OpenApi.Readers/PropertyNode.cs diff --git a/src/OpenApi.Readers/ReferenceService.cs b/src/Microsoft.OpenApi.Readers/ReferenceService.cs similarity index 100% rename from src/OpenApi.Readers/ReferenceService.cs rename to src/Microsoft.OpenApi.Readers/ReferenceService.cs diff --git a/src/OpenApi.Readers/RootNode.cs b/src/Microsoft.OpenApi.Readers/RootNode.cs similarity index 100% rename from src/OpenApi.Readers/RootNode.cs rename to src/Microsoft.OpenApi.Readers/RootNode.cs diff --git a/src/OpenApi.Readers/ValueNode.cs b/src/Microsoft.OpenApi.Readers/ValueNode.cs similarity index 100% rename from src/OpenApi.Readers/ValueNode.cs rename to src/Microsoft.OpenApi.Readers/ValueNode.cs diff --git a/src/OpenApi.Readers/YamlHelper.cs b/src/Microsoft.OpenApi.Readers/YamlHelper.cs similarity index 100% rename from src/OpenApi.Readers/YamlHelper.cs rename to src/Microsoft.OpenApi.Readers/YamlHelper.cs diff --git a/src/OpenApiWorkbench/App.config b/src/Microsoft.OpenApi.Workbench/App.config similarity index 100% rename from src/OpenApiWorkbench/App.config rename to src/Microsoft.OpenApi.Workbench/App.config diff --git a/src/OpenApiWorkbench/App.xaml b/src/Microsoft.OpenApi.Workbench/App.xaml similarity index 100% rename from src/OpenApiWorkbench/App.xaml rename to src/Microsoft.OpenApi.Workbench/App.xaml diff --git a/src/OpenApiWorkbench/App.xaml.cs b/src/Microsoft.OpenApi.Workbench/App.xaml.cs similarity index 100% rename from src/OpenApiWorkbench/App.xaml.cs rename to src/Microsoft.OpenApi.Workbench/App.xaml.cs diff --git a/src/OpenApiWorkbench/MainModel.cs b/src/Microsoft.OpenApi.Workbench/MainModel.cs similarity index 100% rename from src/OpenApiWorkbench/MainModel.cs rename to src/Microsoft.OpenApi.Workbench/MainModel.cs diff --git a/src/OpenApiWorkbench/MainWindow.xaml b/src/Microsoft.OpenApi.Workbench/MainWindow.xaml similarity index 100% rename from src/OpenApiWorkbench/MainWindow.xaml rename to src/Microsoft.OpenApi.Workbench/MainWindow.xaml diff --git a/src/OpenApiWorkbench/MainWindow.xaml.cs b/src/Microsoft.OpenApi.Workbench/MainWindow.xaml.cs similarity index 100% rename from src/OpenApiWorkbench/MainWindow.xaml.cs rename to src/Microsoft.OpenApi.Workbench/MainWindow.xaml.cs diff --git a/src/OpenApiWorkbench/OpenApiWorkbench.csproj b/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj similarity index 95% rename from src/OpenApiWorkbench/OpenApiWorkbench.csproj rename to src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj index e8eb1de16..8a0935c37 100644 --- a/src/OpenApiWorkbench/OpenApiWorkbench.csproj +++ b/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj @@ -122,13 +122,13 @@ - + {79933258-0126-4382-8755-d50820ecc483} - OpenApi.Readers + Microsoft.OpenApi.Readers - + {a8e50143-69b2-472a-9d45-3f9a05d13202} - OpenApi + Microsoft.OpenApi.Core diff --git a/src/OpenApiWorkbench/Properties/AssemblyInfo.cs b/src/Microsoft.OpenApi.Workbench/Properties/AssemblyInfo.cs similarity index 100% rename from src/OpenApiWorkbench/Properties/AssemblyInfo.cs rename to src/Microsoft.OpenApi.Workbench/Properties/AssemblyInfo.cs diff --git a/src/OpenApiWorkbench/Properties/Resources.Designer.cs b/src/Microsoft.OpenApi.Workbench/Properties/Resources.Designer.cs similarity index 100% rename from src/OpenApiWorkbench/Properties/Resources.Designer.cs rename to src/Microsoft.OpenApi.Workbench/Properties/Resources.Designer.cs diff --git a/src/OpenApiWorkbench/Properties/Resources.resx b/src/Microsoft.OpenApi.Workbench/Properties/Resources.resx similarity index 100% rename from src/OpenApiWorkbench/Properties/Resources.resx rename to src/Microsoft.OpenApi.Workbench/Properties/Resources.resx diff --git a/src/OpenApiWorkbench/Properties/Settings.Designer.cs b/src/Microsoft.OpenApi.Workbench/Properties/Settings.Designer.cs similarity index 100% rename from src/OpenApiWorkbench/Properties/Settings.Designer.cs rename to src/Microsoft.OpenApi.Workbench/Properties/Settings.Designer.cs diff --git a/src/OpenApiWorkbench/Properties/Settings.settings b/src/Microsoft.OpenApi.Workbench/Properties/Settings.settings similarity index 100% rename from src/OpenApiWorkbench/Properties/Settings.settings rename to src/Microsoft.OpenApi.Workbench/Properties/Settings.settings diff --git a/src/OpenApiWorkbench/Themes/Metro/HowToApplyTheme.txt b/src/Microsoft.OpenApi.Workbench/Themes/Metro/HowToApplyTheme.txt similarity index 100% rename from src/OpenApiWorkbench/Themes/Metro/HowToApplyTheme.txt rename to src/Microsoft.OpenApi.Workbench/Themes/Metro/HowToApplyTheme.txt diff --git a/src/OpenApiWorkbench/Themes/Metro/Metro.MSControls.Core.Implicit.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Core.Implicit.xaml similarity index 100% rename from src/OpenApiWorkbench/Themes/Metro/Metro.MSControls.Core.Implicit.xaml rename to src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Core.Implicit.xaml diff --git a/src/OpenApiWorkbench/Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml similarity index 100% rename from src/OpenApiWorkbench/Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml rename to src/Microsoft.OpenApi.Workbench/Themes/Metro/Metro.MSControls.Toolkit.Implicit.xaml diff --git a/src/OpenApiWorkbench/Themes/Metro/Styles.Shared.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.Shared.xaml similarity index 100% rename from src/OpenApiWorkbench/Themes/Metro/Styles.Shared.xaml rename to src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.Shared.xaml diff --git a/src/OpenApiWorkbench/Themes/Metro/Styles.WPF.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.WPF.xaml similarity index 100% rename from src/OpenApiWorkbench/Themes/Metro/Styles.WPF.xaml rename to src/Microsoft.OpenApi.Workbench/Themes/Metro/Styles.WPF.xaml diff --git a/src/OpenApiWorkbench/Themes/Metro/Theme.Colors.xaml b/src/Microsoft.OpenApi.Workbench/Themes/Metro/Theme.Colors.xaml similarity index 100% rename from src/OpenApiWorkbench/Themes/Metro/Theme.Colors.xaml rename to src/Microsoft.OpenApi.Workbench/Themes/Metro/Theme.Colors.xaml diff --git a/src/OpenApi.Tests/ExampleTests.cs b/test/Microsoft.OpenApi.Core.Tests/ExampleTests.cs similarity index 100% rename from src/OpenApi.Tests/ExampleTests.cs rename to test/Microsoft.OpenApi.Core.Tests/ExampleTests.cs diff --git a/src/OpenApi.Tests/OpenApi.Tests.csproj b/test/Microsoft.OpenApi.Core.Tests/Microsoft.OpenApi.Core.Tests.csproj similarity index 87% rename from src/OpenApi.Tests/OpenApi.Tests.csproj rename to test/Microsoft.OpenApi.Core.Tests/Microsoft.OpenApi.Core.Tests.csproj index 1bec41d6d..b1228743b 100644 --- a/src/OpenApi.Tests/OpenApi.Tests.csproj +++ b/test/Microsoft.OpenApi.Core.Tests/Microsoft.OpenApi.Core.Tests.csproj @@ -9,8 +9,9 @@ Properties OpenApi.Tests OpenApi.Tests - v4.6.2 + v4.6.1 512 + true @@ -46,13 +47,13 @@ - + {79933258-0126-4382-8755-D50820ECC483} - OpenApi.Readers + Microsoft.OpenApi.Readers - + {a8e50143-69b2-472a-9d45-3f9a05d13202} - OpenApi + Microsoft.OpenApi.Core diff --git a/src/OpenApi.Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Core.Tests/OpenApiDocumentTests.cs similarity index 100% rename from src/OpenApi.Tests/OpenApiDocumentTests.cs rename to test/Microsoft.OpenApi.Core.Tests/OpenApiDocumentTests.cs diff --git a/src/OpenApi.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.OpenApi.Core.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/OpenApi.Tests/Properties/AssemblyInfo.cs rename to test/Microsoft.OpenApi.Core.Tests/Properties/AssemblyInfo.cs diff --git a/src/OpenApi.Tests/ValidationTests.cs b/test/Microsoft.OpenApi.Core.Tests/ValidationTests.cs similarity index 100% rename from src/OpenApi.Tests/ValidationTests.cs rename to test/Microsoft.OpenApi.Core.Tests/ValidationTests.cs diff --git a/src/OpenApi.Readers.Tests/BasicTests.cs b/test/Microsoft.OpenApi.Readers.Tests/BasicTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/BasicTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/BasicTests.cs diff --git a/src/OpenApi.Readers.Tests/CallbackTests.cs b/test/Microsoft.OpenApi.Readers.Tests/CallbackTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/CallbackTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/CallbackTests.cs diff --git a/src/OpenApi.Readers.Tests/DownGradeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/DownGradeTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/DownGradeTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/DownGradeTests.cs diff --git a/src/OpenApi.Readers.Tests/FixtureTests.cs b/test/Microsoft.OpenApi.Readers.Tests/FixtureTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/FixtureTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/FixtureTests.cs diff --git a/src/OpenApi.Readers.Tests/InfoTests.cs b/test/Microsoft.OpenApi.Readers.Tests/InfoTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/InfoTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/InfoTests.cs diff --git a/src/OpenApi.Readers.Tests/JsonWriterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/JsonWriterTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/JsonWriterTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/JsonWriterTests.cs diff --git a/src/OpenApi.Readers.Tests/OpenApi.Readers.Tests.csproj b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj similarity index 95% rename from src/OpenApi.Readers.Tests/OpenApi.Readers.Tests.csproj rename to test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj index 8cab13648..328c40180 100644 --- a/src/OpenApi.Readers.Tests/OpenApi.Readers.Tests.csproj +++ b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj @@ -97,13 +97,13 @@ - + {79933258-0126-4382-8755-d50820ecc483} - OpenApi.Readers + Microsoft.OpenApi.Readers - + {a8e50143-69b2-472a-9d45-3f9a05d13202} - OpenApi + Microsoft.OpenApi.Core diff --git a/src/OpenApi.Readers.Tests/OAIExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OAIExampleTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/OAIExampleTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/OAIExampleTests.cs diff --git a/src/OpenApi.Readers.Tests/OpenApiReferenceTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiReferenceTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/OpenApiReferenceTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/OpenApiReferenceTests.cs diff --git a/src/OpenApi.Readers.Tests/OperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OperationTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/OperationTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/OperationTests.cs diff --git a/src/OpenApi.Readers.Tests/ParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParameterTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/ParameterTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/ParameterTests.cs diff --git a/src/OpenApi.Readers.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.OpenApi.Readers.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from src/OpenApi.Readers.Tests/Properties/AssemblyInfo.cs rename to test/Microsoft.OpenApi.Readers.Tests/Properties/AssemblyInfo.cs diff --git a/src/OpenApi.Readers.Tests/Samples/BrokenSimplest.yaml b/test/Microsoft.OpenApi.Readers.Tests/Samples/BrokenSimplest.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/Samples/BrokenSimplest.yaml rename to test/Microsoft.OpenApi.Readers.Tests/Samples/BrokenSimplest.yaml diff --git a/src/OpenApi.Readers.Tests/Samples/CallbackSample.yaml b/test/Microsoft.OpenApi.Readers.Tests/Samples/CallbackSample.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/Samples/CallbackSample.yaml rename to test/Microsoft.OpenApi.Readers.Tests/Samples/CallbackSample.yaml diff --git a/src/OpenApi.Readers.Tests/Samples/CallbackSampleWithRef.yaml b/test/Microsoft.OpenApi.Readers.Tests/Samples/CallbackSampleWithRef.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/Samples/CallbackSampleWithRef.yaml rename to test/Microsoft.OpenApi.Readers.Tests/Samples/CallbackSampleWithRef.yaml diff --git a/src/OpenApi.Readers.Tests/Samples/CompleteHeader.yaml b/test/Microsoft.OpenApi.Readers.Tests/Samples/CompleteHeader.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/Samples/CompleteHeader.yaml rename to test/Microsoft.OpenApi.Readers.Tests/Samples/CompleteHeader.yaml diff --git a/src/OpenApi.Readers.Tests/Samples/MultipleServers.yaml b/test/Microsoft.OpenApi.Readers.Tests/Samples/MultipleServers.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/Samples/MultipleServers.yaml rename to test/Microsoft.OpenApi.Readers.Tests/Samples/MultipleServers.yaml diff --git a/src/OpenApi.Readers.Tests/Samples/Simplest.yaml b/test/Microsoft.OpenApi.Readers.Tests/Samples/Simplest.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/Samples/Simplest.yaml rename to test/Microsoft.OpenApi.Readers.Tests/Samples/Simplest.yaml diff --git a/src/OpenApi.Readers.Tests/Samples/petstore30.yaml b/test/Microsoft.OpenApi.Readers.Tests/Samples/petstore30.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/Samples/petstore30.yaml rename to test/Microsoft.OpenApi.Readers.Tests/Samples/petstore30.yaml diff --git a/src/OpenApi.Readers.Tests/SchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/SchemaTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/SchemaTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/SchemaTests.cs diff --git a/src/OpenApi.Readers.Tests/V2Tests/V2Samples/host.2.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/host.2.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/V2Tests/V2Samples/host.2.yaml rename to test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/host.2.yaml diff --git a/src/OpenApi.Readers.Tests/V2Tests/V2Samples/host.3.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/host.3.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/V2Tests/V2Samples/host.3.yaml rename to test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/host.3.yaml diff --git a/src/OpenApi.Readers.Tests/V2Tests/V2Samples/parameterref2.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/parameterref2.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/V2Tests/V2Samples/parameterref2.yaml rename to test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/parameterref2.yaml diff --git a/src/OpenApi.Readers.Tests/V2Tests/V2Samples/petstore.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/petstore.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/V2Tests/V2Samples/petstore.yaml rename to test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/petstore.yaml diff --git a/src/OpenApi.Readers.Tests/V2Tests/V2Samples/simplest.2.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/simplest.2.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/V2Tests/V2Samples/simplest.2.yaml rename to test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/simplest.2.yaml diff --git a/src/OpenApi.Readers.Tests/V2Tests/V2Samples/simplest.3.yaml b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/simplest.3.yaml similarity index 100% rename from src/OpenApi.Readers.Tests/V2Tests/V2Samples/simplest.3.yaml rename to test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Samples/simplest.3.yaml diff --git a/src/OpenApi.Readers.Tests/V2Tests/V2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Tests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/V2Tests/V2Tests.cs rename to test/Microsoft.OpenApi.Readers.Tests/V2Tests/V2Tests.cs diff --git a/src/OpenApi.Readers.Tests/YamlWriterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/YamlWriterTests.cs similarity index 100% rename from src/OpenApi.Readers.Tests/YamlWriterTests.cs rename to test/Microsoft.OpenApi.Readers.Tests/YamlWriterTests.cs diff --git a/src/OpenApi.Readers.Tests/packages.config b/test/Microsoft.OpenApi.Readers.Tests/packages.config similarity index 100% rename from src/OpenApi.Readers.Tests/packages.config rename to test/Microsoft.OpenApi.Readers.Tests/packages.config From 5ec487c9a80e1d471ecf6dd35989a874d1211009 Mon Sep 17 00:00:00 2001 From: Sam Date: Fri, 13 Oct 2017 15:25:56 -0700 Subject: [PATCH 2/2] remove the .core suffix --- Microsoft.OpenApi.sln | 4 ++-- build.cmd | 2 +- .../Microsoft.OpenApi.Readers.csproj | 5 +++-- .../Microsoft.OpenApi.Workbench.csproj | 6 +++--- .../Callback.cs | 0 .../Components.cs | 0 .../Contact.cs | 0 .../DomainParseException.cs | 0 .../Example.cs | 0 .../ExternalDocs.cs | 0 .../GenericOpenApiExtension.cs | 0 src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Header.cs | 0 .../IOpenApiExtension.cs | 0 .../IReference.cs | 0 .../IReferenceService.cs | 0 src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Info.cs | 0 .../JsonPointer.cs | 0 .../License.cs | 0 src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Link.cs | 0 .../MediaType.cs | 0 .../Microsoft.OpenApi.csproj} | 0 .../OpenApiDocument.cs | 0 .../OpenApiReference.cs | 0 .../Operation.cs | 0 .../OperationType.cs | 0 .../Parameter.cs | 0 .../PathItem.cs | 0 src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Paths.cs | 0 .../RequestBody.cs | 0 .../Response.cs | 0 .../RuntimeExpression.cs | 0 src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Schema.cs | 0 .../SecurityRequirement.cs | 0 .../SecurityScheme.cs | 0 src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Server.cs | 0 .../ServerVariable.cs | 0 .../Sevices/OpenAPIDiff.cs | 0 .../Sevices/OpenApiValidator.cs | 0 .../Sevices/OpenApiVisitorBase.cs | 0 .../Sevices/OpenApiWalker.cs | 0 src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Tag.cs | 0 .../Writers/IOpenApiWriter.cs | 0 .../Writers/IParseNodeWriter.cs | 0 .../Writers/IReferenceExtensions.cs | 0 .../Writers/JsonParseNodeWriter.cs | 0 .../Writers/OpenApiV2Writer.cs | 0 .../Writers/OpenApiV3Writer.cs | 0 .../Writers/WriterExtensions.cs | 0 .../Writers/YamlParseNodeWriter.cs | 0 .../Microsoft.OpenApi.Readers.Tests.csproj | 6 +++--- .../ExampleTests.cs | 0 .../Microsoft.OpenApi.Tests.csproj} | 6 +++--- .../OpenApiDocumentTests.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../ValidationTests.cs | 0 55 files changed, 15 insertions(+), 14 deletions(-) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Callback.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Components.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Contact.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/DomainParseException.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Example.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/ExternalDocs.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/GenericOpenApiExtension.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Header.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/IOpenApiExtension.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/IReference.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/IReferenceService.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Info.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/JsonPointer.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/License.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Link.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/MediaType.cs (100%) rename src/{Microsoft.OpenApi.Core/Microsoft.OpenApi.Core.csproj => Microsoft.OpenApi/Microsoft.OpenApi.csproj} (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/OpenApiDocument.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/OpenApiReference.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Operation.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/OperationType.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Parameter.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/PathItem.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Paths.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/RequestBody.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Response.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/RuntimeExpression.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Schema.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/SecurityRequirement.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/SecurityScheme.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Server.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/ServerVariable.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Sevices/OpenAPIDiff.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Sevices/OpenApiValidator.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Sevices/OpenApiVisitorBase.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Sevices/OpenApiWalker.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Tag.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Writers/IOpenApiWriter.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Writers/IParseNodeWriter.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Writers/IReferenceExtensions.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Writers/JsonParseNodeWriter.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Writers/OpenApiV2Writer.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Writers/OpenApiV3Writer.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Writers/WriterExtensions.cs (100%) rename src/{Microsoft.OpenApi.Core => Microsoft.OpenApi}/Writers/YamlParseNodeWriter.cs (100%) rename test/{Microsoft.OpenApi.Core.Tests => Microsoft.OpenApi.Tests}/ExampleTests.cs (100%) rename test/{Microsoft.OpenApi.Core.Tests/Microsoft.OpenApi.Core.Tests.csproj => Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj} (93%) rename test/{Microsoft.OpenApi.Core.Tests => Microsoft.OpenApi.Tests}/OpenApiDocumentTests.cs (100%) rename test/{Microsoft.OpenApi.Core.Tests => Microsoft.OpenApi.Tests}/Properties/AssemblyInfo.cs (100%) rename test/{Microsoft.OpenApi.Core.Tests => Microsoft.OpenApi.Tests}/ValidationTests.cs (100%) diff --git a/Microsoft.OpenApi.sln b/Microsoft.OpenApi.sln index 8de96bf54..a8c85bdb4 100644 --- a/Microsoft.OpenApi.sln +++ b/Microsoft.OpenApi.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26730.3 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Core", "src\Microsoft.OpenApi.Core\Microsoft.OpenApi.Core.csproj", "{A8E50143-69B2-472A-9D45-3F9A05D13202}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi", "src\Microsoft.OpenApi\Microsoft.OpenApi.csproj", "{A8E50143-69B2-472A-9D45-3F9A05D13202}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4AEDAD90-F854-4940-BFEE-6374CC92CAB0}" ProjectSection(SolutionItems) = preProject @@ -15,7 +15,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Workbench EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.OpenApi.Readers", "src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj", "{79933258-0126-4382-8755-D50820ECC483}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Core.Tests", "test\Microsoft.OpenApi.Core.Tests\Microsoft.OpenApi.Core.Tests.csproj", "{AD83F991-DBF3-4251-8613-9CC54C826964}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Tests", "test\Microsoft.OpenApi.Tests\Microsoft.OpenApi.Tests.csproj", "{AD83F991-DBF3-4251-8613-9CC54C826964}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.OpenApi.Readers.Tests", "test\Microsoft.OpenApi.Readers.Tests\Microsoft.OpenApi.Readers.Tests.csproj", "{1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237}" EndProject diff --git a/build.cmd b/build.cmd index 8d6ce1af6..b741b8a90 100644 --- a/build.cmd +++ b/build.cmd @@ -1,5 +1,5 @@ SET VERSION=0.9.1 -SET PROJ=%~dp0src\Microsoft.OpenApi.Core\Microsoft.OpenApi.Core.csproj +SET PROJ=%~dp0src\Microsoft.OpenApi\Microsoft.OpenApi.csproj msbuild %PROJ% /t:restore /p:Configuration=Release msbuild %PROJ% /t:build /p:Configuration=Release msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts;Version=%VERSION% diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj index 87080ce9d..4778a85eb 100644 --- a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj +++ b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj @@ -1,7 +1,8 @@ - netstandard2.0 + net46; netstandard2.0 + true Microsoft.OpenApi.Readers Microsoft.OpenApi.Readers Microsoft.OpenApi.Readers @@ -13,7 +14,7 @@ - + diff --git a/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj b/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj index 8a0935c37..b0a98672a 100644 --- a/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj +++ b/src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj @@ -6,8 +6,8 @@ AnyCPU {6A5E91E5-0441-46EE-AEB9-8334981B7F08} WinExe - OpenApiWorkbench - OpenApiWorkbench + Microsoft.OpenApi.Workbench + Microsoft.OpenApi.Workbench v4.6.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -126,7 +126,7 @@ {79933258-0126-4382-8755-d50820ecc483} Microsoft.OpenApi.Readers - + {a8e50143-69b2-472a-9d45-3f9a05d13202} Microsoft.OpenApi.Core diff --git a/src/Microsoft.OpenApi.Core/Callback.cs b/src/Microsoft.OpenApi/Callback.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Callback.cs rename to src/Microsoft.OpenApi/Callback.cs diff --git a/src/Microsoft.OpenApi.Core/Components.cs b/src/Microsoft.OpenApi/Components.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Components.cs rename to src/Microsoft.OpenApi/Components.cs diff --git a/src/Microsoft.OpenApi.Core/Contact.cs b/src/Microsoft.OpenApi/Contact.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Contact.cs rename to src/Microsoft.OpenApi/Contact.cs diff --git a/src/Microsoft.OpenApi.Core/DomainParseException.cs b/src/Microsoft.OpenApi/DomainParseException.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/DomainParseException.cs rename to src/Microsoft.OpenApi/DomainParseException.cs diff --git a/src/Microsoft.OpenApi.Core/Example.cs b/src/Microsoft.OpenApi/Example.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Example.cs rename to src/Microsoft.OpenApi/Example.cs diff --git a/src/Microsoft.OpenApi.Core/ExternalDocs.cs b/src/Microsoft.OpenApi/ExternalDocs.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/ExternalDocs.cs rename to src/Microsoft.OpenApi/ExternalDocs.cs diff --git a/src/Microsoft.OpenApi.Core/GenericOpenApiExtension.cs b/src/Microsoft.OpenApi/GenericOpenApiExtension.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/GenericOpenApiExtension.cs rename to src/Microsoft.OpenApi/GenericOpenApiExtension.cs diff --git a/src/Microsoft.OpenApi.Core/Header.cs b/src/Microsoft.OpenApi/Header.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Header.cs rename to src/Microsoft.OpenApi/Header.cs diff --git a/src/Microsoft.OpenApi.Core/IOpenApiExtension.cs b/src/Microsoft.OpenApi/IOpenApiExtension.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/IOpenApiExtension.cs rename to src/Microsoft.OpenApi/IOpenApiExtension.cs diff --git a/src/Microsoft.OpenApi.Core/IReference.cs b/src/Microsoft.OpenApi/IReference.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/IReference.cs rename to src/Microsoft.OpenApi/IReference.cs diff --git a/src/Microsoft.OpenApi.Core/IReferenceService.cs b/src/Microsoft.OpenApi/IReferenceService.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/IReferenceService.cs rename to src/Microsoft.OpenApi/IReferenceService.cs diff --git a/src/Microsoft.OpenApi.Core/Info.cs b/src/Microsoft.OpenApi/Info.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Info.cs rename to src/Microsoft.OpenApi/Info.cs diff --git a/src/Microsoft.OpenApi.Core/JsonPointer.cs b/src/Microsoft.OpenApi/JsonPointer.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/JsonPointer.cs rename to src/Microsoft.OpenApi/JsonPointer.cs diff --git a/src/Microsoft.OpenApi.Core/License.cs b/src/Microsoft.OpenApi/License.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/License.cs rename to src/Microsoft.OpenApi/License.cs diff --git a/src/Microsoft.OpenApi.Core/Link.cs b/src/Microsoft.OpenApi/Link.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Link.cs rename to src/Microsoft.OpenApi/Link.cs diff --git a/src/Microsoft.OpenApi.Core/MediaType.cs b/src/Microsoft.OpenApi/MediaType.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/MediaType.cs rename to src/Microsoft.OpenApi/MediaType.cs diff --git a/src/Microsoft.OpenApi.Core/Microsoft.OpenApi.Core.csproj b/src/Microsoft.OpenApi/Microsoft.OpenApi.csproj similarity index 100% rename from src/Microsoft.OpenApi.Core/Microsoft.OpenApi.Core.csproj rename to src/Microsoft.OpenApi/Microsoft.OpenApi.csproj diff --git a/src/Microsoft.OpenApi.Core/OpenApiDocument.cs b/src/Microsoft.OpenApi/OpenApiDocument.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/OpenApiDocument.cs rename to src/Microsoft.OpenApi/OpenApiDocument.cs diff --git a/src/Microsoft.OpenApi.Core/OpenApiReference.cs b/src/Microsoft.OpenApi/OpenApiReference.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/OpenApiReference.cs rename to src/Microsoft.OpenApi/OpenApiReference.cs diff --git a/src/Microsoft.OpenApi.Core/Operation.cs b/src/Microsoft.OpenApi/Operation.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Operation.cs rename to src/Microsoft.OpenApi/Operation.cs diff --git a/src/Microsoft.OpenApi.Core/OperationType.cs b/src/Microsoft.OpenApi/OperationType.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/OperationType.cs rename to src/Microsoft.OpenApi/OperationType.cs diff --git a/src/Microsoft.OpenApi.Core/Parameter.cs b/src/Microsoft.OpenApi/Parameter.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Parameter.cs rename to src/Microsoft.OpenApi/Parameter.cs diff --git a/src/Microsoft.OpenApi.Core/PathItem.cs b/src/Microsoft.OpenApi/PathItem.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/PathItem.cs rename to src/Microsoft.OpenApi/PathItem.cs diff --git a/src/Microsoft.OpenApi.Core/Paths.cs b/src/Microsoft.OpenApi/Paths.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Paths.cs rename to src/Microsoft.OpenApi/Paths.cs diff --git a/src/Microsoft.OpenApi.Core/RequestBody.cs b/src/Microsoft.OpenApi/RequestBody.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/RequestBody.cs rename to src/Microsoft.OpenApi/RequestBody.cs diff --git a/src/Microsoft.OpenApi.Core/Response.cs b/src/Microsoft.OpenApi/Response.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Response.cs rename to src/Microsoft.OpenApi/Response.cs diff --git a/src/Microsoft.OpenApi.Core/RuntimeExpression.cs b/src/Microsoft.OpenApi/RuntimeExpression.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/RuntimeExpression.cs rename to src/Microsoft.OpenApi/RuntimeExpression.cs diff --git a/src/Microsoft.OpenApi.Core/Schema.cs b/src/Microsoft.OpenApi/Schema.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Schema.cs rename to src/Microsoft.OpenApi/Schema.cs diff --git a/src/Microsoft.OpenApi.Core/SecurityRequirement.cs b/src/Microsoft.OpenApi/SecurityRequirement.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/SecurityRequirement.cs rename to src/Microsoft.OpenApi/SecurityRequirement.cs diff --git a/src/Microsoft.OpenApi.Core/SecurityScheme.cs b/src/Microsoft.OpenApi/SecurityScheme.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/SecurityScheme.cs rename to src/Microsoft.OpenApi/SecurityScheme.cs diff --git a/src/Microsoft.OpenApi.Core/Server.cs b/src/Microsoft.OpenApi/Server.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Server.cs rename to src/Microsoft.OpenApi/Server.cs diff --git a/src/Microsoft.OpenApi.Core/ServerVariable.cs b/src/Microsoft.OpenApi/ServerVariable.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/ServerVariable.cs rename to src/Microsoft.OpenApi/ServerVariable.cs diff --git a/src/Microsoft.OpenApi.Core/Sevices/OpenAPIDiff.cs b/src/Microsoft.OpenApi/Sevices/OpenAPIDiff.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Sevices/OpenAPIDiff.cs rename to src/Microsoft.OpenApi/Sevices/OpenAPIDiff.cs diff --git a/src/Microsoft.OpenApi.Core/Sevices/OpenApiValidator.cs b/src/Microsoft.OpenApi/Sevices/OpenApiValidator.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Sevices/OpenApiValidator.cs rename to src/Microsoft.OpenApi/Sevices/OpenApiValidator.cs diff --git a/src/Microsoft.OpenApi.Core/Sevices/OpenApiVisitorBase.cs b/src/Microsoft.OpenApi/Sevices/OpenApiVisitorBase.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Sevices/OpenApiVisitorBase.cs rename to src/Microsoft.OpenApi/Sevices/OpenApiVisitorBase.cs diff --git a/src/Microsoft.OpenApi.Core/Sevices/OpenApiWalker.cs b/src/Microsoft.OpenApi/Sevices/OpenApiWalker.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Sevices/OpenApiWalker.cs rename to src/Microsoft.OpenApi/Sevices/OpenApiWalker.cs diff --git a/src/Microsoft.OpenApi.Core/Tag.cs b/src/Microsoft.OpenApi/Tag.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Tag.cs rename to src/Microsoft.OpenApi/Tag.cs diff --git a/src/Microsoft.OpenApi.Core/Writers/IOpenApiWriter.cs b/src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Writers/IOpenApiWriter.cs rename to src/Microsoft.OpenApi/Writers/IOpenApiWriter.cs diff --git a/src/Microsoft.OpenApi.Core/Writers/IParseNodeWriter.cs b/src/Microsoft.OpenApi/Writers/IParseNodeWriter.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Writers/IParseNodeWriter.cs rename to src/Microsoft.OpenApi/Writers/IParseNodeWriter.cs diff --git a/src/Microsoft.OpenApi.Core/Writers/IReferenceExtensions.cs b/src/Microsoft.OpenApi/Writers/IReferenceExtensions.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Writers/IReferenceExtensions.cs rename to src/Microsoft.OpenApi/Writers/IReferenceExtensions.cs diff --git a/src/Microsoft.OpenApi.Core/Writers/JsonParseNodeWriter.cs b/src/Microsoft.OpenApi/Writers/JsonParseNodeWriter.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Writers/JsonParseNodeWriter.cs rename to src/Microsoft.OpenApi/Writers/JsonParseNodeWriter.cs diff --git a/src/Microsoft.OpenApi.Core/Writers/OpenApiV2Writer.cs b/src/Microsoft.OpenApi/Writers/OpenApiV2Writer.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Writers/OpenApiV2Writer.cs rename to src/Microsoft.OpenApi/Writers/OpenApiV2Writer.cs diff --git a/src/Microsoft.OpenApi.Core/Writers/OpenApiV3Writer.cs b/src/Microsoft.OpenApi/Writers/OpenApiV3Writer.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Writers/OpenApiV3Writer.cs rename to src/Microsoft.OpenApi/Writers/OpenApiV3Writer.cs diff --git a/src/Microsoft.OpenApi.Core/Writers/WriterExtensions.cs b/src/Microsoft.OpenApi/Writers/WriterExtensions.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Writers/WriterExtensions.cs rename to src/Microsoft.OpenApi/Writers/WriterExtensions.cs diff --git a/src/Microsoft.OpenApi.Core/Writers/YamlParseNodeWriter.cs b/src/Microsoft.OpenApi/Writers/YamlParseNodeWriter.cs similarity index 100% rename from src/Microsoft.OpenApi.Core/Writers/YamlParseNodeWriter.cs rename to src/Microsoft.OpenApi/Writers/YamlParseNodeWriter.cs diff --git a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj index 328c40180..9efbc52b9 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj +++ b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj @@ -8,8 +8,8 @@ {1ED3C2C1-E1E7-4925-B4E6-2D969C3F5237} Library Properties - OpenApiTests - OpenApiTests + Microsoft.OpenApi.Readers.Tests + Microsoft.OpenApi.Readers.Tests v4.6.1 512 @@ -101,7 +101,7 @@ {79933258-0126-4382-8755-d50820ecc483} Microsoft.OpenApi.Readers - + {a8e50143-69b2-472a-9d45-3f9a05d13202} Microsoft.OpenApi.Core diff --git a/test/Microsoft.OpenApi.Core.Tests/ExampleTests.cs b/test/Microsoft.OpenApi.Tests/ExampleTests.cs similarity index 100% rename from test/Microsoft.OpenApi.Core.Tests/ExampleTests.cs rename to test/Microsoft.OpenApi.Tests/ExampleTests.cs diff --git a/test/Microsoft.OpenApi.Core.Tests/Microsoft.OpenApi.Core.Tests.csproj b/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj similarity index 93% rename from test/Microsoft.OpenApi.Core.Tests/Microsoft.OpenApi.Core.Tests.csproj rename to test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj index b1228743b..5224cba38 100644 --- a/test/Microsoft.OpenApi.Core.Tests/Microsoft.OpenApi.Core.Tests.csproj +++ b/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj @@ -7,8 +7,8 @@ {AD83F991-DBF3-4251-8613-9CC54C826964} Library Properties - OpenApi.Tests - OpenApi.Tests + Microsoft.OpenApi.Tests + Microsoft.OpenApi.Tests v4.6.1 512 @@ -51,7 +51,7 @@ {79933258-0126-4382-8755-D50820ECC483} Microsoft.OpenApi.Readers - + {a8e50143-69b2-472a-9d45-3f9a05d13202} Microsoft.OpenApi.Core diff --git a/test/Microsoft.OpenApi.Core.Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/OpenApiDocumentTests.cs similarity index 100% rename from test/Microsoft.OpenApi.Core.Tests/OpenApiDocumentTests.cs rename to test/Microsoft.OpenApi.Tests/OpenApiDocumentTests.cs diff --git a/test/Microsoft.OpenApi.Core.Tests/Properties/AssemblyInfo.cs b/test/Microsoft.OpenApi.Tests/Properties/AssemblyInfo.cs similarity index 100% rename from test/Microsoft.OpenApi.Core.Tests/Properties/AssemblyInfo.cs rename to test/Microsoft.OpenApi.Tests/Properties/AssemblyInfo.cs diff --git a/test/Microsoft.OpenApi.Core.Tests/ValidationTests.cs b/test/Microsoft.OpenApi.Tests/ValidationTests.cs similarity index 100% rename from test/Microsoft.OpenApi.Core.Tests/ValidationTests.cs rename to test/Microsoft.OpenApi.Tests/ValidationTests.cs