From b9af507cae732db2666f8aece19a21d084c92b9a Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Mon, 22 Mar 2021 20:16:34 -0700
Subject: [PATCH 1/6] Update nuget/msbuild versions

---
 eng/Versions.props                            |  6 +--
 eng/tools/RepoTasks/RepoTasks.csproj          |  2 +-
 .../test/GetOpenApiReferenceMetadataTest.cs   | 54 +++++++++----------
 .../test/MetadataSerializerTest.cs            |  8 +--
 4 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index bb103b3f284f..5420c2fbff23 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -210,11 +210,11 @@
     <MonoWebAssemblyInteropPackageVersion>3.1.1-preview4.19614.4</MonoWebAssemblyInteropPackageVersion>
     <!-- Partner teams -->
     <MicrosoftBclAsyncInterfacesPackageVersion>1.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
-    <MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>16.9.0</MicrosoftBuildPackageVersion>
     <MicrosoftAzureSignalRPackageVersion>1.2.0</MicrosoftAzureSignalRPackageVersion>
-    <MicrosoftBuildFrameworkPackageVersion>15.8.166</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildFrameworkPackageVersion>16.9.0</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildLocatorPackageVersion>1.2.6</MicrosoftBuildLocatorPackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>15.8.166</MicrosoftBuildUtilitiesCorePackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>16.9.0</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftCodeAnalysisCommonPackageVersion>3.8.0</MicrosoftCodeAnalysisCommonPackageVersion>
     <MicrosoftCodeAnalysisCSharpPackageVersion>3.8.0</MicrosoftCodeAnalysisCSharpPackageVersion>
     <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.8.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index 3895d24b071a..dde3165107ee 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NuGet.Packaging" Version="5.6.0" />
+    <PackageReference Include="NuGet.Packaging" Version="5.9.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
 
     <!--
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<string, string>(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<string, string>(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}"
                 },
             };
 
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 892f73e692235f6abb2ef30d5a1a3f6f92aa5c56 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Fri, 2 Apr 2021 13:17:57 -0700
Subject: [PATCH 2/6] Update nuget

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 5420c2fbff23..26988f606929 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -232,7 +232,7 @@
     <MicrosoftWebAdministrationPackageVersion>11.1.0</MicrosoftWebAdministrationPackageVersion>
     <MicrosoftWebXdtPackageVersion>1.4.0</MicrosoftWebXdtPackageVersion>
     <SystemIdentityModelTokensJwtPackageVersion>6.7.1</SystemIdentityModelTokensJwtPackageVersion>
-    <NuGetVersioningPackageVersion>5.7.0</NuGetVersioningPackageVersion>
+    <NuGetVersioningPackageVersion>5.9.0</NuGetVersioningPackageVersion>
     <!-- Packages from 2.1, 2.2, and 3.1 branches used for site extension build. -->
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>

From 594060ef5471ce2130975928fcef06152852a773 Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Fri, 2 Apr 2021 13:30:25 -0700
Subject: [PATCH 3/6] Nuget only

---
 eng/Versions.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 26988f606929..7c5e7b8859ad 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -210,11 +210,11 @@
     <MonoWebAssemblyInteropPackageVersion>3.1.1-preview4.19614.4</MonoWebAssemblyInteropPackageVersion>
     <!-- Partner teams -->
     <MicrosoftBclAsyncInterfacesPackageVersion>1.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
-    <MicrosoftBuildPackageVersion>16.9.0</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>15.8.166</MicrosoftBuildPackageVersion>
     <MicrosoftAzureSignalRPackageVersion>1.2.0</MicrosoftAzureSignalRPackageVersion>
-    <MicrosoftBuildFrameworkPackageVersion>16.9.0</MicrosoftBuildFrameworkPackageVersion>
+    <MicrosoftBuildFrameworkPackageVersion>15.8.166</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildLocatorPackageVersion>1.2.6</MicrosoftBuildLocatorPackageVersion>
-    <MicrosoftBuildUtilitiesCorePackageVersion>16.9.0</MicrosoftBuildUtilitiesCorePackageVersion>
+    <MicrosoftBuildUtilitiesCorePackageVersion>15.8.166</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftCodeAnalysisCommonPackageVersion>3.8.0</MicrosoftCodeAnalysisCommonPackageVersion>
     <MicrosoftCodeAnalysisCSharpPackageVersion>3.8.0</MicrosoftCodeAnalysisCSharpPackageVersion>
     <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>3.8.0</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>

From a679991aa214e265e5ace69b8a74520e8f5e035a Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Fri, 2 Apr 2021 14:05:02 -0700
Subject: [PATCH 4/6] Fix baseline, update to 5.8.1

