diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1bec18114bb6..b9b7e3017d6b 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.100-preview.2.23122.3">
+    <Dependency Name="Microsoft.TemplateEngine.Abstractions" Version="8.0.100-preview.3.23124.8">
       <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>38cb2e434cc8c6f1de7f44386c9c9dc0c75792cb</Sha>
+      <Sha>41e6e40afd6864941ceaabc6d6451925daa47c01</Sha>
       <SourceBuild RepoName="templating" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.8.0" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.NET.HostModel" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build" Version="17.6.0-preview-23122-01">
+    <Dependency Name="Microsoft.Build" Version="17.6.0-preview-23124-12">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>4b5e303b3646131dfbaf425c21021f5233cece8e</Sha>
+      <Sha>d434c0e464ee0c119bdd5ee87b448e16fe0786be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Localization" Version="17.6.0-preview-23122-01">
+    <Dependency Name="Microsoft.Build.Localization" Version="17.6.0-preview-23124-12">
       <Uri>https://github.com/dotnet/msbuild</Uri>
-      <Sha>4b5e303b3646131dfbaf425c21021f5233cece8e</Sha>
+      <Sha>d434c0e464ee0c119bdd5ee87b448e16fe0786be</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23114.3">
+    <Dependency Name="Microsoft.FSharp.Compiler" Version="12.5.0-beta.23124.3">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>75647e8f098a1a2b50d4d755394598ae6f38b164</Sha>
+      <Sha>69e9a985b80c41e7d9d589e58b75a004831c07bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.300-beta.23114.3">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="7.0.300-beta.23124.3">
       <Uri>https://github.com/dotnet/fsharp</Uri>
-      <Sha>75647e8f098a1a2b50d4d755394598ae6f38b164</Sha>
+      <Sha>69e9a985b80c41e7d9d589e58b75a004831c07bc</Sha>
       <SourceBuild RepoName="fsharp" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="dotnet-format" Version="8.0.405501">
@@ -64,185 +64,185 @@
       <Sha>2cb3e68c6b9a966114572fd63f2a20d2cb54a288</Sha>
       <SourceBuildTarball RepoName="format" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-2.23122.3">
+    <Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.6.0-2.23126.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>7347efa598bc5e34086f6c1078f1c0e864400d29</Sha>
+      <Sha>4641f2bff815fb7743be8aa2bdafe82b74a1f756</Sha>
       <SourceBuild RepoName="roslyn" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-2.23122.3">
+    <Dependency Name="Microsoft.CodeAnalysis" Version="4.6.0-2.23126.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>7347efa598bc5e34086f6c1078f1c0e864400d29</Sha>
+      <Sha>4641f2bff815fb7743be8aa2bdafe82b74a1f756</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-2.23122.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="4.6.0-2.23126.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>7347efa598bc5e34086f6c1078f1c0e864400d29</Sha>
+      <Sha>4641f2bff815fb7743be8aa2bdafe82b74a1f756</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.6.0-2.23122.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="4.6.0-2.23126.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>7347efa598bc5e34086f6c1078f1c0e864400d29</Sha>
+      <Sha>4641f2bff815fb7743be8aa2bdafe82b74a1f756</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.6.0-2.23122.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Features" Version="4.6.0-2.23126.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>7347efa598bc5e34086f6c1078f1c0e864400d29</Sha>
+      <Sha>4641f2bff815fb7743be8aa2bdafe82b74a1f756</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0-2.23122.3">
+    <Dependency Name="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.6.0-2.23126.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>7347efa598bc5e34086f6c1078f1c0e864400d29</Sha>
+      <Sha>4641f2bff815fb7743be8aa2bdafe82b74a1f756</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.6.0-2.23122.3">
+    <Dependency Name="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.6.0-2.23126.2">
       <Uri>https://github.com/dotnet/roslyn</Uri>
-      <Sha>7347efa598bc5e34086f6c1078f1c0e864400d29</Sha>
+      <Sha>4641f2bff815fb7743be8aa2bdafe82b74a1f756</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.TestHost" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="6.6.0-preview.2.23">
+    <Dependency Name="NuGet.Build.Tasks" Version="6.6.0-preview.2.29">
       <Uri>https://github.com/nuget/nuget.client</Uri>
-      <Sha>00375a7dfc2e2687c95ada0a0d24b570dc807d5d</Sha>
+      <Sha>4d5af8a3492c8d9d0c99c3cdf3cce12129c8e743</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.6.0-preview-20230221-02">
+    <Dependency Name="Microsoft.NET.Test.Sdk" Version="17.6.0-preview-20230223-05">
       <Uri>https://github.com/microsoft/vstest</Uri>
-      <Sha>3990c633bcf933291f40d44c0b7586c3a6e89d55</Sha>
+      <Sha>05c0c4c4f084782533443dfeae0f6627018c5b6a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="8.0.100-1.23067.1">
       <Uri>https://github.com/dotnet/linker</Uri>
       <Sha>c790896f128957acd2999208f44f09ae1e826c8c</Sha>
     </Dependency>
-    <Dependency Name="System.CodeDom" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="System.CodeDom" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="System.Security.Cryptography.ProtectedData" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="System.Text.Encoding.CodePages" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="System.Resources.Extensions" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.2.23122.1">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="8.0.0-preview.2.23125.1">
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>7514f9bc0755cdb942b1426c99e57abb129f6f43</Sha>
+      <Sha>b587906c2964aaefab5fbd7a27af5fbc59120a4e</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.2.23122.1">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0" Version="8.0.0-preview.2.23125.1">
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>7514f9bc0755cdb942b1426c99e57abb129f6f43</Sha>
+      <Sha>b587906c2964aaefab5fbd7a27af5fbc59120a4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.2.23122.1">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Ref" Version="8.0.0-preview.2.23125.1">
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>7514f9bc0755cdb942b1426c99e57abb129f6f43</Sha>
+      <Sha>b587906c2964aaefab5fbd7a27af5fbc59120a4e</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.2.23122.1">
+    <Dependency Name="VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0" Version="8.0.0-preview.2.23125.1">
       <Uri>https://github.com/dotnet/windowsdesktop</Uri>
-      <Sha>7514f9bc0755cdb942b1426c99e57abb129f6f43</Sha>
+      <Sha>b587906c2964aaefab5fbd7a27af5fbc59120a4e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-preview.2.23121.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
+    <Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.0-preview.2.23124.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Ref">
       <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>c37ab558d3aebf3bfe0038c86e8a4be78d09e03c</Sha>
+      <Sha>71ca704b43ee711d5808e71be88c67e18e99eea0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
       <SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="dotnet-dev-certs" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="dotnet-user-jwts" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="dotnet-user-secrets" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.Analyzers" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.23122.4">
+    <Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="7.0.0-preview.23125.1">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>cd9273ff529ec2103c054c0620870d977c08e0a9</Sha>
+      <Sha>d7ad748d4f436f89ecc1298f64a876047524ac45</Sha>
       <SourceBuild RepoName="razor" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.23122.4">
+    <Dependency Name="Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal" Version="7.0.0-preview.23125.1">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>cd9273ff529ec2103c054c0620870d977c08e0a9</Sha>
+      <Sha>d7ad748d4f436f89ecc1298f64a876047524ac45</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal" Version="7.0.0-preview.23122.4">
+    <Dependency Name="Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal" Version="7.0.0-preview.23125.1">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>cd9273ff529ec2103c054c0620870d977c08e0a9</Sha>
+      <Sha>d7ad748d4f436f89ecc1298f64a876047524ac45</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.23122.4">
+    <Dependency Name="Microsoft.NET.Sdk.Razor.SourceGenerators.Transport" Version="7.0.0-preview.23125.1">
       <Uri>https://github.com/dotnet/razor</Uri>
-      <Sha>cd9273ff529ec2103c054c0620870d977c08e0a9</Sha>
+      <Sha>d7ad748d4f436f89ecc1298f64a876047524ac45</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.Authorization" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.AspNetCore.Components.Web" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.JSInterop" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="Microsoft.JSInterop" Version="8.0.0-preview.3.23126.2">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>ce8e0ce086b0be93d25b985e1c4cdf3fe6d7bc21</Sha>
+      <Sha>446e27e0fd79ab0e0193915d8d342b6f787a7569</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2" Pinned="true">
       <Uri>https://github.com/dotnet/xdt</Uri>
       <Sha>9a1c3e1b7f0c8763d4c96e593961a61a72679a7b</Sha>
       <SourceBuild RepoName="xdt" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview1.23121.1">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0-preview1.23124.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>50f62a926806bc75f294b5f738bc6694e0941361</Sha>
+      <Sha>c6352bf2e1bd214fce090829de1042000d021497</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.3.5-beta1.23121.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.roslyn-analyzers" Version="3.3.5-beta1.23124.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>50f62a926806bc75f294b5f738bc6694e0941361</Sha>
+      <Sha>c6352bf2e1bd214fce090829de1042000d021497</Sha>
       <SourceBuild RepoName="roslyn-analyzers" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.22564.1">
@@ -254,9 +254,9 @@
       <Sha>8374d5fca634a93458c84414b1604c12f765d1ab</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23121.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23123.2">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>616f121630a3c46bff2cd7f50640f051f446070d</Sha>
+      <Sha>8e1b361dfb41ed15955a3793d4da1f2cf8129fb0</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
   </ProductDependencies>
@@ -278,9 +278,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>c4a85adbff520f62bfade7a6132f471506c3d35a</Sha>
     </Dependency>
-    <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.2.23122.6">
+    <Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0-preview.2.23126.3">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>3adabbcf308556bd0506c2dc3d82a022c8751456</Sha>
+      <Sha>eb20195fb00d3cc7217a10b7de4b3b00710ce672</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23116.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
       <Uri>https://github.com/dotnet/xliff-tasks</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 6f087d92ffbf..18fc9b0ca0fc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,7 +13,7 @@
   <PropertyGroup>
     <VersionPrefix>8.0.100</VersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>3</PreReleaseVersionIteration>
     <!-- Enable to remove prerelease label. -->
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
@@ -35,12 +35,12 @@
     <SystemReflectionMetadataVersion>6.0.0</SystemReflectionMetadataVersion>
     <MicrosoftDotNetSignToolVersion>8.0.0-beta.23120.1</MicrosoftDotNetSignToolVersion>
     <MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
-    <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-preview.2.23122.6</SystemSecurityCryptographyProtectedDataPackageVersion>
+    <SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0-preview.2.23126.3</SystemSecurityCryptographyProtectedDataPackageVersion>
     <SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
     <SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
     <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
     <SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
