diff --git a/eng/Versions.props b/eng/Versions.props
index e0dcbfd0f3..615e3a06bc 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -52,7 +52,8 @@
See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md for instructions on using darc.
-->
-
+
+
7.0.0-preview.5.22364.1
7.0.0-preview.5.22364.1
7.0.0-preview.5.22364.1
diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln
index bce886a591..84ca54e80e 100644
--- a/src/Razor/Razor.sln
+++ b/src/Razor/Razor.sln
@@ -107,6 +107,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor", "..\Compiler\Microsoft.CodeAnalysis.Razor\src\Microsoft.CodeAnalysis.Razor.csproj", "{F2FAEEE4-D830-4803-AE25-E5C7A816D19A}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions", "..\Compiler\Microsoft.AspNetCore.Mvc.Razor.Extensions\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.csproj", "{375B71A8-DCAC-408B-A6A4-4DB842A57C01}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X", "..\Compiler\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X.csproj", "{EF6275D9-682E-4ED9-85BB-92AFF18169CE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X", "..\Compiler\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X\src\Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X.csproj", "{DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -467,6 +473,30 @@ Global
{F2FAEEE4-D830-4803-AE25-E5C7A816D19A}.Release|Any CPU.Build.0 = Release|Any CPU
{F2FAEEE4-D830-4803-AE25-E5C7A816D19A}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
{F2FAEEE4-D830-4803-AE25-E5C7A816D19A}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
+ {375B71A8-DCAC-408B-A6A4-4DB842A57C01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {375B71A8-DCAC-408B-A6A4-4DB842A57C01}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {375B71A8-DCAC-408B-A6A4-4DB842A57C01}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
+ {375B71A8-DCAC-408B-A6A4-4DB842A57C01}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
+ {375B71A8-DCAC-408B-A6A4-4DB842A57C01}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {375B71A8-DCAC-408B-A6A4-4DB842A57C01}.Release|Any CPU.Build.0 = Release|Any CPU
+ {375B71A8-DCAC-408B-A6A4-4DB842A57C01}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
+ {375B71A8-DCAC-408B-A6A4-4DB842A57C01}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
+ {EF6275D9-682E-4ED9-85BB-92AFF18169CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EF6275D9-682E-4ED9-85BB-92AFF18169CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EF6275D9-682E-4ED9-85BB-92AFF18169CE}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
+ {EF6275D9-682E-4ED9-85BB-92AFF18169CE}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
+ {EF6275D9-682E-4ED9-85BB-92AFF18169CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EF6275D9-682E-4ED9-85BB-92AFF18169CE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EF6275D9-682E-4ED9-85BB-92AFF18169CE}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
+ {EF6275D9-682E-4ED9-85BB-92AFF18169CE}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
+ {DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
+ {DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
+ {DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
+ {DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -516,6 +546,9 @@ Global
{093B790B-1283-4EB3-B77E-4F9C4FB2A895} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
{A1939F46-C07D-48E4-A4C2-0A8993986653} = {5B60F564-4AD7-4B70-A887-7D91496799A2}
{F2FAEEE4-D830-4803-AE25-E5C7A816D19A} = {5B60F564-4AD7-4B70-A887-7D91496799A2}
+ {375B71A8-DCAC-408B-A6A4-4DB842A57C01} = {5B60F564-4AD7-4B70-A887-7D91496799A2}
+ {EF6275D9-682E-4ED9-85BB-92AFF18169CE} = {5B60F564-4AD7-4B70-A887-7D91496799A2}
+ {DE2A3AB5-3CE4-4CB3-BF46-1D54E537D130} = {5B60F564-4AD7-4B70-A887-7D91496799A2}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26}
diff --git a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj
index b92893326a..7629ffe97a 100644
--- a/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj
+++ b/src/Razor/benchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj
@@ -11,6 +11,7 @@
+
@@ -40,7 +41,6 @@
-
diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj
index 28787dee7a..4eb1f99e5f 100644
--- a/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj
+++ b/src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer.Common/Microsoft.AspNetCore.Razor.LanguageServer.Common.csproj
@@ -7,14 +7,11 @@
false
-
-
-
-
-
-
+
+
+
diff --git a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
index ff03f7275f..0d242be664 100644
--- a/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
+++ b/src/Razor/src/Microsoft.CodeAnalysis.Razor.Workspaces/Microsoft.CodeAnalysis.Razor.Workspaces.csproj
@@ -12,15 +12,15 @@
-
-
-
+
+
+
diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj b/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
index 51f5dd836a..79340903fe 100644
--- a/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
+++ b/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj
@@ -52,10 +52,6 @@
-
-
-
-
@@ -68,9 +64,9 @@
-
-
-
+
+
+
@@ -114,7 +110,12 @@
-
+
+
+
+
+
+
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/AssemblyBindingRedirects.cs b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/AssemblyBindingRedirects.cs
index 56e8caea68..cc60b5d128 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/AssemblyBindingRedirects.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/AssemblyBindingRedirects.cs
@@ -5,27 +5,6 @@
using Microsoft.VisualStudio.Shell;
-[assembly: ProvideBindingRedirection(
- AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions",
- GenerateCodeBase = true,
- PublicKeyToken = "adb9793829ddae60",
- OldVersionLowerBound = "0.0.0.0",
- OldVersionUpperBound = "7.0.0.0",
- NewVersion = "7.0.0.0")]
-[assembly: ProvideBindingRedirection(
- AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X",
- GenerateCodeBase = true,
- PublicKeyToken = "adb9793829ddae60",
- OldVersionLowerBound = "0.0.0.0",
- OldVersionUpperBound = "7.0.0.0",
- NewVersion = "7.0.0.0")]
-[assembly: ProvideBindingRedirection(
- AssemblyName = "Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X",
- GenerateCodeBase = true,
- PublicKeyToken = "adb9793829ddae60",
- OldVersionLowerBound = "0.0.0.0",
- OldVersionUpperBound = "7.0.0.0",
- NewVersion = "7.0.0.0")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.Extensions.Logging.Abstractions",
GenerateCodeBase = true,
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
index 78440c31e8..4f5834a332 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
@@ -216,12 +216,12 @@
+
+
+
-
-
-
diff --git a/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.Test/Microsoft.CodeAnalysis.Remote.Razor.Test.csproj b/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.Test/Microsoft.CodeAnalysis.Remote.Razor.Test.csproj
index ae66886cb5..4fea43b387 100644
--- a/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.Test/Microsoft.CodeAnalysis.Remote.Razor.Test.csproj
+++ b/src/Razor/test/Microsoft.CodeAnalysis.Remote.Razor.Test/Microsoft.CodeAnalysis.Remote.Razor.Test.csproj
@@ -11,10 +11,7 @@
-
-
-
-
+
diff --git a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
index 0cd6ac2912..db3ff34cde 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
+++ b/src/Razor/test/Microsoft.VisualStudio.Editor.Razor.Test/Microsoft.VisualStudio.Editor.Razor.Test.csproj
@@ -22,12 +22,12 @@
+
+
+
-
-
-
diff --git a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
index 918d4d183a..34bbf7d578 100644
--- a/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
+++ b/src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Microsoft.VisualStudio.LanguageServices.Razor.Test.csproj
@@ -29,11 +29,11 @@
+
+
-
-