---
 eng/Baseline.Designer.props                   | 52 +++++++++----------
 .../BaselineGenerator.csproj                  |  2 +-
 eng/tools/BaselineGenerator/Program.cs        |  4 +-
 3 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index 60779e1f16b7..00cdc1685bc3 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -153,7 +153,7 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Authorization' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Metadata" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
@@ -167,7 +167,7 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.AzureAppServices.HostingStartup' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="[5.0.0, )" />
   </ItemGroup>
@@ -190,7 +190,7 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Authorization' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Authorization' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Authorization' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[5.0.4, )" />
   </ItemGroup>
@@ -198,14 +198,14 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Forms' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Forms' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Forms' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[5.0.4, )" />
   </ItemGroup>
   <!-- Package: Microsoft.AspNetCore.Components.Web-->
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Web' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Web' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.Web' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Forms" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.JSInterop" Version="[5.0.4, )" />
@@ -216,7 +216,7 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly.Authentication' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[5.0.4, )" />
   </ItemGroup>
@@ -232,7 +232,7 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components.WebAssembly' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.JSInterop.WebAssembly" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Web" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[5.0.0, )" />
@@ -243,7 +243,7 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Components' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components.Analyzers" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Authorization" Version="[5.0.4, )" />
   </ItemGroup>