-    <SystemReflectionMetadataLoadContextVersion>8.0.0-preview.2.23122.6</SystemReflectionMetadataLoadContextVersion>
+    <SystemReflectionMetadataLoadContextVersion>8.0.0-preview.2.23126.3</SystemReflectionMetadataLoadContextVersion>
     <SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
     <SystemCommandLineVersion>2.0.0-beta4.22564.1</SystemCommandLineVersion>
     <MicrosoftDeploymentDotNetReleasesVersion>1.0.0-preview5.1.22263.1</MicrosoftDeploymentDotNetReleasesVersion>
@@ -48,22 +48,22 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.2.23122.6</MicrosoftNETCoreAppRefPackageVersion>
-    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.2.23122.6</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.2.23122.6</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.2.23126.3</MicrosoftNETCoreAppRefPackageVersion>
+    <VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.0-preview.2.23126.3</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>8.0.0-preview.2.23126.3</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
     <MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-preview.2.23122.6</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.2.23122.6</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftNETHostModelVersion>8.0.0-preview.2.23122.6</MicrosoftNETHostModelVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>8.0.0-preview.2.23126.3</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-preview.2.23126.3</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftNETHostModelVersion>8.0.0-preview.2.23126.3</MicrosoftNETHostModelVersion>
     <MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
     <MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
     <MicrosoftExtensionsLoggingConsoleVersion>6.0.0</MicrosoftExtensionsLoggingConsoleVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.2.23122.6</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.2.23126.3</MicrosoftNETILLinkTasksPackageVersion>
     <SystemServiceProcessServiceControllerVersion>7.0.0</SystemServiceProcessServiceControllerVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/nuget/nuget.client -->
-    <NuGetBuildTasksPackageVersion>6.6.0-preview.2.23</NuGetBuildTasksPackageVersion>
+    <NuGetBuildTasksPackageVersion>6.6.0-preview.2.29</NuGetBuildTasksPackageVersion>
     <NuGetBuildTasksConsolePackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksConsolePackageVersion>
     <NuGetLocalizationPackageVersion>6.0.0-rc.278</NuGetLocalizationPackageVersion>
     <NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
@@ -80,15 +80,15 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/vstest -->
-    <MicrosoftNETTestSdkPackageVersion>17.6.0-preview-20230221-02</MicrosoftNETTestSdkPackageVersion>
+    <MicrosoftNETTestSdkPackageVersion>17.6.0-preview-20230223-05</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftTestPlatformCLIPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformCLIPackageVersion>
     <MicrosoftTestPlatformBuildPackageVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftTestPlatformBuildPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/runtime -->
-    <SystemCodeDomPackageVersion>8.0.0-preview.2.23122.6</SystemCodeDomPackageVersion>
-    <SystemTextEncodingCodePagesPackageVersion>8.0.0-preview.2.23122.6</SystemTextEncodingCodePagesPackageVersion>
-    <SystemResourcesExtensionsPackageVersion>8.0.0-preview.2.23122.6</SystemResourcesExtensionsPackageVersion>
+    <SystemCodeDomPackageVersion>8.0.0-preview.2.23126.3</SystemCodeDomPackageVersion>
+    <SystemTextEncodingCodePagesPackageVersion>8.0.0-preview.2.23126.3</SystemTextEncodingCodePagesPackageVersion>
+    <SystemResourcesExtensionsPackageVersion>8.0.0-preview.2.23126.3</SystemResourcesExtensionsPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/format -->
@@ -96,11 +96,11 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
-    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview1.23121.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
+    <MicrosoftCodeAnalysisNetAnalyzersVersion>8.0.0-preview1.23124.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/msbuild -->
-    <MicrosoftBuildPackageVersion>17.6.0-preview-23122-01</MicrosoftBuildPackageVersion>
+    <MicrosoftBuildPackageVersion>17.6.0-preview-23124-12</MicrosoftBuildPackageVersion>
     <MicrosoftBuildCurrentPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildCurrentPackageVersion>
     <!-- Some tasks and the resolver will need to run in an MSBuild that is older than the very latest,
           so target one that matches the version in minimumMSBuildVersion.
@@ -109,7 +109,7 @@
     <MicrosoftBuildPackageVersion Condition="exists('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildFromSource)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)\src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildFrameworkPackageVersion>
     <MicrosoftBuildRuntimePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildRuntimePackageVersion>
-    <MicrosoftBuildLocalizationPackageVersion>17.6.0-preview-23122-01</MicrosoftBuildLocalizationPackageVersion>
+    <MicrosoftBuildLocalizationPackageVersion>17.6.0-preview-23124-12</MicrosoftBuildLocalizationPackageVersion>
     <MicrosoftBuildUtilitiesCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildUtilitiesCorePackageVersion>
     <MicrosoftBuildTasksCorePackageVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildTasksCorePackageVersion>
     <MicrosoftBuildVersion>$(MicrosoftBuildPackageVersion)</MicrosoftBuildVersion>
@@ -120,7 +120,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/templating -->
-    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.100-preview.2.23122.3</MicrosoftTemplateEngineAbstractionsPackageVersion>
+    <MicrosoftTemplateEngineAbstractionsPackageVersion>8.0.100-preview.3.23124.8</MicrosoftTemplateEngineAbstractionsPackageVersion>
     <MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
     <MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
     <MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
@@ -133,39 +133,39 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
-    <MicrosoftFSharpCompilerPackageVersion>12.5.0-beta.23114.3</MicrosoftFSharpCompilerPackageVersion>
+    <MicrosoftFSharpCompilerPackageVersion>12.5.0-beta.23124.3</MicrosoftFSharpCompilerPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/roslyn -->
-    <MicrosoftNetCompilersToolsetPackageVersion>4.6.0-2.23122.3</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftCodeAnalysisPackageVersion>4.6.0-2.23122.3</MicrosoftCodeAnalysisPackageVersion>
-    <MicrosoftCodeAnalysisCSharpPackageVersion>4.6.0-2.23122.3</MicrosoftCodeAnalysisCSharpPackageVersion>
-    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.6.0-2.23122.3</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
-    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.6.0-2.23122.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
-    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.6.0-2.23122.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
-    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.6.0-2.23122.3</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
+    <MicrosoftNetCompilersToolsetPackageVersion>4.6.0-2.23126.2</MicrosoftNetCompilersToolsetPackageVersion>
+    <MicrosoftCodeAnalysisPackageVersion>4.6.0-2.23126.2</MicrosoftCodeAnalysisPackageVersion>
+    <MicrosoftCodeAnalysisCSharpPackageVersion>4.6.0-2.23126.2</MicrosoftCodeAnalysisCSharpPackageVersion>
+    <MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.6.0-2.23126.2</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
+    <MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.6.0-2.23126.2</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
+    <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.6.0-2.23126.2</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
+    <MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.6.0-2.23126.2</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
     <MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
     <MicrosoftCodeAnalysisWorkspacesGenAPIPackageVersion>4.6.0-2.23081.23</MicrosoftCodeAnalysisWorkspacesGenAPIPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.0-preview.2.23122.6</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.0-preview.2.23122.6</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.0-preview.2.23122.6</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.0-preview.2.23122.6</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.0-preview.2.23122.6</MicrosoftAspNetCoreAnalyzersPackageVersion>
-    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.0-preview.2.23122.6</MicrosoftAspNetCoreTestHostPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>8.0.0-preview.3.23126.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>8.0.0-preview.3.23126.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcAnalyzersPackageVersion>8.0.0-preview.3.23126.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>8.0.0-preview.3.23126.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreAnalyzersPackageVersion>8.0.0-preview.3.23126.2</MicrosoftAspNetCoreAnalyzersPackageVersion>
+    <MicrosoftAspNetCoreTestHostPackageVersion>8.0.0-preview.3.23126.2</MicrosoftAspNetCoreTestHostPackageVersion>
   </PropertyGroup>
   <!-- Dependencies from https://github.com/dotnet/razor -->
   <PropertyGroup>
-    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.23122.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
-    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.23122.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
-    <MicrosoftAspNetCoreRazorSourceGeneratorToolingInternalPackageVersion>7.0.0-preview.23122.4</MicrosoftAspNetCoreRazorSourceGeneratorToolingInternalPackageVersion>
-    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.23122.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
+    <MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>7.0.0-preview.23125.1</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
+    <MicrosoftCodeAnalysisRazorToolingInternalVersion>7.0.0-preview.23125.1</MicrosoftCodeAnalysisRazorToolingInternalVersion>
+    <MicrosoftAspNetCoreRazorSourceGeneratorToolingInternalPackageVersion>7.0.0-preview.23125.1</MicrosoftAspNetCoreRazorSourceGeneratorToolingInternalPackageVersion>
+    <MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>7.0.0-preview.23125.1</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/wpf -->
-    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-preview.2.23121.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
+    <MicrosoftNETSdkWindowsDesktopPackageVersion>8.0.0-preview.2.23124.2</MicrosoftNETSdkWindowsDesktopPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Manually updated">
     <!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->
diff --git a/src/Cli/dotnet/CommonLocalizableStrings.resx b/src/Cli/dotnet/CommonLocalizableStrings.resx
index 7a2cfe25a05d..60734d7c228c 100644
--- a/src/Cli/dotnet/CommonLocalizableStrings.resx
+++ b/src/Cli/dotnet/CommonLocalizableStrings.resx
@@ -708,4 +708,7 @@ The default is 'true' if a runtime identifier is specified.</value>
   <data name="CorruptSolutionProjectFolderStructure" xml:space="preserve">
     <value>The solution file '{0}' is missing EndProject tags or has invalid child-parent project folder mappings around project GUID: '{1}'. Manually repair the solution or try to open and save it in Visual Studio."</value>
   </data>
+  <data name="MSBuildAdditionalOptionTitle" xml:space="preserve">
+    <value>.NET Cli Options:</value>
+  </data>
 </root>
diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs
index 97a35ee092a4..ee4fb619ef97 100644
--- a/src/Cli/dotnet/CommonOptions.cs
+++ b/src/Cli/dotnet/CommonOptions.cs
@@ -52,7 +52,14 @@ public static Option<string> FrameworkOption(string description) =>
             .AddCompletions(Complete.TargetFrameworksFromProjectFile);
 
         private static string RuntimeArgName = CommonLocalizableStrings.RuntimeIdentifierArgumentName;
-        private static Func<string, IEnumerable<string>> RuntimeArgFunc = o => new string[] { $"-property:RuntimeIdentifier={o}", "-property:_CommandLineDefinedRuntimeIdentifier=true" };
+        public static IEnumerable<string> RuntimeArgFunc(string rid)
+        {
+            if (GetArchFromRid(rid) == "amd64")
+            {
+                rid = GetOsFromRid(rid) + "-x64";
+            }
+            return new string[] { $"-property:RuntimeIdentifier={rid}", "-property:_CommandLineDefinedRuntimeIdentifier=true" };
+        }
         private static Func<CompletionContext, IEnumerable<CompletionItem>> RuntimeCompletions = Complete.RunTimesFromProjectFile;
 
         public static Option<string> RuntimeOption =
