From 3f4028618401e5066b94c66d2936d4a90c547b67 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 19 Mar 2021 11:06:24 -0700 Subject: [PATCH 1/4] Update nuget & msbuild versions --- eng/Versions.props | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 24b39998041e..c30c0bc3c3a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,11 +182,11 @@ 3.1.1-preview4.19614.4 1.0.0 - 15.8.166 + 16.9.0 1.2.0 - 15.8.166 + 16.9.0 1.2.6 - 15.8.166 + 16.9.0 3.7.0 3.7.0 3.7.0 @@ -204,8 +204,8 @@ 1.0.705.50 1.4.0 6.8.0 - 5.9.0-rc.7121 - 5.9.0-rc.7121 + 5.9.0 + 5.9.0 5.0.0-alpha.20560.6 2.1.1 From 225b7d5c6efcd632f68bd5575a188494a0d6e35b Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 19 Mar 2021 12:59:16 -0700 Subject: [PATCH 2/4] Update RepoTasks.csproj --- eng/tools/RepoTasks/RepoTasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index 7fa995702bcd..ace018df04e6 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -15,7 +15,7 @@ - + From 757656783e9017f36c5f6ef649ea021b308e3811 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 22 Mar 2021 14:46:19 -0700 Subject: [PATCH 3/4] Fix one test --- .../test/MetadataSerializerTest.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs b/src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs index adc889ccacc9..47d8303cfbc2 100644 --- a/src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs +++ b/src/Tools/Extensions.ApiDescription.Client/test/MetadataSerializerTest.cs @@ -185,10 +185,10 @@ public void SerializeMetadata_ReturnsExpectedString() }; var input = new TaskItem(identity, metadata); - var expectedResult = $"Identity={identity}|ClassName=azureMonitorClient|" + - "CodeGenerator=NSwagCSharp|FirstForGenerator=true|Namespace=ConsoleClient|" + - "Options=|OriginalItemSpec=../files/azureMonitor.json|" + - "OutputPath=C:\\dd\\dnx\\AspNetCore\\artifacts\\obj\\ConsoleClient\\azureMonitorClient.cs"; + var expectedResult = $"Identity={identity}|FirstForGenerator=true|" + + "Options=|CodeGenerator=NSwagCSharp|" + + "OutputPath=C:\\dd\\dnx\\AspNetCore\\artifacts\\obj\\ConsoleClient\\azureMonitorClient.cs|" + + "Namespace=ConsoleClient|OriginalItemSpec=../files/azureMonitor.json|ClassName=azureMonitorClient"; // Act var result = MetadataSerializer.SerializeMetadata(input); From 5bfec4c42b51bf79a61a64422a47297c1b19d500 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Mon, 22 Mar 2021 15:47:55 -0700 Subject: [PATCH 4/4] Fix all tests --- .../test/GetOpenApiReferenceMetadataTest.cs | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs b/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs index 3602ea1c56cb..b642d43ab255 100644 --- a/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs +++ b/src/Tools/Extensions.ApiDescription.Client/test/GetOpenApiReferenceMetadataTest.cs @@ -37,9 +37,9 @@ public void Execute_AddsExpectedMetadata() { "OutputPath", outputPath }, { "SerializedMetadata", - $"Identity={identity}|CodeGenerator=NSwagCSharp|" + - $"OriginalItemSpec={identity}|FirstForGenerator=true|" + - $"OutputPath={outputPath}|ClassName=NSwagClient|Namespace={@namespace}" + $"Identity={identity}|FirstForGenerator=true|" + + $"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" + + $"OriginalItemSpec={identity}|ClassName=NSwagClient" }, }; @@ -95,9 +95,9 @@ public void Execute_DoesNotOverrideClassName() { "OutputPath", outputPath }, { "SerializedMetadata", - $"Identity={identity}|CodeGenerator=NSwagCSharp|" + - $"ClassName={className}|OriginalItemSpec={identity}|FirstForGenerator=true|" + - $"OutputPath={outputPath}|Namespace={@namespace}" + $"Identity={identity}|FirstForGenerator=true|" + + $"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" + + $"OriginalItemSpec={identity}|ClassName={className}" }, }; @@ -153,9 +153,9 @@ public void Execute_DoesNotOverrideNamespace() { "OutputPath", outputPath }, { "SerializedMetadata", - $"Identity={identity}|CodeGenerator=NSwagCSharp|" + - $"Namespace={@namespace}|OriginalItemSpec={identity}|FirstForGenerator=true|" + - $"OutputPath={outputPath}|ClassName=NSwagClient" + $"Identity={identity}|FirstForGenerator=true|" + + $"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" + + $"OriginalItemSpec={identity}|ClassName=NSwagClient" }, }; @@ -211,9 +211,9 @@ public void Execute_DoesNotOverrideOutputPath_IfRooted() { "OutputPath", outputPath }, { "SerializedMetadata", - $"Identity={identity}|CodeGenerator=NSwagCSharp|" + - $"OutputPath={outputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" + - $"ClassName={className}|Namespace={@namespace}" + $"Identity={identity}|FirstForGenerator=true|" + + $"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" + + $"OriginalItemSpec={identity}|ClassName={className}" }, }; @@ -361,9 +361,9 @@ public void Execute_SetsClassName_BasedOnOutputPath() { "OutputPath", expectedOutputPath }, { "SerializedMetadata", - $"Identity={identity}|CodeGenerator=NSwagCSharp|" + - $"OutputPath={expectedOutputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" + - $"ClassName={className}|Namespace={@namespace}" + $"Identity={identity}|FirstForGenerator=true|" + + $"CodeGenerator=NSwagCSharp|OutputPath={expectedOutputPath}|Namespace={@namespace}|" + + $"OriginalItemSpec={identity}|ClassName={className}" }, }; @@ -424,9 +424,9 @@ public void Execute_SetsClassName_BasedOnSanitizedOutputPath(string outputPath, { "OutputPath", expectedOutputPath }, { "SerializedMetadata", - $"Identity={identity}|CodeGenerator=NSwagCSharp|" + - $"OutputPath={expectedOutputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" + - $"ClassName={className}|Namespace={@namespace}" + $"Identity={identity}|FirstForGenerator=true|" + + $"CodeGenerator=NSwagCSharp|OutputPath={expectedOutputPath}|Namespace={@namespace}|" + + $"OriginalItemSpec={identity}|ClassName={className}" }, }; @@ -491,9 +491,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension() { "OutputPath", outputPath1 }, { "SerializedMetadata", - $"Identity={identity12}|CodeGenerator={codeGenerator13}|" + - $"OriginalItemSpec={identity12}|FirstForGenerator=true|" + - $"OutputPath={outputPath1}|ClassName={className12}|Namespace={@namespace}" + $"Identity={identity12}|FirstForGenerator=true|" + + $"CodeGenerator={codeGenerator13}|OutputPath={outputPath1}|Namespace={@namespace}|" + + $"OriginalItemSpec={identity12}|ClassName={className12}" }, }; var expectedMetadata2 = new SortedDictionary(StringComparer.Ordinal) @@ -506,9 +506,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension() { "OutputPath", outputPath2 }, { "SerializedMetadata", - $"Identity={identity12}|CodeGenerator={codeGenerator2}|" + - $"OriginalItemSpec={identity12}|FirstForGenerator=true|" + - $"OutputPath={outputPath2}|ClassName={className12}|Namespace={@namespace}" + $"Identity={identity12}|FirstForGenerator=true|" + + $"CodeGenerator={codeGenerator2}|OutputPath={outputPath2}|Namespace={@namespace}|" + + $"OriginalItemSpec={identity12}|ClassName={className12}" }, }; var expectedMetadata3 = new SortedDictionary(StringComparer.Ordinal) @@ -521,9 +521,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension() { "OutputPath", outputPath3 }, { "SerializedMetadata", - $"Identity={identity3}|CodeGenerator={codeGenerator13}|" + - $"OriginalItemSpec={identity3}|FirstForGenerator=false|" + - $"OutputPath={outputPath3}|ClassName={className3}|Namespace={@namespace}" + $"Identity={identity3}|FirstForGenerator=false|" + + $"CodeGenerator={codeGenerator13}|OutputPath={outputPath3}|Namespace={@namespace}|" + + $"OriginalItemSpec={identity3}|ClassName={className3}" }, };