@@ -263,7 +263,7 @@
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="[1.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Http.Features" Version="[5.0.4, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Connections.Abstractions' AND '$(TargetFramework)' == 'netstandard2.0' ">
@@ -284,7 +284,7 @@
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND '$(TargetFramework)' == 'net461' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[5.0.4, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[5.0.4, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Cryptography.KeyDerivation' AND '$(TargetFramework)' == 'netstandard2.0' ">
@@ -310,7 +310,7 @@
     <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[5.0.1, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection.Extensions' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[5.0.1, )" />
   </ItemGroup>
@@ -345,7 +345,7 @@
     <BaselinePackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="[4.3.0, )" />
     <BaselinePackageReference Include="System.Security.Cryptography.Xml" Version="[5.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.DataProtection' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.DataProtection.Abstractions" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.Internal" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[5.0.0, )" />
@@ -417,7 +417,7 @@
     <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[5.0.4, )" />
     <BaselinePackageReference Include="System.Text.Json" Version="[5.0.1, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[5.0.4, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Connections.Common' AND '$(TargetFramework)' == 'netstandard2.0' ">
@@ -432,7 +432,7 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[5.0.0, )" />
     <BaselinePackageReference Include="System.IO.Pipelines" Version="[5.0.1, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Features' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Http.Features' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.Extensions.Primitives" Version="[5.0.0, )" />
     <BaselinePackageReference Include="System.IO.Pipelines" Version="[5.0.1, )" />
   </ItemGroup>
@@ -444,7 +444,7 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.Identity.EntityFrameworkCore' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.Extensions.Identity.Stores" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="[5.0.4, )" />
   </ItemGroup>
@@ -592,7 +592,7 @@
     <BaselinePackageReference Include="System.Net.Sockets" Version="[4.3.0, )" />
     <BaselinePackageReference Include="System.Text.Json" Version="[5.0.1, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Common' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Connections.Abstractions" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
   </ItemGroup>
@@ -608,7 +608,7 @@
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND '$(TargetFramework)' == 'net461' ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[5.0.4, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.SignalR.Common" Version="[5.0.4, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.AspNetCore.SignalR.Protocols.Json' AND '$(TargetFramework)' == 'netstandard2.0' ">
@@ -677,7 +677,7 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Authentication.WebAssembly.Msal' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="[5.0.4, )" />
   </ItemGroup>
   <!-- Package: Microsoft.CodeAnalysis.Razor-->
@@ -725,7 +725,7 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[5.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Configuration.KeyPerFile' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Configuration.KeyPerFile' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.Extensions.Configuration" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="[5.0.0, )" />
   </ItemGroup>
@@ -756,7 +756,7 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Diagnostics.HealthChecks' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[5.0.0, )" />
@@ -772,7 +772,7 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.FileProviders.Embedded' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.FileProviders.Embedded' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.FileProviders.Embedded' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.Extensions.FileProviders.Abstractions" Version="[5.0.0, )" />
   </ItemGroup>
   <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.FileProviders.Embedded' AND '$(TargetFramework)' == 'netstandard2.0' ">
@@ -788,7 +788,7 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
     <BaselinePackageReference Include="System.ComponentModel.Annotations" Version="[5.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Core' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
@@ -808,7 +808,7 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[5.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Identity.Stores' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.Extensions.Identity.Core" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Logging" Version="[5.0.0, )" />
@@ -832,7 +832,7 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Localization' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.Localization' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="[5.0.4, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="[5.0.0, )" />
@@ -878,7 +878,7 @@
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
     <BaselinePackageReference Include="System.Text.Encodings.Web" Version="[5.0.1, )" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.WebEncoders' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.Extensions.WebEncoders' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[5.0.0, )" />
     <BaselinePackageReference Include="Microsoft.Extensions.Options" Version="[5.0.0, )" />
   </ItemGroup>
@@ -891,7 +891,7 @@
   <PropertyGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' ">
     <BaselinePackageVersion>5.0.4</BaselinePackageVersion>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' AND '$(TargetFramework)' == 'net50' ">
+  <ItemGroup Condition=" '$(PackageId)' == 'Microsoft.JSInterop.WebAssembly' AND ('$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' OR '$(TargetFramework)' == 'net5.0') ">
     <BaselinePackageReference Include="Microsoft.JSInterop" Version="[5.0.4, )" />
   </ItemGroup>
   <!-- Package: Microsoft.JSInterop-->
diff --git a/eng/tools/BaselineGenerator/BaselineGenerator.csproj b/eng/tools/BaselineGenerator/BaselineGenerator.csproj
index 775e7523c847..21528646afba 100644
--- a/eng/tools/BaselineGenerator/BaselineGenerator.csproj
+++ b/eng/tools/BaselineGenerator/BaselineGenerator.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NuGet.Protocol" Version="4.8.2" />
+    <PackageReference Include="NuGet.Protocol" Version="5.8.1" />
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.0" />
   </ItemGroup>
 
diff --git a/eng/tools/BaselineGenerator/Program.cs b/eng/tools/BaselineGenerator/Program.cs
index cd8c41d39468..e18791792179 100644
--- a/eng/tools/BaselineGenerator/Program.cs
+++ b/eng/tools/BaselineGenerator/Program.cs
@@ -91,11 +91,9 @@ private async Task<int> Run()
             var baselineVersion = input.Root.Attribute("Version").Value;
 
             // Baseline and .NET Core versions always align in non-preview releases.
-            // But, NuspecReader reports netcoreapp5.0 instead of net5.0. We use net5.0 in Baseline.Designer.props.
             var parsedVersion = Version.Parse(baselineVersion);
             var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") +
                 $"{parsedVersion.Major}.{parsedVersion.Minor}";
-            var matchTarget = $"netcoreapp{parsedVersion.Major}.{parsedVersion.Minor}";
 
             var doc = new XDocument(
                 new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "),
@@ -154,7 +152,7 @@ private async Task<int> Run()
                         var targetCondition = $"'$(TargetFramework)' == '{group.TargetFramework.GetShortFolderName()}'";
                         if (string.Equals(
                             group.TargetFramework.GetShortFolderName(),
-                            matchTarget,
+                            defaultTarget,
                             StringComparison.OrdinalIgnoreCase))
                         {
                             targetCondition =

From c86c90e8c88873e7691d96d918c4e9de6e6d750c Mon Sep 17 00:00:00 2001
From: Will Godbe <wigodbe@microsoft.com>
Date: Fri, 2 Apr 2021 16:04:59 -0700
Subject: [PATCH 5/6] Undo test change

---
 .../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 b642d43ab255..3602ea1c56cb 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}|FirstForGenerator=true|" +
-                    $"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" +
-                    $"OriginalItemSpec={identity}|ClassName=NSwagClient"
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath}|ClassName=NSwagClient|Namespace={@namespace}"
                 },
             };
 
@@ -95,9 +95,9 @@ public void Execute_DoesNotOverrideClassName()
                 { "OutputPath", outputPath },
                 {
                     "SerializedMetadata",
-                    $"Identity={identity}|FirstForGenerator=true|" +
-                    $"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" +
-                    $"OriginalItemSpec={identity}|ClassName={className}"
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"ClassName={className}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath}|Namespace={@namespace}"
                 },
             };
 
@@ -153,9 +153,9 @@ public void Execute_DoesNotOverrideNamespace()
                 { "OutputPath", outputPath },
                 {
                     "SerializedMetadata",
-                    $"Identity={identity}|FirstForGenerator=true|" +
-                    $"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" +
-                    $"OriginalItemSpec={identity}|ClassName=NSwagClient"
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"Namespace={@namespace}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath}|ClassName=NSwagClient"
                 },
             };
 
@@ -211,9 +211,9 @@ public void Execute_DoesNotOverrideOutputPath_IfRooted()
                 { "OutputPath", outputPath },
                 {
                     "SerializedMetadata",
-                    $"Identity={identity}|FirstForGenerator=true|" +
-                    $"CodeGenerator=NSwagCSharp|OutputPath={outputPath}|Namespace={@namespace}|" +
-                    $"OriginalItemSpec={identity}|ClassName={className}"
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"OutputPath={outputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"ClassName={className}|Namespace={@namespace}"
                 },
             };
 
@@ -361,9 +361,9 @@ public void Execute_SetsClassName_BasedOnOutputPath()
                 { "OutputPath", expectedOutputPath },
                 {
                     "SerializedMetadata",
-                    $"Identity={identity}|FirstForGenerator=true|" +
-                    $"CodeGenerator=NSwagCSharp|OutputPath={expectedOutputPath}|Namespace={@namespace}|" +
-                    $"OriginalItemSpec={identity}|ClassName={className}"
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"OutputPath={expectedOutputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"ClassName={className}|Namespace={@namespace}"
                 },
             };
 
@@ -424,9 +424,9 @@ public void Execute_SetsClassName_BasedOnSanitizedOutputPath(string outputPath,
                 { "OutputPath", expectedOutputPath },
                 {
                     "SerializedMetadata",
-                    $"Identity={identity}|FirstForGenerator=true|" +
-                    $"CodeGenerator=NSwagCSharp|OutputPath={expectedOutputPath}|Namespace={@namespace}|" +
-                    $"OriginalItemSpec={identity}|ClassName={className}"
+                    $"Identity={identity}|CodeGenerator=NSwagCSharp|" +
+                    $"OutputPath={expectedOutputPath}|OriginalItemSpec={identity}|FirstForGenerator=true|" +
+                    $"ClassName={className}|Namespace={@namespace}"
                 },
             };
 
@@ -491,9 +491,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
                 { "OutputPath", outputPath1 },
                 {
                     "SerializedMetadata",
-                    $"Identity={identity12}|FirstForGenerator=true|" +
-                    $"CodeGenerator={codeGenerator13}|OutputPath={outputPath1}|Namespace={@namespace}|" +
-                    $"OriginalItemSpec={identity12}|ClassName={className12}"
+                    $"Identity={identity12}|CodeGenerator={codeGenerator13}|" +
+                    $"OriginalItemSpec={identity12}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath1}|ClassName={className12}|Namespace={@namespace}"
                 },
             };
             var expectedMetadata2 = new SortedDictionary<string, string>(StringComparer.Ordinal)