@@ -224,6 +231,7 @@ private static IEnumerable<string> ResolveRidShorthandOptions(string os, string
         internal static string ResolveRidShorthandOptionsToRuntimeIdentifier(string os, string arch)
         {
             var currentRid = GetCurrentRuntimeId();
+            arch = arch == "amd64" ? "x64" : arch;
             os = string.IsNullOrEmpty(os) ? GetOsFromRid(currentRid) : os;
             arch = string.IsNullOrEmpty(arch) ? GetArchFromRid(currentRid) : arch;
             return $"{os}-{arch}";
diff --git a/src/Cli/dotnet/Parser.cs b/src/Cli/dotnet/Parser.cs
index 95fde70e5db7..c0f9992a35ca 100644
--- a/src/Cli/dotnet/Parser.cs
+++ b/src/Cli/dotnet/Parser.cs
@@ -281,6 +281,28 @@ private static void SetHelpCustomizations(HelpBuilder builder)
                 }
             }
 
+            public void additionalOption(HelpContext context)
+            {
+                List<TwoColumnHelpRow> options = new();
+                HashSet<Option> uniqueOptions = new();
+                foreach (Option option in context.Command.Options)
+                {
+                    if (!option.IsHidden && uniqueOptions.Add(option))
+                    {
+                        options.Add(context.HelpBuilder.GetTwoColumnRow(option, context));
+                    }
+                }
+
+                if (options.Count <= 0)
+                {
+                    return;
+                }
+
+                context.Output.WriteLine(CommonLocalizableStrings.MSBuildAdditionalOptionTitle);
+                context.HelpBuilder.WriteColumns(options, context);
+                context.Output.WriteLine();
+            }
+
             public override void Write(HelpContext context)
             {
                 var command = context.Command;
@@ -296,6 +318,8 @@ public override void Write(HelpContext context)
                 else if (command.Name.Equals(MSBuildCommandParser.GetCommand().Name))
                 {
                     new MSBuildForwardingApp(helpArgs).Execute();
+                    context.Output.WriteLine();
+                    additionalOption(context);
                 }
                 else if (command.Name.Equals(VSTestCommandParser.GetCommand().Name))
                 {
@@ -342,6 +366,9 @@ public override void Write(HelpContext context)
                     base.Write(context);
                 }
             }
+
+
+
         }
     }
 }
diff --git a/src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs b/src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs
index d7fc1097c89a..2996cd8fc07f 100644
--- a/src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs
+++ b/src/Cli/dotnet/commands/dotnet-build/BuildCommand.cs
@@ -1,12 +1,11 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
 using System.Collections.Generic;
-using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.Cli;
 using System.CommandLine;
 using System.CommandLine.Parsing;
-using System;
+using Microsoft.DotNet.Cli;
 
 namespace Microsoft.DotNet.Tools.Build
 {
diff --git a/src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs b/src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs
index 0a5271610a58..f31df407073e 100644
--- a/src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs
+++ b/src/Cli/dotnet/commands/dotnet-build/BuildCommandParser.cs
@@ -3,8 +3,6 @@
 
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
 using Microsoft.DotNet.Tools;
 using Microsoft.DotNet.Tools.Build;
 using LocalizableStrings = Microsoft.DotNet.Tools.Build.LocalizableStrings;
diff --git a/src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs b/src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs
index b7a82fca3630..6af6981d0dc3 100644
--- a/src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs
+++ b/src/Cli/dotnet/commands/dotnet-clean/CleanCommandParser.cs
@@ -52,6 +52,7 @@ private static Command ConstructCommand()
             command.AddOption(CommonOptions.VerbosityOption);
             command.AddOption(OutputOption);
             command.AddOption(NoLogoOption);
+            command.AddOption(CommonOptions.DisableBuildServersOption);
 
             command.SetHandler(CleanCommand.Run);
 
diff --git a/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs b/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs
index e8f2b52ba9fc..2ad7d6754f97 100644
--- a/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs
+++ b/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package/ListPackageReferencesCommandParser.cs
@@ -39,7 +39,7 @@ internal static class ListPackageReferencesCommandParser
         public static readonly Option HighestMinorOption = new ForwardedOption<bool>("--highest-minor", LocalizableStrings.CmdHighestMinorDescription)
             .ForwardAs("--highest-minor");
 
-        public static readonly Option ConfigOption = new ForwardedOption<string>("--config", LocalizableStrings.CmdConfigDescription)
+        public static readonly Option ConfigOption = new ForwardedOption<string>(new string[] { "--config", "--configfile"}, LocalizableStrings.CmdConfigDescription)
         {
             ArgumentHelpName = LocalizableStrings.CmdConfig
         }.ForwardAsMany(o => new[] { "--config", o });
diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs b/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs
index 842b7cfc7714..7c6314d33447 100644
--- a/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs
+++ b/src/Cli/dotnet/commands/dotnet-msbuild/MSBuildCommandParser.cs
@@ -29,7 +29,9 @@ private static Command ConstructCommand()
                 Arguments
             };
 
-            command.SetHandler((ParseResult parseResult) => MSBuildCommand.Run(parseResult.GetValue(Arguments)));
+            command.AddOption(CommonOptions.DisableBuildServersOption);
+
+            command.SetHandler(MSBuildCommand.Run);
 
             return command;
         }
diff --git a/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs b/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs
index cf412db20e12..d935e974c46b 100644
--- a/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs
+++ b/src/Cli/dotnet/commands/dotnet-msbuild/Program.cs
@@ -1,17 +1,47 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Parsing;
 using Microsoft.DotNet.Cli;
 
 namespace Microsoft.DotNet.Tools.MSBuild
 {
-    public class MSBuildCommand
+    public class MSBuildCommand : MSBuildForwardingApp
     {
-        public static int Run(string[] args)
+        public MSBuildCommand
+            (IEnumerable<string> msbuildArgs,
+            string msbuildPath = null) 
+             : base(msbuildArgs, msbuildPath)
         {
-            return new MSBuildForwardingApp(args).Execute();
+        }
+
+        public static MSBuildCommand FromArgs(string[] args, string msbuildPath = null)
+        { 
+            var parser = Cli.Parser.Instance;
+            var result = parser.ParseFrom("dotnet msbuild", args);
+            return FromParseResult(result, msbuildPath);
+        }
+
+        public static MSBuildCommand FromParseResult(ParseResult parseResult, string msbuildPath = null)
+        {
+            var msbuildArgs = new List<string>();
+
+            msbuildArgs.AddRange(parseResult.GetValue(MSBuildCommandParser.Arguments));
+
+            msbuildArgs.AddRange(parseResult.OptionValuesToBeForwarded(MSBuildCommandParser.GetCommand()));
+
+            MSBuildCommand command = new MSBuildCommand(
+                msbuildArgs,
+                msbuildPath);
+            return command;
+        }
+
+        public static int Run(ParseResult parseResult)
+        {
+            parseResult.HandleDebugSwitch();
+
+            return FromParseResult(parseResult).Execute();
         }
     }
 }
diff --git a/src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs b/src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs
index 8108b3fb5f99..15bb0ccd2b3e 100644
--- a/src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs
+++ b/src/Cli/dotnet/commands/dotnet-pack/PackCommandParser.cs
@@ -3,8 +3,6 @@
 
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
 using Microsoft.DotNet.Tools;
 using Microsoft.DotNet.Tools.Pack;
 using LocalizableStrings = Microsoft.DotNet.Tools.Pack.LocalizableStrings;
@@ -68,6 +66,7 @@ private static Command ConstructCommand()
             command.AddOption(CommonOptions.VerbosityOption);
             command.AddOption(CommonOptions.VersionSuffixOption);
             command.AddOption(ConfigurationOption);
+            command.AddOption(CommonOptions.DisableBuildServersOption);
             RestoreCommandParser.AddImplicitRestoreOptions(command, includeRuntimeOption: true, includeNoDependenciesOption: true);
 
             command.SetHandler(PackCommand.Run);
diff --git a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs
index a29848fd0081..af480bfff3d9 100644
--- a/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs
+++ b/src/Cli/dotnet/commands/dotnet-restore/RestoreCommandParser.cs
@@ -1,13 +1,14 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
 using System.Collections.Generic;
 using System.CommandLine;
-using System.CommandLine.Invocation;
-using System.CommandLine.Parsing;
 using System.Linq;
+using System.Reflection.Metadata.Ecma335;
 using Microsoft.DotNet.Tools;
 using Microsoft.DotNet.Tools.Restore;
+using Microsoft.TemplateEngine.Cli.Commands;
 using LocalizableStrings = Microsoft.DotNet.Tools.Restore.LocalizableStrings;
 
 namespace Microsoft.DotNet.Cli
@@ -73,7 +74,7 @@ private static Command ConstructCommand()
             {
                 command.AddOption(option);
             }
-
+            command.AddOption(CommonOptions.ArchitectureOption);
             command.SetHandler(RestoreCommand.Run);
 
             return command;
@@ -86,6 +87,24 @@ public static void AddImplicitRestoreOptions(Command command, bool showHelp = fa
                 command.AddOption(option);
             }
         }
+        private static string GetOsFromRid(string rid) => rid.Substring(0, rid.LastIndexOf("-"));
+        private static string GetArchFromRid(string rid) => rid.Substring(rid.LastIndexOf("-") + 1, rid.Length - rid.LastIndexOf("-") - 1);
+        public static string RestoreRuntimeArgFunc(IEnumerable<string> rids) 
+        {
+            List<string> convertedRids = new();
+            foreach (string rid in rids)
+            {
+                if (GetArchFromRid(rid.ToString()) == "amd64")
+                {
+                    convertedRids.Add($"{GetOsFromRid(rid.ToString())}-x64");
+                }
+                else
+                {
+                    convertedRids.Add($"{rid}");
+                }
+            }
+            return $"-property:RuntimeIdentifiers={string.Join("%3B", convertedRids)}";
+        }
 
         private static Option[] ImplicitRestoreOptions(bool showHelp, bool useShortOptions, bool includeRuntimeOption, bool includeNoDependenciesOption)
         {
@@ -149,7 +168,7 @@ private static Option[] ImplicitRestoreOptions(bool showHelp, bool useShortOptio
                     {
                         ArgumentHelpName = LocalizableStrings.CmdRuntimeOption,
                         IsHidden = !showHelp
-                    }.ForwardAsSingle(o => $"-property:RuntimeIdentifiers={string.Join("%3B", o)}")
+                    }.ForwardAsSingle(RestoreRuntimeArgFunc)
                     .AllowSingleArgPerToken()
                     .AddCompletions(Complete.RunTimesFromProjectFile)
                 ).ToArray();
