From 715f998decd7e0d3864af8d6c00a9f497054c188 Mon Sep 17 00:00:00 2001 From: Sam Harwell Date: Tue, 28 Feb 2023 06:25:21 -0600 Subject: [PATCH] Always include Roslyn dependencies for integration tests --- azure-pipelines.yml | 1 - .../AssemblyCodeBases.cs | 58 ++++++------------- ...lStudio.RazorExtension.Dependencies.csproj | 5 +- startvs.ps1 | 13 +---- 4 files changed, 21 insertions(+), 56 deletions(-) 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/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 b79334bcecd..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 @@ -24,7 +24,6 @@ false false false - $(DefineConstants);INCLUDE_ROSLYN_DEPS false @@ -59,7 +58,7 @@ - + @@ -70,7 +69,7 @@ - + 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