diff --git a/Directory.Build.props b/Directory.Build.props
index 24c0403f639..27a5c26a150 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -72,31 +72,11 @@
     There are effectively three modes that are needed for our source build TFMs and this is where
     we calculate them
   -->
-  <Choose>
-    <!--
-      1. CI source build leg: this needs to build the current and previous source build TFM. Both are
-        necessary as the output of this leg is used in other CI source build legs. Those could be
-        targeting NetCurrent or NetPrevious hence we must produce both.
-    -->
-    <When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' != 'true'">
-      <PropertyGroup>
-        <NetVS>$(NetCurrent)</NetVS>
-        <NetVSCode>$(NetCurrent)</NetVSCode>
-        <NetVSAndVSCode>$(NetVS);$(NetVSCode);$(NetPrevious)</NetVSAndVSCode>
-      </PropertyGroup>
-    </When>
-
-    <!--
-      2. Source build the product: this is the all up build of the product which needs only NetCurrent
-    -->
-    <When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildFromVMR)' == 'true'">
-      <PropertyGroup>
-        <NetVS>$(NetCurrent)</NetVS>
-        <NetVSCode>$(NetCurrent)</NetVSCode>
-        <NetVSAndVSCode>$(NetVS);$(NetVSCode)</NetVSAndVSCode>
-      </PropertyGroup>
-    </When>
-  </Choose>
+  <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <NetVS>$(NetCurrent)</NetVS>
+    <NetVSCode>$(NetCurrent)</NetVSCode>
+    <NetVSAndVSCode>$(NetVS);$(NetVSCode)</NetVSAndVSCode>
+  </PropertyGroup>
 
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)eng\BannedSymbols.txt" />
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 7b08d499a48..de4ffecc7f6 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -26,8 +26,8 @@ This file should be imported by eng/Versions.props
     <MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>5.3.0-2.25630.5</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
     <MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>5.3.0-2.25630.5</MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion>
     <MicrosoftNetCompilersToolsetPackageVersion>5.3.0-2.25630.5</MicrosoftNetCompilersToolsetPackageVersion>
-    <MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion>5.3.0-2.25630.5</MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion>
     <MicrosoftVisualStudioExtensibilityTestingSourceGeneratorPackageVersion>5.3.0-2.25630.5</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorPackageVersion>
+    <MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion>5.3.0-2.25630.5</MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion>
     <MicrosoftVisualStudioLanguageServicesPackageVersion>5.3.0-2.25630.5</MicrosoftVisualStudioLanguageServicesPackageVersion>
     <RoslynDiagnosticsAnalyzersPackageVersion>5.3.0-2.25630.5</RoslynDiagnosticsAnalyzersPackageVersion>
     <!-- dotnet/arcade dependencies -->
@@ -61,8 +61,8 @@ This file should be imported by eng/Versions.props
     <MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
     <MicrosoftCommonLanguageServerProtocolFrameworkVersion>$(MicrosoftCommonLanguageServerProtocolFrameworkPackageVersion)</MicrosoftCommonLanguageServerProtocolFrameworkVersion>
     <MicrosoftNetCompilersToolsetVersion>$(MicrosoftNetCompilersToolsetPackageVersion)</MicrosoftNetCompilersToolsetVersion>
-    <MicrosoftVisualStudioExtensibilityTestingXunitVersion>$(MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion)</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
     <MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>$(MicrosoftVisualStudioExtensibilityTestingSourceGeneratorPackageVersion)</MicrosoftVisualStudioExtensibilityTestingSourceGeneratorVersion>
+    <MicrosoftVisualStudioExtensibilityTestingXunitVersion>$(MicrosoftVisualStudioExtensibilityTestingXunitPackageVersion)</MicrosoftVisualStudioExtensibilityTestingXunitVersion>
     <MicrosoftVisualStudioLanguageServicesVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</MicrosoftVisualStudioLanguageServicesVersion>
     <RoslynDiagnosticsAnalyzersVersion>$(RoslynDiagnosticsAnalyzersPackageVersion)</RoslynDiagnosticsAnalyzersVersion>
     <!-- dotnet/arcade dependencies -->
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f5d6855457a..a85d6e01a54 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="5a69737e6f6447fe397d552503a3909ea49f6f34" BarId="293565" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="razor" Sha="bac69806be267e5c3fbd02ea60d69f6bdc0356ae" BarId="297491" />
   <ProductDependencies>
     <Dependency Name="Roslyn.Diagnostics.Analyzers" Version="5.3.0-2.25630.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
@@ -63,12 +63,12 @@
       <Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
     </Dependency>
     <Dependency Name="Microsoft.VisualStudio.Extensibility.Testing.Xunit" Version="5.3.0-2.25630.5">
-        <Uri>https://github.com/dotnet/roslyn</Uri>
-        <Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
     </Dependency>
     <Dependency Name="Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator" Version="5.3.0-2.25630.5">
-        <Uri>https://github.com/dotnet/roslyn</Uri>
-        <Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>635d2b812121ef9fafe0de223b09be64e5a4a291</Sha>
     </Dependency>
     <Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.3.0-2.25630.5">
       <Uri>https://github.com/dotnet/roslyn</Uri>
diff --git a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/IncompatibleProjectNotifier.cs b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/IncompatibleProjectNotifier.cs
index 4dc18f62393..de72ed29242 100644
--- a/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/IncompatibleProjectNotifier.cs
+++ b/src/Razor/src/Microsoft.VisualStudioCode.RazorExtension/Services/IncompatibleProjectNotifier.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Linq;