diff --git a/src/Cli/dotnet/commands/dotnet-test/Program.cs b/src/Cli/dotnet/commands/dotnet-test/Program.cs
index ca6a565d478f..cbe6a59df4a4 100644
--- a/src/Cli/dotnet/commands/dotnet-test/Program.cs
+++ b/src/Cli/dotnet/commands/dotnet-test/Program.cs
@@ -108,6 +108,21 @@ private static int ForwardToVSTestConsole(ParseResult parseResult, string[] args
             return exitCode;
         }
 
+        public static TestCommand FromArgs(string[] args, string testSessionCorrelationId = null, string msbuildPath = null)
+        {
+            var parser = Microsoft.DotNet.Cli.Parser.Instance;
+            var parseResult = parser.ParseFrom("dotnet test", args);
+
+            // settings parameters are after -- (including --), these should not be considered by the parser
+            string[] settings = args.SkipWhile(a => a != "--").ToArray();
+            if (string.IsNullOrEmpty(testSessionCorrelationId))
+            {
+                testSessionCorrelationId = $"{Environment.ProcessId}_{Guid.NewGuid()}";
+            }
+            
+            return FromParseResult(parseResult, settings, testSessionCorrelationId, msbuildPath);
+        }
+
         private static TestCommand FromParseResult(ParseResult result, string[] settings, string testSessionCorrelationId, string msbuildPath = null)
         {
             result.ShowHelpOrErrorIfAppropriate();
diff --git a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs
index 03b02284dac8..0064ad6ab34c 100644
--- a/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs
+++ b/src/Cli/dotnet/commands/dotnet-test/TestCommandParser.cs
@@ -160,6 +160,7 @@ private static Command ConstructCommand()
             command.AddOption(CommonOptions.VerbosityOption);
             command.AddOption(CommonOptions.ArchitectureOption);
             command.AddOption(CommonOptions.OperatingSystemOption);
+            command.AddOption(CommonOptions.DisableBuildServersOption);
 
             command.SetHandler(TestCommand.Run);
 
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf
index 8a2a60a41350..4ccc688bb56a 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.cs.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">Publikujte svoji aplikaci jako aplikaci závislou na architektuře. Aby bylo možné vaši aplikaci spustit, musí být na cílovém počítači nainstalovaný kompatibilní modul runtime .NET.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">V {0} se našlo několik projektů. Vyberte, který z nich chcete použít.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf
index da8e9bbbfd18..7c012beb2c80 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.de.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">Veröffentlichen Sie Ihre Anwendung als eine von einem Framework abhängige Anwendung. Eine kompatible .NET-Runtime muss auf dem Zielcomputer installiert sein, um Ihre Anwendung ausführen zu können.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">In "{0}" wurden mehrere Projekte gefunden. Geben Sie an, welches davon verwendet werden soll.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf
index 14d8838fda83..00e89dff44d8 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.es.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">Publique la aplicación como una aplicación dependiente del marco de trabajo. para ejecutar la aplicación debe instalarse un entorno de ejecución de .NET compatible en el equipo de destino.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">Se han encontrado varios proyectos en "{0}". Especifique el que debe usarse.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf
index e43829fc998b..da2f414dace6 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.fr.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">Publiez votre application en tant qu'application dépendante du framework. Un runtime .NET compatible doit être installé sur la machine cible pour exécuter votre application.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">Plusieurs projets dans '{0}'. Spécifiez celui à utiliser.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf
index e6f5a861f09f..e5d9250b2ca1 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.it.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">Pubblicare l'applicazione come applicazione dipendente dal framework. Per eseguire l'applicazione, è necessario installare un runtime .NET compatibile nel computer di destinazione.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">Sono stati trovati più progetti in `{0}`. Specificare quello da usare.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf
index 9e9c86a21148..76ff5e914966 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ja.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">アプリケーションをフレームワーク依存アプリケーションとして公開します。アプリケーションを実行するには、対象のコンピューターで互換性のある .NET ランタイムをインストールする必要があります。</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">`{0}` に複数のプロジェクトが見つかりました。使用するプロジェクトを指定してください。</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf
index 05d325620a55..7637a05c3b28 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ko.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">애플리케이션을 프레임워크 종속 애플리케이션으로 게시합니다. 애플리케이션을 실행하려면 호환되는 .NET 런타임이 대상 시스템에 설치되어 있어야 합니다.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">'{0}'에서 프로젝트를 두 개 이상 찾았습니다. 사용할 프로젝트를 지정하세요.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf
index 553009fadaee..903dfff3903b 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pl.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">Opublikuj aplikację jako aplikację zależną od frameworku. Aby można było uruchomić aplikację, na maszynie docelowej musi być zainstalowane zgodne środowisko uruchomieniowe platformy .NET.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">Znaleziono więcej niż jeden projekt w lokalizacji „{0}”. Określ, który ma zostać użyty.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf
index 02b2a110da2d..d3a3e5d45f4e 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">Publique o seu aplicativo como um aplicativo dependente de estrutura. Um runtime do .NET compatível precisa ser instalado no computador de destino para executar o aplicativo.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">Foi encontrado mais de um projeto em ‘{0}’. Especifique qual deve ser usado.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf
index a0b68a193f9a..ea8989e4b13c 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.ru.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">Опубликуйте приложение как зависимое от платформы. Для запуска приложения на целевом компьютере должна быть установлена совместимая среда выполнения .NET.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">Найдено несколько проектов в "{0}". Выберите один.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf
index eec775631480..e66e4f99c61d 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.tr.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">Uygulamanızı çerçeveye bağımlı bir uygulama olarak yayımlayın. Uygulamanızı çalıştırmak için hedef makineye uyumlu bir .NET çalışma zamanı yüklenmelidir.</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">`{0}` içinde birden fazla proje bulundu. Hangisinin kullanılacağını belirtin.</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf
index d52c43ae90bc..49decceb6aa0 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf
@@ -110,6 +110,11 @@ EOF
         <target state="translated">将应用程序发布为依赖框架的应用程序。目标计算机上必须安装兼容的 .NET 运行时才能运行该应用程序。</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">在“{0}”中找到多个项目。请指定使用哪一个。</target>
diff --git a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf
index 3c1cc26d7f0b..952796d5c785 100644
--- a/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf
+++ b/src/Cli/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf
@@ -110,6 +110,11 @@ export PATH="$PATH:{0}"
         <target state="translated">將您的應用程式發佈為架構相依的應用程式。必須在目標機器上安裝相容的 .NET 執行階段，才能執行您的應用程式。</target>
         <note />
       </trans-unit>
+      <trans-unit id="MSBuildAdditionalOptionTitle">
+        <source>.NET Cli Options:</source>
+        <target state="new">.NET Cli Options:</target>
+        <note />
+      </trans-unit>
       <trans-unit id="MoreThanOneProjectInDirectory">
         <source>Found more than one project in `{0}`. Specify which one to use.</source>
         <target state="translated">在 `{0}` 中找到多個專案。請指定要使用的專案。</target>
diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI.Task/GenAPITask.cs b/src/GenAPI/Microsoft.DotNet.GenAPI.Task/GenAPITask.cs
index 31b5de0dc5a0..33ddba211b3a 100644
--- a/src/GenAPI/Microsoft.DotNet.GenAPI.Task/GenAPITask.cs
+++ b/src/GenAPI/Microsoft.DotNet.GenAPI.Task/GenAPITask.cs
@@ -57,7 +57,7 @@ public class GenAPITask : TaskBase
         /// <summary>
         /// Includes assembly attributes which are values that provide information about an assembly.
         /// </summary>
-        public bool IncludeAssemblyAttributes { get; }
+        public bool IncludeAssemblyAttributes { get; set; }
 
         protected override void ExecuteCore()
         {
diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs
index 47720dd120f0..6f9cee744287 100644
--- a/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs
+++ b/src/GenAPI/Microsoft.DotNet.GenAPI/CSharpFileBuilder.cs
@@ -10,6 +10,7 @@
 using Microsoft.CodeAnalysis.CSharp.Formatting;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
+using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Options;
 using Microsoft.CodeAnalysis.Simplification;
@@ -137,12 +138,16 @@ private SyntaxNode Visit(SyntaxNode namedTypeNode, INamedTypeSymbol namedType)
                 namedTypeNode = _syntaxGenerator.AddMembers(namedTypeNode, namedType.SynthesizeDummyFields(_symbolFilter));
             }
 
+            namedTypeNode = _syntaxGenerator.AddMembers(namedTypeNode, namedType.TryGetInternalDefaultConstructor(_symbolFilter));
+
             foreach (ISymbol member in members.Order())
             {
                 // If the method is ExplicitInterfaceImplementation and is derived from an interface that was filtered out, we must filter out it either.
                 if (member is IMethodSymbol method &&
                     method.MethodKind == MethodKind.ExplicitInterfaceImplementation &&
-                    method.ExplicitInterfaceImplementations.Any(m => !_symbolFilter.Include(m.ContainingSymbol)))
+                    method.ExplicitInterfaceImplementations.Any(m => !_symbolFilter.Include(m.ContainingSymbol) ||
+                        // if explicit interface implementation method has inaccessible type argument
+                        m.ContainingType.HasInaccessibleTypeArgument(_symbolFilter)))
                 {
                     continue;
                 }
@@ -161,7 +166,16 @@ private SyntaxNode Visit(SyntaxNode namedTypeNode, INamedTypeSymbol namedType)
                     memberDeclaration = Visit(memberDeclaration, nestedTypeSymbol);
                 }
 
-                namedTypeNode = _syntaxGenerator.AddMembers(namedTypeNode, memberDeclaration);
+                try
+                {
+                    namedTypeNode = _syntaxGenerator.AddMembers(namedTypeNode, memberDeclaration);
+                }
+                catch (InvalidOperationException e)
+                {
+                    // re-throw the InvalidOperationException with the symbol that caused it.
+                    throw new InvalidOperationException($"Adding member {member.ToDisplayString()} to the " +
+                        $"named type {namedTypeNode.ToString()} failed with an exception {e.Message}");
+                }
             }
 
             return namedTypeNode;
diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs
index 9bb03ec1c794..4b4e6c9e05e3 100644
--- a/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs
+++ b/src/GenAPI/Microsoft.DotNet.GenAPI/INamedTypeSymbolExtension.cs
@@ -28,14 +28,14 @@ private static bool WalkTypeSymbol(ITypeSymbol ty, HashSet<ITypeSymbol> visited,
                 return true;
             }
 
