From d7625df5b7307632da83be67c243116aab3554ec Mon Sep 17 00:00:00 2001 From: praveenkuttappan <55455725+praveenkuttappan@users.noreply.github.com> Date: Thu, 22 Sep 2022 13:25:41 -0400 Subject: [PATCH] Create pipeline to publish Swagger Api Parser package (#4203) * Create pipeline to publish Swagger Api Parser package --- src/dotnet/APIView/APIView/APIView.csproj | 1 + .../APIView/APIViewWeb/APIViewWeb.csproj | 3 +- .../SwaggerApiParser/SwaggerApiParser.csproj | 36 +++++++++++-------- .../SwaggerApiView/SwaggerApiViewSpec.cs | 1 - .../SwaggerApiParser/SwaggerSpec/Parameter.cs | 2 +- .../SwaggerApiParser/SwaggerSpec/Security.cs | 1 - .../SwaggerSpec/SwaggerTypes.cs | 2 +- .../SwaggerSpec/XMsParameterizedHost.cs | 2 +- .../SwaggerTokenSerializer.cs | 25 ++++++------- .../SwaggerApiParser/TokenSerializer.cs | 2 -- .../SwaggerApiParserTest/SchemaCacheTest.cs | 10 +++--- .../SwaggerAPIViewGeneratorTest.cs | 8 ++--- .../SwaggerAPIViewOperationTest.cs | 0 .../SwaggerAPIViewTest.cs | 0 .../SwaggerApiParserTest.csproj | 2 +- .../SwaggerDeserializerTest.cs | 0 .../TokenSerializerTest.cs | 16 ++++----- .../SwaggerApiParserTest/UtilsTest.cs | 0 .../resource-management/v2/types.json | 0 .../fixtures/communicate.json | 0 .../fixtures/compute.json | 0 .../fixtures/deviceupdate.json | 0 .../fixtures/mediacomposition.json | 0 .../fixtures/mediacompositionsmall.json | 0 .../fixtures/multivariate.json | 0 .../fixtures/petstore.json | 0 .../fixtures/runCommands.json | 0 .../stable/2022-02-01/signalr.json | 0 .../apiview/parsers/swagger-api-parser/ci.yml | 28 +++++++++++++++ .../swagger-api-parser.sln | 6 ++-- 30 files changed, 90 insertions(+), 55 deletions(-) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/SchemaCacheTest.cs (60%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/SwaggerAPIViewGeneratorTest.cs (90%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/SwaggerAPIViewOperationTest.cs (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/SwaggerAPIViewTest.cs (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/SwaggerApiParserTest.csproj (93%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/SwaggerDeserializerTest.cs (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/TokenSerializerTest.cs (77%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/UtilsTest.cs (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/common-types/resource-management/v2/types.json (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/communicate.json (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/compute.json (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/deviceupdate.json (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/mediacomposition.json (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/mediacompositionsmall.json (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/multivariate.json (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/petstore.json (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/runCommands.json (100%) rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/SwaggerApiParserTest/fixtures/signalr/resource-manager/Microsoft.SignalRService/stable/2022-02-01/signalr.json (100%) create mode 100644 tools/apiview/parsers/swagger-api-parser/ci.yml rename tools/apiview/parsers/swagger-api-parser/{SwaggerApiParser => }/swagger-api-parser.sln (88%) diff --git a/src/dotnet/APIView/APIView/APIView.csproj b/src/dotnet/APIView/APIView/APIView.csproj index 8abbbaa06b5..8d6ff21e2d6 100644 --- a/src/dotnet/APIView/APIView/APIView.csproj +++ b/src/dotnet/APIView/APIView/APIView.csproj @@ -6,6 +6,7 @@ Exe Latest + True diff --git a/src/dotnet/APIView/APIViewWeb/APIViewWeb.csproj b/src/dotnet/APIView/APIViewWeb/APIViewWeb.csproj index ae613b4ee82..22c1d9a3ace 100644 --- a/src/dotnet/APIView/APIViewWeb/APIViewWeb.csproj +++ b/src/dotnet/APIView/APIViewWeb/APIViewWeb.csproj @@ -13,6 +13,7 @@ ..\..\..\..\tools\apiview\parsers\js-api-parser\ latest true + False @@ -37,7 +38,7 @@ - + diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParser.csproj b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParser.csproj index 15778eba72e..e64fe5278ad 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParser.csproj +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParser.csproj @@ -1,19 +1,36 @@ - + - 1.0.0-dev.0.1 + 1.0.0-dev.0.2 Exe true swaggerAPIParser net6.0 swagger_api_parser - ./nupkg - 10 + Latest + 1.0.0 + Azure.Sdk.Tools.SwaggerApiParser + True + + + + $(NoWarn);NU5105;NU5119 + + + + $(NoWarn);NU5105;NU5119 - + + + + + + + + @@ -21,15 +38,6 @@ all - - - - - - - - - diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiView/SwaggerApiViewSpec.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiView/SwaggerApiViewSpec.cs index 601e68afc9a..5323dd57475 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiView/SwaggerApiViewSpec.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiView/SwaggerApiViewSpec.cs @@ -1,7 +1,6 @@ using System.Collections.Generic; using ApiView; using APIView; -using Octokit; namespace SwaggerApiParser; diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/Parameter.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/Parameter.cs index e3ea68f513d..6f568c594d7 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/Parameter.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/Parameter.cs @@ -27,7 +27,7 @@ public class Parameter : ITokenSerializable [JsonPropertyName("$ref")] public string Ref { get; set; } - [JsonPropertyName("in")] public string? In { get; set; } + [JsonPropertyName("in")] public string In { get; set; } public bool IsRefObject() { diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/Security.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/Security.cs index 518bcd86c8c..39c718e6fd0 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/Security.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/Security.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Text.Json; -using Newtonsoft.Json.Linq; namespace SwaggerApiParser; diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/SwaggerTypes.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/SwaggerTypes.cs index cc04b58c56b..49c660b4dd5 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/SwaggerTypes.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/SwaggerTypes.cs @@ -113,7 +113,7 @@ public List GetKeywords() public String GetOriginRef() { return ""; - return this.originalRef ?? this.Ref; + //return this.originalRef ?? this.Ref; } diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/XMsParameterizedHost.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/XMsParameterizedHost.cs index 781afebfb27..0c7df561bd6 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/XMsParameterizedHost.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerSpec/XMsParameterizedHost.cs @@ -19,7 +19,7 @@ public CodeFileToken[] TokenSerialize(SerializeContext context) ret.AddRange(TokenSerializer.KeyValueTokens("hostTemplate", hostTemplate, true, context.IteratorPath.CurrentNextPath("hostTemplate"))); } - if (useSchemePrefix != null) + if (useSchemePrefix) { ret.AddRange(TokenSerializer.KeyValueTokens("useSchemePrefix", useSchemePrefix.ToString(), true,context.IteratorPath.CurrentNextPath("useSchemePrefix"))); } diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerTokenSerializer.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerTokenSerializer.cs index f56aca3072f..7728a64ff88 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerTokenSerializer.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerTokenSerializer.cs @@ -8,34 +8,35 @@ using System.Threading.Tasks; using ApiView; using APIView; -using APIViewWeb; namespace SwaggerApiParser { - public class SwaggerTokenSerializer : LanguageService + public class SwaggerTokenSerializer { internal const string LanguageServiceName = "Swagger"; - public override string Name => LanguageServiceName; + public string Name => LanguageServiceName; // This is an unfortunate hack because JsonLanguageService is already // squatting on `.json`. We'll have to fix this before we ask anyone // to use ApiView for swagger files. - public override string Extension => ".swagger"; + public string Extension => ".swagger"; // I don't really know what this is doing, but the other language // services do the same. It'd probably be worth making this the default // implementation if everyone needs to copy it as-is. - public override bool CanUpdate(string versionString) => false; + public bool CanUpdate(string versionString) => false; public async Task GetCodeFileInternalAsync(string originalName, Stream stream, bool runAnalysis) => - SwaggerVisitor.GenerateCodeListing(originalName, await JsonDocument.ParseAsync(stream)); - - + SwaggerVisitor.GenerateCodeListing(originalName, await JsonDocument.ParseAsync(stream)); + + +#pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously public async Task GetCodeFileFromJsonDocumentAsync(string originalName, JsonDocument jsonDoc, bool runAnalysis) => - SwaggerVisitor.GenerateCodeListing(originalName, jsonDoc); - - + SwaggerVisitor.GenerateCodeListing(originalName, jsonDoc); +#pragma warning restore CS1998 // Async method lacks 'await' operators and will run synchronously + + /// /// Generate an ApiView listing for an OpenAPI 2.0 specification in /// JSON. @@ -44,7 +45,7 @@ public async Task GetCodeFileFromJsonDocumentAsync(string originalName /// Stream full of JSON. /// This is unused. /// An ApiView listing. - public override async Task GetCodeFileAsync(string originalName, Stream stream, bool runAnalysis) => + public async Task GetCodeFileAsync(string originalName, Stream stream, bool runAnalysis) => await CodeFile.DeserializeAsync(stream); /// diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/TokenSerializer.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/TokenSerializer.cs index 15a97cd84f5..8352d5f6520 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/TokenSerializer.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/TokenSerializer.cs @@ -97,8 +97,6 @@ public static class TokenSerializer { private const String IntentText = " "; - private static int intentNumber = 0; - public static CodeFileToken[] TokenSerializeAsJson(JsonElement jsonElement, bool isFoldable = false) { List ret = new List(); diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SchemaCacheTest.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SchemaCacheTest.cs similarity index 60% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SchemaCacheTest.cs rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SchemaCacheTest.cs index c1431d0e4e5..f6d16fd5b3f 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SchemaCacheTest.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SchemaCacheTest.cs @@ -27,11 +27,11 @@ public async Task TestResolveSchema() cache.AddSchema(runCommandsFilePath, schema.Key, schema.Value); } - var resolvedSchema = cache.GetResolvedSchema(swaggerSpec.definitions.First().Value, runCommandsFilePath); - this.output.WriteLine(resolvedSchema.ToString()); + //var resolvedSchema = cache.GetResolvedSchema(swaggerSpec.definitions.First().Value, runCommandsFilePath); + // this.output.WriteLine(resolvedSchema.ToString()); - swaggerSpec.definitions.TryGetValue("VirtualMachineRunCommandProperties", out var runCommandProperties); - var resolvedRunCommandProperties = cache.GetResolvedSchema(runCommandProperties, runCommandsFilePath); - this.output.WriteLine(resolvedRunCommandProperties.ToString()); + //swaggerSpec.definitions.TryGetValue("VirtualMachineRunCommandProperties", out var runCommandProperties); + //var resolvedRunCommandProperties = cache.GetResolvedSchema(runCommandProperties, runCommandsFilePath); + //this.output.WriteLine(resolvedRunCommandProperties.ToString()); } } diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerAPIViewGeneratorTest.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerAPIViewGeneratorTest.cs similarity index 90% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerAPIViewGeneratorTest.cs rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerAPIViewGeneratorTest.cs index 14a35db26b5..3da0e2717c0 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerAPIViewGeneratorTest.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerAPIViewGeneratorTest.cs @@ -23,7 +23,7 @@ public async Task TestGenerateSwaggerApiViewRunCommands() const string runCommandsFilePath = "./fixtures/runCommands.json"; var swaggerSpec = await SwaggerDeserializer.Deserialize(runCommandsFilePath); var apiViewGenerator = new SwaggerApiViewGenerator(); - SchemaCache schemaCache = new SchemaCache(); + /*SchemaCache schemaCache = new SchemaCache(); var apiView = SwaggerApiViewGenerator.GenerateSwaggerApiView(swaggerSpec, "runCommands.json", schemaCache, "Microsoft.Compute"); Assert.Equal("2.0", apiView.SwaggerApiViewGeneral.swagger); @@ -35,7 +35,7 @@ public async Task TestGenerateSwaggerApiViewRunCommands() this.output.WriteLine($"Write result to: {outputFilePath}"); await using FileStream writer = File.Open(outputFilePath, FileMode.Create); - await codeFile.SerializeAsync(writer); + await codeFile.SerializeAsync(writer);*/ } [Fact] @@ -44,7 +44,7 @@ public async Task TestGenerateSwaggerApiViewCompute() const string runCommandsFilePath = "./fixtures/compute.json"; var swaggerSpec = await SwaggerDeserializer.Deserialize(runCommandsFilePath); var apiViewGenerator = new SwaggerApiViewGenerator(); - SchemaCache schemaCache = new SchemaCache(); + /* SchemaCache schemaCache = new SchemaCache(); var apiView = SwaggerApiViewGenerator.GenerateSwaggerApiView(swaggerSpec, "compute.json", schemaCache, "Microsoft.Compute"); Assert.Equal("2.0", apiView.SwaggerApiViewGeneral.swagger); @@ -55,6 +55,6 @@ public async Task TestGenerateSwaggerApiViewCompute() this.output.WriteLine($"Write result to: {outputFilePath}"); await using FileStream writer = File.Open(outputFilePath, FileMode.Create); - await codeFile.SerializeAsync(writer); + await codeFile.SerializeAsync(writer);*/ } } diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerAPIViewOperationTest.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerAPIViewOperationTest.cs similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerAPIViewOperationTest.cs rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerAPIViewOperationTest.cs diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerAPIViewTest.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerAPIViewTest.cs similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerAPIViewTest.cs rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerAPIViewTest.cs diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerApiParserTest.csproj b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerApiParserTest.csproj similarity index 93% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerApiParserTest.csproj rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerApiParserTest.csproj index db9e1e723d3..551e64910c6 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerApiParserTest.csproj +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerApiParserTest.csproj @@ -23,7 +23,7 @@ - + diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerDeserializerTest.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerDeserializerTest.cs similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/SwaggerDeserializerTest.cs rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/SwaggerDeserializerTest.cs diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/TokenSerializerTest.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/TokenSerializerTest.cs similarity index 77% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/TokenSerializerTest.cs rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/TokenSerializerTest.cs index 3584efa399e..5148dee361e 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/TokenSerializerTest.cs +++ b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/TokenSerializerTest.cs @@ -23,9 +23,9 @@ public Task TestTokenSerializerPrimitiveType() SerializeContext context = new SerializeContext(); var ret = TokenSerializer.TokenSerialize(text, context); - Assert.Equal(CodeFileTokenKind.Whitespace, ret[0].Kind); - Assert.Equal(CodeFileTokenKind.Literal, ret[1].Kind); - Assert.Equal("hello", ret[1].Value); + Assert.Equal(CodeFileTokenKind.Literal, ret[0].Kind); + Assert.Equal(CodeFileTokenKind.Newline, ret[1].Kind); + Assert.Equal("hello", ret[0].Value); return Task.CompletedTask; } @@ -38,11 +38,11 @@ public Task TestTokenSerializerGeneral() var ret = TokenSerializer.TokenSerialize(general, context); // Assert first line format. - Assert.Equal(CodeFileTokenKind.Whitespace, ret[0].Kind); - Assert.Equal(CodeFileTokenKind.Literal, ret[1].Kind); - Assert.Equal("swagger", ret[1].Value); - Assert.Equal(":", ret[2].Value); - Assert.Equal("2.0", ret[3].Value); + Assert.Equal(CodeFileTokenKind.Literal, ret[0].Kind); + Assert.Equal(CodeFileTokenKind.Punctuation, ret[1].Kind); + Assert.Equal("swagger", ret[0].Value); + Assert.Equal(": ", ret[1].Value); + Assert.Equal("2.0", ret[2].Value); return Task.CompletedTask; } diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/UtilsTest.cs b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/UtilsTest.cs similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/UtilsTest.cs rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/UtilsTest.cs diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/common-types/resource-management/v2/types.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/common-types/resource-management/v2/types.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/common-types/resource-management/v2/types.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/common-types/resource-management/v2/types.json diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/communicate.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/communicate.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/communicate.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/communicate.json diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/compute.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/compute.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/compute.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/compute.json diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/deviceupdate.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/deviceupdate.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/deviceupdate.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/deviceupdate.json diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/mediacomposition.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/mediacomposition.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/mediacomposition.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/mediacomposition.json diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/mediacompositionsmall.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/mediacompositionsmall.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/mediacompositionsmall.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/mediacompositionsmall.json diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/multivariate.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/multivariate.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/multivariate.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/multivariate.json diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/petstore.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/petstore.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/petstore.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/petstore.json diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/runCommands.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/runCommands.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/runCommands.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/runCommands.json diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/signalr/resource-manager/Microsoft.SignalRService/stable/2022-02-01/signalr.json b/tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/signalr/resource-manager/Microsoft.SignalRService/stable/2022-02-01/signalr.json similarity index 100% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParserTest/fixtures/signalr/resource-manager/Microsoft.SignalRService/stable/2022-02-01/signalr.json rename to tools/apiview/parsers/swagger-api-parser/SwaggerApiParserTest/fixtures/signalr/resource-manager/Microsoft.SignalRService/stable/2022-02-01/signalr.json diff --git a/tools/apiview/parsers/swagger-api-parser/ci.yml b/tools/apiview/parsers/swagger-api-parser/ci.yml new file mode 100644 index 00000000000..e4fbef0d016 --- /dev/null +++ b/tools/apiview/parsers/swagger-api-parser/ci.yml @@ -0,0 +1,28 @@ +# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file. +trigger: + branches: + include: + - main + - feature/* + - release/* + - hotfix/* + paths: + include: + - tools/apiview/parsers/swagger-api-parser/SwaggerApiParser + +pr: + branches: + include: + - main + - feature/* + - release/* + - hotfix/* + paths: + include: + - tools/apiview/parsers/swagger-api-parser/SwaggerApiParser + +extends: + template: /eng/pipelines/templates/stages/archetype-sdk-tool-dotnet.yml + parameters: + ToolDirectory: tools/apiview/parsers/swagger-api-parser/SwaggerApiParser + SkipDotNetInstall: true diff --git a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/swagger-api-parser.sln b/tools/apiview/parsers/swagger-api-parser/swagger-api-parser.sln similarity index 88% rename from tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/swagger-api-parser.sln rename to tools/apiview/parsers/swagger-api-parser/swagger-api-parser.sln index 29d875216b0..de3ee922fb8 100644 --- a/tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/swagger-api-parser.sln +++ b/tools/apiview/parsers/swagger-api-parser/swagger-api-parser.sln @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwaggerApiParser", "SwaggerApiParser.csproj", "{0444F9A1-1230-49B0-B280-D2B887F14EFD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwaggerApiParser", "SwaggerApiParser\SwaggerApiParser.csproj", "{0444F9A1-1230-49B0-B280-D2B887F14EFD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "APIViewWeb", "..\..\..\..\..\src\dotnet\APIView\APIViewWeb\APIViewWeb.csproj", "{04A2E9C9-C5D4-4D5C-92CE-66B4BCFCD79A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "APIViewWeb", "..\..\..\..\src\dotnet\APIView\APIViewWeb\APIViewWeb.csproj", "{04A2E9C9-C5D4-4D5C-92CE-66B4BCFCD79A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "APIView", "..\..\..\..\..\src\dotnet\APIView\APIView\APIView.csproj", "{33DFC38B-8A02-48C4-8BCB-334B0D0F5BEE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "APIView", "..\..\..\..\src\dotnet\APIView\APIView\APIView.csproj", "{33DFC38B-8A02-48C4-8BCB-334B0D0F5BEE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwaggerApiParserTest", "SwaggerApiParserTest\SwaggerApiParserTest.csproj", "{26CFF247-A6EE-41D8-9405-254A05B6150A}" EndProject