@@ -506,9 +506,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
                 { "OutputPath", outputPath2 },
                 {
                     "SerializedMetadata",
-                    $"Identity={identity12}|FirstForGenerator=true|" +
-                    $"CodeGenerator={codeGenerator2}|OutputPath={outputPath2}|Namespace={@namespace}|" +
-                    $"OriginalItemSpec={identity12}|ClassName={className12}"
+                    $"Identity={identity12}|CodeGenerator={codeGenerator2}|" +
+                    $"OriginalItemSpec={identity12}|FirstForGenerator=true|" +
+                    $"OutputPath={outputPath2}|ClassName={className12}|Namespace={@namespace}"
                 },
             };
             var expectedMetadata3 = new SortedDictionary<string, string>(StringComparer.Ordinal)
@@ -521,9 +521,9 @@ public void Execute_SetsFirstForGenerator_UsesCorrectExtension()
                 { "OutputPath", outputPath3 },
                 {
                     "SerializedMetadata",
-                    $"Identity={identity3}|FirstForGenerator=false|" +
-                    $"CodeGenerator={codeGenerator13}|OutputPath={outputPath3}|Namespace={@namespace}|" +
-                    $"OriginalItemSpec={identity3}|ClassName={className3}"
+                    $"Identity={identity3}|CodeGenerator={codeGenerator13}|" +
+                    $"OriginalItemSpec={identity3}|FirstForGenerator=false|" +
+                    $"OutputPath={outputPath3}|ClassName={className3}|Namespace={@namespace}"
                 },
             };
 

From 1af0a05c6abeccaf69698682e59fbb2c487ed2f1 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Fri, 2 Apr 2021 16:08:49 -0700
Subject: [PATCH 6/6] Update MetadataSerializerTest.cs

---
 .../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 47d8303cfbc2..adc889ccacc9 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}|FirstForGenerator=true|" +
-                "Options=|CodeGenerator=NSwagCSharp|" +
-                "OutputPath=C:\\dd\\dnx\\AspNetCore\\artifacts\\obj\\ConsoleClient\\azureMonitorClient.cs|" +
-                "Namespace=ConsoleClient|OriginalItemSpec=../files/azureMonitor.json|ClassName=azureMonitorClient";
+            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";
 
             // Act
             var result = MetadataSerializer.SerializeMetadata(input);