-            foreach(INamedTypeSymbol memberType in ty.GetTypeMembers())
+            foreach (INamedTypeSymbol memberType in ty.GetTypeMembers())
             {
                 if (!visited.Contains(memberType) && WalkTypeSymbol(memberType, visited, f))
                 {
                     return true;
                 }
             }
-            
+
             return false;
         }
 
@@ -45,8 +45,8 @@ private static bool IsOrContainsReferenceType(ITypeSymbol ty) =>
 
         // Walk type with predicate that checks if a type is unmanaged or a reference that's not the root.
         private static bool IsOrContainsNonEmptyStruct(ITypeSymbol root) =>
-            WalkTypeSymbol(root, new(SymbolEqualityComparer.Default), ty => 
-                ty.IsUnmanagedType || 
+            WalkTypeSymbol(root, new(SymbolEqualityComparer.Default), ty =>
+                ty.IsUnmanagedType ||
                     ((ty.IsReferenceType || ty.IsRefLikeType) && !SymbolEqualityComparer.Default.Equals(root, ty)));
 
         // Convert IEnumerable<AttributeData> to a SyntaxList<AttributeListSyntax>.
@@ -54,7 +54,7 @@ private static SyntaxList<AttributeListSyntax> FromAttributeData(IEnumerable<Att
         {
             IEnumerable<SyntaxNode?> syntaxNodes = attrData.Select(ad =>
                 ad.ApplicationSyntaxReference?.GetSyntax(new System.Threading.CancellationToken(false)));
-            
+
             IEnumerable<AttributeListSyntax?> asNodes = syntaxNodes.Select(sn =>
             {
                 if (sn is AttributeSyntax atSyntax) {
@@ -65,7 +65,7 @@ private static SyntaxList<AttributeListSyntax> FromAttributeData(IEnumerable<Att
 
                 return null;
             });
-            
+
             List<AttributeListSyntax> asList = asNodes.Where(a => a != null).OfType<AttributeListSyntax>().ToList();
             return SyntaxFactory.List(asList);
         }
@@ -104,7 +104,7 @@ public static IEnumerable<SyntaxNode> SynthesizeDummyFields(this INamedTypeSymbo
             IEnumerable<IFieldSymbol> excludedFields = namedType.GetMembers()
                 .Where(member => !symbolFilter.Include(member) && member is IFieldSymbol)
                 .Select(m => (IFieldSymbol)m);
-            
+
             if (excludedFields.Any())
             {
                 // Collect generic excluded fields
@@ -116,7 +116,7 @@ public static IEnumerable<SyntaxNode> SynthesizeDummyFields(this INamedTypeSymbo
                 });
 
                 // Add a dummy field for each generic excluded field
-                foreach(IFieldSymbol genericField in genericTypedFields)
+                foreach (IFieldSymbol genericField in genericTypedFields)
                 {
                     yield return CreateDummyField(
                         genericField.Type.ToDisplayString(),
@@ -164,5 +164,74 @@ public static bool IsBoundGenericType(this INamedTypeSymbol namedType)
 
             return true;
         }
+
+        /// <summary>
+        /// Detects if a generic type contains inaccessible type arguments.
+        /// </summary>
+        /// <param name="namedType">A loaded named type symbol <see cref="INamedTypeSymbol"/>.</param>
+        /// <param name="symbolFilter">Assembly symbol filter <see cref="ISymbolFilter"/>.</param>
+        /// <returns>Boolean</returns>
+        public static bool HasInaccessibleTypeArgument(this INamedTypeSymbol namedType, ISymbolFilter symbolFilter)
+            => namedType.IsGenericType && namedType.TypeArguments.Any(a => !symbolFilter.Include(a));
+
+        /// <summary>
+        /// Synthesize an internal default constructor for the type with implicit default constructor and the base type without.
+        /// </summary>
+        /// <param name="namedType">A loaded named type symbol <see cref="INamedTypeSymbol"/>.</param>
+        /// <param name="symbolFilter">Assembly symbol filter <see cref="ISymbolFilter"/>.</param>
+        public static IEnumerable<SyntaxNode> TryGetInternalDefaultConstructor(this INamedTypeSymbol namedType, ISymbolFilter symbolFilter)
+        {
+            if (namedType.BaseType != null && !namedType.Constructors.Any(symbolFilter.Include))
+            {
+                IEnumerable<IMethodSymbol> baseConstructors = namedType.BaseType.Constructors.Where(symbolFilter.Include);
+                if (baseConstructors.Any() && baseConstructors.All(c => !c.Parameters.IsEmpty))
+                {
+                    SyntaxKind visibility = SyntaxKind.InternalKeyword;
+
+                    Func<ISymbolFilter, bool> includeInternalSymbols = filter =>
+                        filter is AccessibilitySymbolFilter accessibilityFilter && accessibilityFilter.IncludeInternalSymbols;
+
+                    // Use the `Private` visibility if internal symbols are not filtered out.
+                    if (includeInternalSymbols(symbolFilter) ||
+                        (symbolFilter is CompositeSymbolFilter compositeSymbolFilter &&
+                            compositeSymbolFilter.Filters.Any(filter => includeInternalSymbols(filter))))
+                    {
+                        visibility = SyntaxKind.PrivateKeyword;
+                    }
+
+                    yield return SyntaxFactory.ConstructorDeclaration(
+                        new SyntaxList<AttributeListSyntax>(),
+                        SyntaxFactory.TokenList(new[] { SyntaxFactory.Token(visibility) }),
+                        SyntaxFactory.Identifier(namedType.ToDisplayString()),
+                        SyntaxFactory.ParameterList(),
+                        default!,
+                        default(BlockSyntax)!).WithInitializer(baseConstructors.First().GenerateBaseConstructorInitializer());
+                }
+            }
+        }
+
+        /// <summary>
+        /// Synthesize a base class initializer. 
+        /// </summary>
+        /// <param name="baseTypeConstructor">Represents a base class constructor <see cref="IMethodSymbol"/>.</param>
+        /// <returns>Returns the syntax node <see cref="ConstructorInitializerSyntax"/>.</returns>
+        public static ConstructorInitializerSyntax GenerateBaseConstructorInitializer(this IMethodSymbol baseTypeConstructor)
+        {
+            ConstructorInitializerSyntax constructorInitializer = SyntaxFactory.ConstructorInitializer(SyntaxKind.BaseConstructorInitializer);
+
+            foreach (IParameterSymbol parameter in baseTypeConstructor.Parameters)
+            {
+                IdentifierNameSyntax identifier;
+                // If the parameter's type is known to be a value type or has top-level nullability annotation
+                if (parameter.Type.IsValueType || parameter.NullableAnnotation == NullableAnnotation.Annotated)
+                    identifier = SyntaxFactory.IdentifierName("default");
+                else
+                    identifier = SyntaxFactory.IdentifierName("default!");
+
+                constructorInitializer = constructorInitializer.AddArgumentListArguments(SyntaxFactory.Argument(identifier));
+            }
+
+            return constructorInitializer;
+        }
     }
 }
diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs b/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs
index c1199c6040d9..a31df3fae9c9 100644
--- a/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs
+++ b/src/GenAPI/Microsoft.DotNet.GenAPI/SyntaxGeneratorExtensions.cs
@@ -9,6 +9,8 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System.Collections.Generic;
 using Microsoft.DotNet.ApiSymbolExtensions.Filtering;
+using System.Security.AccessControl;
+using Microsoft.VisualBasic;
 
 namespace Microsoft.DotNet.GenAPI
 {
@@ -59,7 +61,7 @@ public static SyntaxNode DeclarationExt(this SyntaxGenerator syntaxGenerator, IS
                             if (baseTypeConstructors.Any())
                             {
                                 ConstructorDeclarationSyntax declaration = (ConstructorDeclarationSyntax)syntaxGenerator.Declaration(method);
-                                return declaration.WithInitializer(GenerateBaseConstructorInitializer(baseTypeConstructors.First()));
+                                return declaration.WithInitializer(baseTypeConstructors.First().GenerateBaseConstructorInitializer());
                             }
                         }
                     }
@@ -95,25 +97,6 @@ public static SyntaxNode DeclarationExt(this SyntaxGenerator syntaxGenerator, IS
             }
         }
 
-        private static ConstructorInitializerSyntax GenerateBaseConstructorInitializer(IMethodSymbol baseTypeConstructor)
-        {
-            ConstructorInitializerSyntax constructorInitializer = SyntaxFactory.ConstructorInitializer(SyntaxKind.BaseConstructorInitializer);
-
-            foreach (IParameterSymbol parameter in baseTypeConstructor.Parameters)
-            {
-                IdentifierNameSyntax identifier;
-                // If the parameter's type is known to be a value type or has top-level nullability annotation
-                if (parameter.Type.IsValueType || parameter.NullableAnnotation == NullableAnnotation.Annotated)
-                    identifier = SyntaxFactory.IdentifierName("default");
-                else
-                    identifier = SyntaxFactory.IdentifierName("default!");
-
-                constructorInitializer = constructorInitializer.AddArgumentListArguments(SyntaxFactory.Argument(identifier));
-            }
-
-            return constructorInitializer;
-        }
-
         // Gets the list of base class and interfaces for a given symbol <see cref="INamedTypeSymbol"/>.
         private static BaseListSyntax? GetBaseTypeList(this SyntaxGenerator syntaxGenerator,
             INamedTypeSymbol type,
@@ -126,8 +109,10 @@ private static ConstructorInitializerSyntax GenerateBaseConstructorInitializer(I
                 baseTypes.Add(SyntaxFactory.SimpleBaseType((TypeSyntax)syntaxGenerator.TypeExpression(type.BaseType)));
             }
 
-            // includes only interfaces that were not filtered out by the given <see cref="ISymbolFilter"/>.
-            baseTypes.AddRange(type.Interfaces.Where(symbolFilter.Include).Select(i => SyntaxFactory.SimpleBaseType((TypeSyntax)syntaxGenerator.TypeExpression(i))));
+            // includes only interfaces that were not filtered out by the given <see cref="ISymbolFilter"/> or none of TypeParameters were filtered out.
+            baseTypes.AddRange(type.Interfaces
+                .Where(i => symbolFilter.Include(i) && !i.HasInaccessibleTypeArgument(symbolFilter))
+                .Select(i => SyntaxFactory.SimpleBaseType((TypeSyntax)syntaxGenerator.TypeExpression(i))));
             return baseTypes.Count > 0 ?
                 SyntaxFactory.BaseList(SyntaxFactory.SeparatedList(baseTypes)) :
                 null;
diff --git a/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/AccessibilitySymbolFilter.cs b/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/AccessibilitySymbolFilter.cs
index 5f70eb246868..40a50a2c11b8 100644
--- a/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/AccessibilitySymbolFilter.cs
+++ b/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/AccessibilitySymbolFilter.cs
@@ -10,22 +10,33 @@ namespace Microsoft.DotNet.ApiSymbolExtensions.Filtering
     /// </summary>
     public class AccessibilitySymbolFilter : ISymbolFilter
     {
-        private readonly bool _includeInternalSymbols;
-        private readonly bool _includeEffectivelyPrivateSymbols;
-        private readonly bool _includeExplicitInterfaceImplementationSymbols;
+        /// <summary>
+        /// Include internal API.
+        /// </summary>
+        public bool IncludeInternalSymbols { get; }
+
+        /// <summary>
+        /// Include effectively private API.
+        /// </summary>
+        public bool IncludeEffectivelyPrivateSymbols { get; }
+
+        /// <summary>
+        /// Include explicit interface implementation API.
+        /// </summary>
+        public bool IncludeExplicitInterfaceImplementationSymbols { get; }
 
         public AccessibilitySymbolFilter(bool includeInternalSymbols,
             bool includeEffectivelyPrivateSymbols = false,
             bool includeExplicitInterfaceImplementationSymbols = false)
         {
-            _includeInternalSymbols = includeInternalSymbols;
-            _includeEffectivelyPrivateSymbols = includeEffectivelyPrivateSymbols;
-            _includeExplicitInterfaceImplementationSymbols = includeExplicitInterfaceImplementationSymbols;
+            IncludeInternalSymbols = includeInternalSymbols;
+            IncludeEffectivelyPrivateSymbols = includeEffectivelyPrivateSymbols;
+            IncludeExplicitInterfaceImplementationSymbols = includeExplicitInterfaceImplementationSymbols;
         }
 
         /// <inheritdoc />
         public bool Include(ISymbol symbol) =>
-            symbol.IsVisibleOutsideOfAssembly(_includeInternalSymbols,
-                _includeEffectivelyPrivateSymbols, _includeExplicitInterfaceImplementationSymbols);
+            symbol.IsVisibleOutsideOfAssembly(IncludeInternalSymbols,
+                IncludeEffectivelyPrivateSymbols, IncludeExplicitInterfaceImplementationSymbols);
     }
 }
diff --git a/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/CompositeSymbolFilter.cs b/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/CompositeSymbolFilter.cs
index f111befa1ab6..686274f3ed6e 100644
--- a/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/CompositeSymbolFilter.cs
+++ b/src/Microsoft.DotNet.ApiSymbolExtensions/Filtering/CompositeSymbolFilter.cs
@@ -13,14 +13,19 @@ namespace Microsoft.DotNet.ApiSymbolExtensions.Filtering
     /// </summary>
     public class CompositeSymbolFilter : ISymbolFilter
     {
-        private readonly List<ISymbolFilter> _innerFilters = new();
+        public CompositeSymbolFilter() => Filters = new();
+
+        /// <summary>
+        /// List on inner filters.
+        /// </summary>
+        public List<ISymbolFilter> Filters { get; }
 
         /// <summary>
         /// Determines whether the <see cref="ISymbol"/> should be included.
         /// </summary>
         /// <param name="symbol"><see cref="ISymbol"/> to evaluate.</param>
         /// <returns>True to include the <paramref name="symbol"/> or false to filter it out.</returns>
-        public bool Include(ISymbol symbol) => _innerFilters.All(f => f.Include(symbol));
+        public bool Include(ISymbol symbol) => Filters.All(f => f.Include(symbol));
 
         /// <summary>
         /// Construct and add a new filter object to a list of filters.
@@ -29,7 +34,7 @@ public class CompositeSymbolFilter : ISymbolFilter
         /// <returns>Returns the current instance of the class.</returns>
         public CompositeSymbolFilter Add<T>() where T : ISymbolFilter, new()
         {
-            _innerFilters.Add(new T());
+            Filters.Add(new T());
             return this;
         }
 
@@ -40,7 +45,7 @@ public class CompositeSymbolFilter : ISymbolFilter
         /// <returns>Returns the current instance of the class.</returns>
         public CompositeSymbolFilter Add(ISymbolFilter filter)
         {
-            _innerFilters.Add(filter);
+            Filters.Add(filter);
             return this;
         }
     }
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets
index 573f54eef588..57deb0606c72 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.EolTargetFrameworks.targets
@@ -12,7 +12,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <!-- Default the check to true, but allow developers to turn the warning off. -->
-    <CheckEolTargetFramework Condition="'$(CheckEolTargetFramework)' == ''">true</CheckEolTargetFramework>
+    <CheckEolTargetFramework Condition="'$(CheckEolTargetFramework)' == '' and '$(OutputType)' != 'Library'">true</CheckEolTargetFramework>
   </PropertyGroup>
 
   <!--
diff --git a/src/Tests/Microsoft.DotNet.ApiSymbolExtensions.Tests/SymbolFactory.cs b/src/Tests/Microsoft.DotNet.ApiSymbolExtensions.Tests/SymbolFactory.cs
index 7afd896fdb5f..b5f39a3644cf 100644
--- a/src/Tests/Microsoft.DotNet.ApiSymbolExtensions.Tests/SymbolFactory.cs
+++ b/src/Tests/Microsoft.DotNet.ApiSymbolExtensions.Tests/SymbolFactory.cs
@@ -15,9 +15,13 @@ namespace Microsoft.DotNet.ApiSymbolExtensions.Tests
 {
     internal static class SymbolFactory
     {
-        public static string EmitAssemblyFromSyntax(string syntax, bool enableNullable = false, byte[] publicKey = null, [CallerMemberName] string assemblyName = "")
+        public static string EmitAssemblyFromSyntax(string syntax,
+            bool enableNullable = false,
+            byte[] publicKey = null,
+            [CallerMemberName] string assemblyName = "",
+            bool allowUnsafe = false)
         {
-            CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey);
+            CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey, allowUnsafe);
 
             Assert.Empty(compilation.GetDiagnostics());
 
@@ -29,19 +33,28 @@ public static string EmitAssemblyFromSyntax(string syntax, bool enableNullable =
             return assemblyPath;
         }
 
-        public static IAssemblySymbol GetAssemblyFromSyntax(string syntax, bool enableNullable = false, byte[] publicKey = null, [CallerMemberName] string assemblyName = "")
+        public static IAssemblySymbol GetAssemblyFromSyntax(string syntax,
+            bool enableNullable = false,
+            byte[] publicKey = null,
+            [CallerMemberName] string assemblyName = "",
+            bool allowUnsafe = false)
         {
-            CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey);
+            CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey, allowUnsafe);
 
             Assert.Empty(compilation.GetDiagnostics());
 
             return compilation.Assembly;
         }
 
-        public static IAssemblySymbol GetAssemblyFromSyntaxWithReferences(string syntax, IEnumerable<string> referencesSyntax, bool enableNullable = false, byte[] publicKey = null, [CallerMemberName] string assemblyName = "")
+        public static IAssemblySymbol GetAssemblyFromSyntaxWithReferences(string syntax,
+            IEnumerable<string> referencesSyntax,
+            bool enableNullable = false,
+            byte[] publicKey = null,
+            [CallerMemberName] string assemblyName = "",
+            bool allowUnsafe = false)
         {
-            CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey);
-            CSharpCompilation compilationWithReferences = CreateCSharpCompilationFromSyntax(referencesSyntax, $"{assemblyName}_reference", enableNullable, publicKey);
+            CSharpCompilation compilation = CreateCSharpCompilationFromSyntax(syntax, assemblyName, enableNullable, publicKey, allowUnsafe);
+            CSharpCompilation compilationWithReferences = CreateCSharpCompilationFromSyntax(referencesSyntax, $"{assemblyName}_reference", enableNullable, publicKey, allowUnsafe);
 
             compilation = compilation.AddReferences(compilationWithReferences.ToMetadataReference());
 
@@ -50,15 +63,15 @@ public static IAssemblySymbol GetAssemblyFromSyntaxWithReferences(string syntax,
             return compilation.Assembly;
         }
 
-        private static CSharpCompilation CreateCSharpCompilationFromSyntax(string syntax, string name, bool enableNullable, byte[] publicKey)
+        private static CSharpCompilation CreateCSharpCompilationFromSyntax(string syntax, string name, bool enableNullable, byte[] publicKey, bool allowUnsafe)
         {
-            CSharpCompilation compilation = CreateCSharpCompilation(name, enableNullable, publicKey);
+            CSharpCompilation compilation = CreateCSharpCompilation(name, enableNullable, publicKey, allowUnsafe);
             return compilation.AddSyntaxTrees(GetSyntaxTree(syntax));
         }
 
-        private static CSharpCompilation CreateCSharpCompilationFromSyntax(IEnumerable<string> syntax, string name, bool enableNullable, byte[] publicKey)
+        private static CSharpCompilation CreateCSharpCompilationFromSyntax(IEnumerable<string> syntax, string name, bool enableNullable, byte[] publicKey, bool allowUnsafe)
         {
-            CSharpCompilation compilation = CreateCSharpCompilation(name, enableNullable, publicKey);
+            CSharpCompilation compilation = CreateCSharpCompilation(name, enableNullable, publicKey, allowUnsafe);
             IEnumerable<SyntaxTree> syntaxTrees = syntax.Select(s => GetSyntaxTree(s));
             return compilation.AddSyntaxTrees(syntaxTrees);
         }
@@ -68,13 +81,14 @@ private static SyntaxTree GetSyntaxTree(string syntax)
             return CSharpSyntaxTree.ParseText(syntax, ParseOptions);
         }
 
-        private static CSharpCompilation CreateCSharpCompilation(string name, bool enableNullable, byte[] publicKey)
+        private static CSharpCompilation CreateCSharpCompilation(string name, bool enableNullable, byte[] publicKey, bool allowUnsafe)
         {
             bool publicSign = publicKey != null ? true : false;
             var compilationOptions = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary,
                                                                   publicSign: publicSign,
                                                                   cryptoPublicKey: publicSign ? publicKey.ToImmutableArray() : default,
                                                                   nullableContextOptions: enableNullable ? NullableContextOptions.Enable : NullableContextOptions.Disable,
+                                                                  allowUnsafe: allowUnsafe, 
                                                                   specificDiagnosticOptions: DiagnosticOptions);
 
             return CSharpCompilation.Create(name, options: compilationOptions, references: DefaultReferences);
diff --git a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs
index 520757159642..63fcdd061d94 100644
--- a/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs
+++ b/src/Tests/Microsoft.DotNet.GenAPI.Tests/CSharpFileBuilderTests.cs
@@ -35,7 +35,8 @@ private void RunTest(string original,
             string expected,
             bool includeInternalSymbols = true,
             bool includeEffectivelyPrivateSymbols = true,
-            bool includeExplicitInterfaceImplementationSymbols = true)
+            bool includeExplicitInterfaceImplementationSymbols = true,
+            bool allowUnsafe = false)
         {
             StringWriter stringWriter = new();
 
@@ -46,7 +47,7 @@ private void RunTest(string original,
             IAssemblySymbolWriter csharpFileBuilder = new CSharpFileBuilder(new ConsoleLog(MessageImportance.Low),
                 compositeFilter, stringWriter, null, false, MetadataReferences);
 
-            IAssemblySymbol assemblySymbol = SymbolFactory.GetAssemblyFromSyntax(original, enableNullable: true);
+            IAssemblySymbol assemblySymbol = SymbolFactory.GetAssemblyFromSyntax(original, enableNullable: true, allowUnsafe: allowUnsafe);
             csharpFileBuilder.WriteAssembly(assemblySymbol);
 
             StringBuilder stringBuilder = stringWriter.GetStringBuilder();
@@ -1417,5 +1418,326 @@ public partial class foo
                     """,
                 includeInternalSymbols: false);
         }
+
+        [Fact (Skip="https://github.com/dotnet/roslyn/issues/67019")]
+        public void TestInterfaceWithOperatorGeneration()
+        {
+            RunTest(original: """
+                    namespace A
+                    {
+                        public interface IntType
+                        {
+                            public static IntType operator +(IntType left, IntType right) => left + right;
+                        }
+                    }
+                    """,
+                expected: """
+                    namespace A
+                    {
+                        public partial interface IntType
+                        {
+                            public static IntType operator +(IntType left, IntType right) => left + right;
+                        }
+                    }
+                    """,
+                 includeInternalSymbols: false);
+        }
+
+        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/67019")]
+        public void TestInterfaceWithCheckedOperatorGeneration()
+        {
+            RunTest(original: """
+                    namespace A
+                    {
+                        public interface IAdditionOperators<TSelf, TOther, TResult>
+                            where TSelf : IAdditionOperators<TSelf, TOther, TResult>?
+                        {
+                            static abstract TResult operator +(TSelf left, TOther right);
+                            static virtual TResult operator checked +(TSelf left, TOther right) => left + right;
+                        }
+                    }
+                    """,
+                expected: """
+                    namespace A
+                    {
+                        public interface IAdditionOperators<TSelf, TOther, TResult>
+                            where TSelf : IAdditionOperators<TSelf, TOther, TResult>?
+                        {
+                            static abstract TResult operator +(TSelf left, TOther right);
+                            static virtual TResult operator checked +(TSelf left, TOther right) { throw null; }
+                        }
+                    }
+                    """,
+                 includeInternalSymbols: false);
+        }
+
+        [Fact]
+        public void TestUnsafeFieldGeneration()
+        {
+            RunTest(original: """
+                    namespace A
+                    {
+                        public struct Node
+                        {
+                            public unsafe Node* Left;
+                            public unsafe Node* Right;
+                            public int Value;
+                        }
+                    }
+                    """,
+                expected: """
+                    namespace A
+                    {
+                        public partial struct Node
+                        {
+                            public unsafe Node* Left;
+                            public unsafe Node* Right;
+                            public int Value;
+                        }
+                    }
+                    """,
+                includeInternalSymbols: false,
+                allowUnsafe: true);
+        }
+
+        [Fact]
+        public void TestUnsafeMethodGeneration()
+        {
+            RunTest(original: """
+                    namespace A
+                    {
+                        public unsafe class A
+                        {
+                            public virtual void F(char* p) {}
+                        }
+
+                        public class B: A
+                        {
+                            public unsafe override void F(char* p) {}
+                        }
+                    }
+                    """,
+                expected: """
+                    namespace A
+                    {
+                        public partial class A
+                        {
+                            public virtual unsafe void F(char* p) { }
+                        }
+
+                        public partial class B : A
+                        {
+                            public override unsafe void F(char* p) { }
+                        }
+                    }
+                    """,
+                includeInternalSymbols: false,
+                allowUnsafe: true);
+        }
+
+        [Fact]
+        public void TestInternalDefaultConstructorGeneration()
+        {
+            RunTest(original: """
+                    namespace A
+                    {
+                        public class Bar
+                        {
+                            public Bar(int a) { }
+                        }
+
+                        public class Foo : Bar
+                        {
+                            internal Foo() : base(1) { }
+                        }
+                    }
+                    namespace B
+                    {
+                        public class Bar
+                        {
+                            public Bar(int a) { }
+                        }
+                    
+                        public class Foo : Bar
+                        {
+                            private Foo() : base(1) { }
+                        }
+                    }
+                    """,
+                expected: """
+                    namespace A
+                    {
+                        public partial class Bar
+                        {
+                            public Bar(int a) { }
+                        }
+
+                        public partial class Foo : Bar
+                        {
+                            internal Foo() : base(default) { }
+                        }
+                    }
+                    namespace B
+                    {
+                        public partial class Bar
+                        {
+                            public Bar(int a) { }
+                        }
+                    
+                        public partial class Foo : Bar
+                        {
+                            internal Foo() : base(default) { }
+                        }
+                    }
+                    """,
+                includeInternalSymbols: false);
+        }
+
+        [Fact]
+        public void TestPrivateDefaultConstructorGeneration()
+        {
+            RunTest(original: """
+                    namespace A
+                    {
+                        public class Bar
+                        {
+                            public Bar(int a) { }
+                        }
+
+                        public class Foo : Bar
+                        {
+                            private Foo() : base(1) { }
+                        }
+                    }
+                    """,
+                expected: """
+                    namespace A
+                    {
+                        public partial class Bar
+                        {
+                            public Bar(int a) { }
+                        }
+
+                        public partial class Foo : Bar
+                        {
+                            private Foo() : base(default) { }
+                        }
+                    }
+                    """,
+                includeInternalSymbols: true,
+                includeEffectivelyPrivateSymbols: true);
+        }
+
+        [Fact]
+        public void TestInternalDefaultConstructorGenerationForGenericType()
+        {
+            RunTest(original: """
+                    namespace A
+                    {
+                        public class Bar
+                        {
+                            public Bar(int a) { }
+                        }
+
+                        public class Foo<T> : Bar
+                        {
+                            internal Foo() : base(1) { }
+                        }
+                    }
+                    """,
+                expected: """
+                    namespace A
+                    {
+                        public partial class Bar
+                        {
+                            public Bar(int a) { }
+                        }
+
+                        public partial class Foo<T> : Bar
+                        {
+                            internal Foo() : base(default) { }
+                        }
+                    }
+                    """,
+                includeInternalSymbols: false);
+        }
+
+        [Fact]
+        public void TestBaseClassWithExplicitDefaultConstructor()
+        {
+            RunTest(original: """
+                    namespace A
+                    {
+                        public class Bar
+                        {
+                            public Bar() { }
+                        }
+
+                        public class Foo : Bar
+                        {
+                        }
+                    }
+                    """,
+                expected: """
+                    namespace A
+                    {
+                        public partial class Bar
+                        {
+                            public Bar() { }
+                        }
+
+                        public partial class Foo : Bar
+                        {
+                        }
+                    }
+                    """,
+                includeInternalSymbols: false);
+        }
+
+        [Fact]
+        public void TestGenericBaseInterfaceWithInaccessibleTypeArguments()
+        {
+            RunTest(original: """
+                    namespace A
+                    {
+                        internal class IOption2
+                        {
+                        }
+
+                        public interface IOption
+                        {
+                        }
+
+                        public interface AreEqual<T>
+                        {
+                            bool Compare(T other);
+                        }
+
+                        public class PerLanguageOption : AreEqual<IOption2>, IOption
+                        {
+                            bool AreEqual<IOption2>.Compare(IOption2 other) => false;
+                        }
+                    }
+                    """,
+                expected: """
+                    namespace A
+                    {
+                        public partial interface AreEqual<T>
+                        {
+                            bool Compare(T other);
+                        }
+
+                        public partial interface IOption
+                        {
+                        }
+                    
+                        public partial class PerLanguageOption : IOption
+                        {
+                        }
+                    }
+                    """,
+                includeInternalSymbols: false);
+        }
     }
 }
+
diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs
index ed01d238dd29..50c061375d29 100644
--- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs
+++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToTargetEolFrameworks.cs
@@ -55,6 +55,7 @@ public void It_only_checks_for_netcoreapp_eol_frameworks()
             {
                 Name = $"EolOnlyNetCore",
                 TargetFrameworks = $"netcoreapp1.0;{ToolsetInfo.CurrentTargetFramework};net472",
+                IsExe = true,
             };
 
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
@@ -97,5 +98,28 @@ public void It_does_not_warn_when_deactivating_check()
                 .And
                 .NotHaveStdOutContaining("NETSDK1138");
         }
+
+        [Fact]
+        public void It_does_not_warn_when_target_library()
+        {
+            var testProject = new TestProject()
+            {
+                Name = $"EolNoWarning",
+                TargetFrameworks = "netcoreapp1.0",
+            };
+
+            var testAsset = _testAssetsManager.CreateTestProject(testProject);
+
+            var buildCommand = new BuildCommand(testAsset);
+
+            var result = buildCommand
+                .Execute();
+
+            result
+                .Should()
+                .Pass()
+                .And
+                .NotHaveStdOutContaining("NETSDK1138");
+        }
     }
 }
diff --git a/src/Tests/dotnet-list-package.Tests/GivenDotnetListPackage.cs b/src/Tests/dotnet-list-package.Tests/GivenDotnetListPackage.cs
index 16c3bd1d17b9..e812c42f1e77 100644
--- a/src/Tests/dotnet-list-package.Tests/GivenDotnetListPackage.cs
+++ b/src/Tests/dotnet-list-package.Tests/GivenDotnetListPackage.cs
@@ -314,8 +314,10 @@ public void ItListsFSharpProject()
         [InlineData(false, "--outdated", "--highest-minor")]
         [InlineData(false, "--outdated", "--highest-patch")]
         [InlineData(false, "--config")]
+        [InlineData(false, "--configfile")]
         [InlineData(false, "--source")]
         [InlineData(false, "--config", "--deprecated")]
+        [InlineData(false, "--configfile", "--deprecated")]
         [InlineData(false, "--source", "--vulnerable")]
         [InlineData(true, "--vulnerable", "--deprecated")]
         [InlineData(true, "--vulnerable", "--outdated")]
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs
index 95dc65f15d45..af21b8b7fd31 100644
--- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs
+++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetBuildInvocation.cs
@@ -1,10 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.DotNet.Tools.Build;
 using FluentAssertions;
-using Xunit;
+using Microsoft.DotNet.Tools.Build;
 using Microsoft.NET.TestFramework;
+using Xunit;
 
 namespace Microsoft.DotNet.Cli.MSBuild.Tests
 {
@@ -24,6 +24,7 @@ public class GivenDotnetBuildInvocation : IClassFixture<NullCurrentSessionIdFixt
         [InlineData(new string[] { "-o", "foo1 foo2" }, "\"-property:OutputPath=<cwd>foo1 foo2\" -property:_CommandLineDefinedOutputPath=true")]
         [InlineData(new string[] { "--no-incremental" }, "-target:Rebuild")]
         [InlineData(new string[] { "-r", "rid" }, "-property:RuntimeIdentifier=rid -property:_CommandLineDefinedRuntimeIdentifier=true")]
+        [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifier=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")]
         [InlineData(new string[] { "--runtime", "rid" }, "-property:RuntimeIdentifier=rid -property:_CommandLineDefinedRuntimeIdentifier=true")]
         [InlineData(new string[] { "--use-current-runtime" }, "-property:UseCurrentRuntimeIdentifier=True")]
         [InlineData(new string[] { "--ucr" }, "-property:UseCurrentRuntimeIdentifier=True")]
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetCleanInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetCleanInvocation.cs
index f7448c96aa8e..e86feb9dcd67 100644
--- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetCleanInvocation.cs
+++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetCleanInvocation.cs
@@ -1,13 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.DotNet.Tools.Clean;
 using FluentAssertions;
-using Xunit;
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
+using Microsoft.DotNet.Tools.Clean;
 using Microsoft.NET.TestFramework;
+using Xunit;
 
 namespace Microsoft.DotNet.Cli.MSBuild.Tests
 {
@@ -37,6 +34,8 @@ public void ItAddsProjectToMsbuildInvocation()
         [InlineData(new string[] { "--configuration", "<configuration>" }, "-property:Configuration=<configuration>")]
         [InlineData(new string[] { "-v", "diag" }, "-verbosity:diag")]
         [InlineData(new string[] { "--verbosity", "diag" }, "-verbosity:diag")]
+        [InlineData(new string[] { "--disable-build-servers" }, "-p:UseRazorBuildServer=false -p:UseSharedCompilation=false /nodeReuse:false")]
+
         public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
         {
             CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs
new file mode 100644
index 000000000000..546f27c11ac2
--- /dev/null
+++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetMSBuildInvocation.cs
@@ -0,0 +1,39 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using FluentAssertions;
+using Microsoft.DotNet.Tools.MSBuild;
+using Microsoft.NET.TestFramework;
+using Xunit;
+
+namespace Microsoft.DotNet.Cli.MSBuild.Tests
+{
+    [Collection(TestConstants.UsesStaticTelemetryState)]
+
+    public class GivenDotnetMSBuildInvocation : IClassFixture<NullCurrentSessionIdFixture>
+    {
+        const string ExpectedPrefix = "-maxcpucount -verbosity:m";
+       
+        private static readonly string WorkingDirectory =
+            TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetPackInvocation));
+
+        [Theory]
+        [InlineData(new string[] { "--disable-build-servers" }, "-p:UseRazorBuildServer=false -p:UseSharedCompilation=false /nodeReuse:false")]
+
+        public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
+        {
+            CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
+            {
+                expectedAdditionalArgs =
+                    (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}")
+                    .Replace("<cwd>", WorkingDirectory);
+
+                var msbuildPath = "<msbuildpath>";
+                var command = MSBuildCommand.FromArgs(args, msbuildPath);
+ 
+                command.GetArgumentsToMSBuild().Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}");
+            });
+        }
+    }
+}
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs
index 872f19968158..111f3c3420f9 100644
--- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs
+++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetOsArchOptions.cs
@@ -143,5 +143,18 @@ public void CommandsRunWithArchOption(string command)
                 .Should()
                 .Pass();
         }
+
+        [Fact]
+        public void ArchOptionsAMD64toX64()
+        {
+            CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
+            {
+                var msbuildPath = "<msbuildpath>";
+                var command = BuildCommand.FromArgs(new string[] { "--arch", "amd64", "--os", "os" }, msbuildPath);
+                command.GetArgumentsToMSBuild()
+                    .Should()
+                    .StartWith($"{ExpectedPrefix} -restore -consoleloggerparameters:Summary -property:RuntimeIdentifier=os-x64 -property:SelfContained=false");
+            });
+        }
     }
 }
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPackInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPackInvocation.cs
index 2560f3259405..e9114dfed35e 100644
--- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPackInvocation.cs
+++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPackInvocation.cs
@@ -37,6 +37,8 @@ public class GivenDotnetPackInvocation : IClassFixture<NullCurrentSessionIdFixtu
         [InlineData(new string[] { "-v", "diag" }, "-verbosity:diag")]
         [InlineData(new string[] { "--verbosity", "diag" }, "-verbosity:diag")]
         [InlineData(new string[] { "<project>" }, "<project>")]
+        [InlineData(new string[] { "--disable-build-servers" }, "-p:UseRazorBuildServer=false -p:UseSharedCompilation=false /nodeReuse:false")]
+
         public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
         {
             CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs
index 0e58ee9d1e3f..e1acd1938d46 100644
--- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs
+++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetPublishInvocation.cs
@@ -28,6 +28,7 @@ public GivenDotnetPublishInvocation(ITestOutputHelper output)
         [Theory]
         [InlineData(new string[] { }, "")]
         [InlineData(new string[] { "-r", "<rid>" }, "-property:RuntimeIdentifier=<rid> -property:_CommandLineDefinedRuntimeIdentifier=true")]
+        [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifier=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")]
         [InlineData(new string[] { "--runtime", "<rid>" }, "-property:RuntimeIdentifier=<rid> -property:_CommandLineDefinedRuntimeIdentifier=true")]
         [InlineData(new string[] { "--use-current-runtime" }, "-property:UseCurrentRuntimeIdentifier=True")]
         [InlineData(new string[] { "--ucr" }, "-property:UseCurrentRuntimeIdentifier=True")]
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs
index 9dbc3c6530ad..448387d74b13 100644
--- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs
+++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetRestoreInvocation.cs
@@ -1,13 +1,10 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.DotNet.Tools.Restore;
 using FluentAssertions;
-using Xunit;
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
+using Microsoft.DotNet.Tools.Restore;
 using Microsoft.NET.TestFramework;
+using Xunit;
 
 namespace Microsoft.DotNet.Cli.MSBuild.Tests
 {
@@ -25,6 +22,7 @@ public class GivenDotnetRestoreInvocation : IClassFixture<NullCurrentSessionIdFi
         [InlineData(new string[] { "--source", "<source>" }, "-property:RestoreSources=<source>")]
         [InlineData(new string[] { "-s", "<source0>", "-s", "<source1>" }, "-property:RestoreSources=<source0>%3B<source1>")]
         [InlineData(new string[] { "-r", "<runtime>" }, "-property:RuntimeIdentifiers=<runtime>")]
+        [InlineData(new string[] { "-r", "linux-amd64" }, "-property:RuntimeIdentifiers=linux-x64")]
         [InlineData(new string[] { "--runtime", "<runtime>" }, "-property:RuntimeIdentifiers=<runtime>")]
         [InlineData(new string[] { "-r", "<runtime0>", "-r", "<runtime1>" }, "-property:RuntimeIdentifiers=<runtime0>%3B<runtime1>")]
         [InlineData(new string[] { "--packages", "<packages>" }, "-property:RestorePackagesPath=<cwd><packages>")]
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs
index 596f028e7eab..41d19ac2cde8 100644
--- a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs
+++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetStoreInvocation.cs
@@ -34,6 +34,7 @@ public void ItAddsProjectToMsbuildInvocation(string optionName)
         [InlineData(new string[] { "-f", "<tfm>" }, @"-property:TargetFramework=<tfm>")]
         [InlineData(new string[] { "--framework", "<tfm>" }, @"-property:TargetFramework=<tfm>")]
         [InlineData(new string[] { "-r", "<rid>" }, @"-property:RuntimeIdentifier=<rid> -property:_CommandLineDefinedRuntimeIdentifier=true")]
+        [InlineData(new string[] { "-r", "linux-amd64" }, @"-property:RuntimeIdentifier=linux-x64 -property:_CommandLineDefinedRuntimeIdentifier=true")]
         [InlineData(new string[] { "--runtime", "<rid>" }, @"-property:RuntimeIdentifier=<rid> -property:_CommandLineDefinedRuntimeIdentifier=true")]
         [InlineData(new string[] { "--use-current-runtime" }, "-property:UseCurrentRuntimeIdentifier=True")]
         [InlineData(new string[] { "--ucr" }, "-property:UseCurrentRuntimeIdentifier=True")]
diff --git a/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetTestInvocation.cs b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetTestInvocation.cs
new file mode 100644
index 000000000000..e4465bf4a453
--- /dev/null
+++ b/src/Tests/dotnet.Tests/dotnet-msbuild/GivenDotnetTestInvocation.cs
@@ -0,0 +1,41 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+using FluentAssertions;
+using Microsoft.DotNet.Tools.Test;
+using Microsoft.NET.TestFramework;
+using Xunit;
+
+namespace Microsoft.DotNet.Cli.MSBuild.Tests
+{
+    [Collection(TestConstants.UsesStaticTelemetryState)]
+    public class GivenDotnetTestInvocation : IClassFixture<NullCurrentSessionIdFixture>
+    {
+        private const string ExpectedPrefix =
+            "-maxcpucount -verbosity:m -restore -target:VSTest -nodereuse:false -nologo";
+        private static readonly string WorkingDirectory =
+            TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetTestInvocation));
+
+        [Theory]
+        [InlineData(new string[] { "--disable-build-servers" }, "-p:UseRazorBuildServer=false -p:UseSharedCompilation=false /nodeReuse:false -property:VSTestArtifactsProcessingMode=collect -property:VSTestSessionCorrelationId=<testSessionCorrelationId>")]
+        public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
+        {
+            CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
+            {
+                Telemetry.Telemetry.DisableForTests();
+
+                expectedAdditionalArgs =
+                    (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}")
+                    .Replace("<cwd>", WorkingDirectory);
+
+                var testSessionCorrelationId = "<testSessionCorrelationId>";
+                var msbuildPath = "<msbuildpath>";
+               
+                TestCommand.FromArgs(args, testSessionCorrelationId, msbuildPath)
+                    .GetArgumentsToMSBuild()
+                    .Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}");
+            });
+        }
+    }
+}