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 @@
     <MonoWebAssemblyInteropVersion>3.1.1-preview4.19614.4</MonoWebAssemblyInteropVersion>
     <!-- Partner teams -->
     <MicrosoftBclAsyncInterfacesVersion>1.0.0</MicrosoftBclAsyncInterfacesVersion>
-    <MicrosoftBuildVersion>15.8.166</MicrosoftBuildVersion>
+    <MicrosoftBuildVersion>16.9.0</MicrosoftBuildVersion>
     <MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
-    <MicrosoftBuildFrameworkVersion>15.8.166</MicrosoftBuildFrameworkVersion>
+    <MicrosoftBuildFrameworkVersion>16.9.0</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
-    <MicrosoftBuildUtilitiesCoreVersion>15.8.166</MicrosoftBuildUtilitiesCoreVersion>
+    <MicrosoftBuildUtilitiesCoreVersion>16.9.0</MicrosoftBuildUtilitiesCoreVersion>
     <MicrosoftCodeAnalysisCommonVersion>3.7.0</MicrosoftCodeAnalysisCommonVersion>
     <MicrosoftCodeAnalysisCSharpVersion>3.7.0</MicrosoftCodeAnalysisCSharpVersion>
     <MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.7.0</MicrosoftCodeAnalysisCSharpWorkspacesVersion>
@@ -204,8 +204,8 @@
     <MicrosoftWebWebView2Version>1.0.705.50</MicrosoftWebWebView2Version>
     <MicrosoftWebXdtVersion>1.4.0</MicrosoftWebXdtVersion>
     <SystemIdentityModelTokensJwtVersion>6.8.0</SystemIdentityModelTokensJwtVersion>
-    <NuGetVersioningVersion>5.9.0-rc.7121</NuGetVersioningVersion>
-    <NuGetFrameworksVersion>5.9.0-rc.7121</NuGetFrameworksVersion>
+    <NuGetVersioningVersion>5.9.0</NuGetVersioningVersion>
+    <NuGetFrameworksVersion>5.9.0</NuGetFrameworksVersion>
     <SystemNetExperimentalMsQuicVersion>5.0.0-alpha.20560.6</SystemNetExperimentalMsQuicVersion>
     <!-- Packages from 2.1, 3.1, and 5.0 branches used for site extension build. -->
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21Version>
diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj
index ce0bfebe37d7..0b7444ffb22b 100644
--- a/eng/tools/RepoTasks/RepoTasks.csproj
+++ b/eng/tools/RepoTasks/RepoTasks.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NuGet.Packaging" Version="5.8.0" />
+    <PackageReference Include="NuGet.Packaging" Version="5.9.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
   </ItemGroup>
 
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);