diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 044aca3d9fb..00fdbdccecc 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -212,7 +212,6 @@ stages:
$(_BuildArgs)
$(_PublishArgs)
$(_InternalRuntimeDownloadArgs)
- /p:IncludeRoslynDeps=true
name: Build
displayName: Build and Deploy
condition: succeeded()
diff --git a/eng/SetupVSHive.ps1 b/eng/SetupVSHive.ps1
index 097ca05c104..15e4f12383c 100644
--- a/eng/SetupVSHive.ps1
+++ b/eng/SetupVSHive.ps1
@@ -9,7 +9,7 @@ $vsDir = $vsInfo.installationPath.TrimEnd("\")
$vsRegEdit = Join-Path (Join-Path (Join-Path $vsDir 'Common7') 'IDE') 'VSRegEdit.exe'
-$hive = "RoslynDev"
+$hive = "RazorDev"
&$vsRegEdit set "$vsDir" $hive HKCU "Roslyn\Internal\OnOff\Features" OOP64Bit dword 0
Write-Host "-- VS Info --"
diff --git a/eng/pipelines/test-integration-job.yml b/eng/pipelines/test-integration-job.yml
index b8a26322630..99f294770ff 100644
--- a/eng/pipelines/test-integration-job.yml
+++ b/eng/pipelines/test-integration-job.yml
@@ -18,7 +18,7 @@ steps:
# We explicitly pass the VS install directory in azure-pipelines-integration-dartlab.yml
# We manually create the Hive before deployment to avoid a race condition
- powershell: eng\scripts\CreateVSHive.ps1
- -rootSuffix RoslynDev
+ -rootSuffix RazorDev
-devenvExepath C:\\Test\\VisualStudio\\Common7\\IDE\\devenv.exe
displayName: Create and Verify hive
@@ -30,7 +30,6 @@ steps:
-build
-pack
-publish
- /p:BuildDependencyVsix=false
name: Build
displayName: Build
condition: succeeded()
@@ -51,7 +50,6 @@ steps:
-configuration ${{ parameters.configuration }}
-msbuildEngine vs
-prepareMachine
- /p:BuildDependencyVsix=false
/p:BuildProjectReferences=false
name: BuildVSIX
displayName: Build and Deploy VSIX
@@ -72,7 +70,6 @@ steps:
-msbuildEngine vs
-prepareMachine
-integrationTest
- /p:BuildDependencyVsix=false
/p:BuildProjectReferences=false
name: RunIntegrationTests
displayName: Run Integration Tests
diff --git a/eng/scripts/CreateVSHive.ps1 b/eng/scripts/CreateVSHive.ps1
index 0d495f10041..5db2dfc0bb3 100644
--- a/eng/scripts/CreateVSHive.ps1
+++ b/eng/scripts/CreateVSHive.ps1
@@ -19,9 +19,9 @@ $success=$false
for($i=0; $i -le 3; $i++)
{
& $devenvExePath /rootsuffix $rootSuffix /updateConfiguration
- if(Test-Path -Path $env:LocalAppData\Microsoft\VisualStudio\17.0*RoslynDev)
+ if(Test-Path -Path $env:LocalAppData\Microsoft\VisualStudio\17.0*RazorDev)
{
- Write-Host "The hive 'RoslynDev' exists"
+ Write-Host "The hive 'RazorDev' exists"
$success=$true
break
}
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs
index 0dc38688b8b..23b3d44f2de 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/AssemblyCodeBases.cs
@@ -7,115 +7,93 @@
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.VisualStudio.LanguageServer.Protocol.Internal.dll")]
[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.VisualStudio.LanguageServer.Protocol.Extensions.dll")]
-#if INCLUDE_ROSLYN_DEPS
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.CSharp",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.CSharp.Features",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.CSharp.Workspaces",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.EditorFeatures",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.EditorFeatures.Text",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.EditorFeatures.Wpf",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.ExternalAccess.Razor",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.InteractiveHost",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.Features",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.LanguageServer.Protocol",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.Remote.Workspaces",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.VisualBasic.Features",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.CodeAnalysis.Workspaces",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.VisualStudio.Threading",
GenerateCodeBase = true,
OldVersionLowerBound = "17.4.0.0",
- OldVersionUpperBound = "17.5.0.0",
- NewVersion = "17.5.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.VisualStudio.LanguageServices",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.VisualStudio.LanguageServices.Implementation",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
+ OldVersionUpperBound = "Current")]
[assembly: ProvideBindingRedirection(
AssemblyName = "Microsoft.VisualStudio.LanguageServices.CSharp",
GenerateCodeBase = true,
OldVersionLowerBound = "4.4.0.0",
- OldVersionUpperBound = "4.6.0.0",
- NewVersion = "4.6.0.0")]
-
-[assembly: ProvideCodeBase(CodeBase = @"$PackageFolder$\Microsoft.CodeAnalysis.Workspaces.dll")]
-#endif
+ OldVersionUpperBound = "Current")]
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj
index 93634899ce4..5d1fab456a8 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/Microsoft.VisualStudio.RazorExtension.Dependencies.csproj
@@ -10,7 +10,7 @@
$(DefaultNetFxTargetFramework)
- RoslynDev
+ RazorDev
false
true
@@ -19,13 +19,14 @@
false
- true
+ true
true
- true
false
false
false
- $(DefineConstants);INCLUDE_ROSLYN_DEPS
+
+
+ false
@@ -57,7 +58,7 @@
-
+
@@ -68,7 +69,7 @@
-
+
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/source.extension.vsixmanifest b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/source.extension.vsixmanifest
index 2b26d1d0020..ceba69329cb 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/source.extension.vsixmanifest
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension.Dependencies/source.extension.vsixmanifest
@@ -8,7 +8,7 @@
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 7fc8e47f1ba..c2f64b7e557 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
@@ -2,7 +2,7 @@
$(DefaultNetFxTargetFramework)
- RoslynDev
+ RazorDev
/rootsuffix $(VSSDKTargetPlatformRegRootSuffix) /log
diff --git a/src/Razor/src/RazorDeployment/RazorDeployment.csproj b/src/Razor/src/RazorDeployment/RazorDeployment.csproj
index f5129d8a44e..b8be4c48e49 100644
--- a/src/Razor/src/RazorDeployment/RazorDeployment.csproj
+++ b/src/Razor/src/RazorDeployment/RazorDeployment.csproj
@@ -8,7 +8,7 @@
$(DefaultNetFxTargetFramework)
- RoslynDev
+ RazorDev
diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractIntegrationTest.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractIntegrationTest.cs
index c187f971ec0..4cd823bf222 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractIntegrationTest.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/AbstractIntegrationTest.cs
@@ -25,7 +25,7 @@ namespace Microsoft.VisualStudio.Razor.IntegrationTests;
///
///
///
-[IdeSettings(MinVersion = VisualStudioVersion.VS2022, RootSuffix = "RoslynDev", MaxAttempts = 2)]
+[IdeSettings(MinVersion = VisualStudioVersion.VS2022, RootSuffix = "RazorDev", MaxAttempts = 2)]
public abstract class AbstractIntegrationTest : AbstractIdeIntegrationTest
{
protected const string ProjectName = "TestProj";
diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj
index 316c34f4165..e352afc615f 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj
+++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj
@@ -15,11 +15,8 @@
-
- All
- false
- False
-
+
+
@@ -39,4 +36,35 @@
+
+
+
+
+
+ <_Parameter1>Microsoft.VisualStudio.RazorExtension.Dependencies.vsix
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/VisualStudioLogging.cs b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/VisualStudioLogging.cs
index 59f9b3579cf..1733fec3aa5 100644
--- a/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/VisualStudioLogging.cs
+++ b/src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/VisualStudioLogging.cs
@@ -127,7 +127,7 @@ private static void RazorExtensionExplorerLogger(string filePath)
internal static string GetHiveDirectory()
{
- // There could be multiple copies of visual studio installed, each with their own RoslynDev hive
+ // There could be multiple copies of visual studio installed, each with their own RazorDev hive
// so to make sure we find the one for the instance of VS we are actually running, we need to find
// the installation ID for this install. This is stored in an ini file, next to devenv.exe, and the
// ID itself is pre-pended to the hive name in the file system.
@@ -150,9 +150,9 @@ internal static string GetHiveDirectory()
// Just in case the enterprise grade ini file parsing above didn't work, or VS changes how they
// store things, the following is written to work even if installationId is an empty string. In
- // that case it will fall back to the previous behavior of expecting a single RoslynDev hive to
+ // that case it will fall back to the previous behavior of expecting a single RazorDev hive to
// exist, or fail.
- var directories = Directory.GetDirectories(vsLocalDir, $"17*{installationId}RoslynDev", SearchOption.TopDirectoryOnly);
+ var directories = Directory.GetDirectories(vsLocalDir, $"17*{installationId}RazorDev", SearchOption.TopDirectoryOnly);
var hiveDirectories = directories.Where(d => !d.Contains("$")).ToList();
Assert.True(hiveDirectories.Count == 1, $"Could not find the hive path for InstallationID '{installationId}'. Found instead:{Environment.NewLine}{string.Join(Environment.NewLine, hiveDirectories)}");
diff --git a/startvs.ps1 b/startvs.ps1
index c0d0a23dd86..1857efda384 100644
--- a/startvs.ps1
+++ b/startvs.ps1
@@ -9,24 +9,13 @@ Param(
[Parameter(
Mandatory=$false,
HelpMessage="If specified, choose the Visual Studio version from a list before laucnhing. By default the newest and last installed Visual Studio instance will be launched.")]
- [Switch]$chooseVS,
-
- [Parameter(
- Mandatory=$false,
- HelpMessage="If specified, Roslyn dependencies will be included in the Razor extension when deployed.")]
- [Switch]$includeRoslynDeps
+ [Switch]$chooseVS
)
if ($solutionFile -eq "") {
$solutionFile = "Razor.sln"
}
-if ($includeRoslynDeps) {
- # Setting this environment variable ensures that the MSBuild will see it when
- # building from inside Visual Studio.
- $env:IncludeRoslynDeps = $true
-}
-
$dotnetPath = Join-Path (Get-Location) ".dotnet"
# This tells .NET Core to use the same dotnet.exe that build scripts use