-
Notifications
You must be signed in to change notification settings - Fork 193
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Deploy to RazorDev instead of RoslynDev #8349
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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")] | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 💭 This appears to be a duplicate of line 90 above. |
||
#endif | ||
OldVersionUpperBound = "Current")] |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,7 +10,7 @@ | |
|
||
<TargetFramework>$(DefaultNetFxTargetFramework)</TargetFramework> | ||
|
||
<VSSDKTargetPlatformRegRootSuffix>RoslynDev</VSSDKTargetPlatformRegRootSuffix> | ||
<VSSDKTargetPlatformRegRootSuffix>RazorDev</VSSDKTargetPlatformRegRootSuffix> | ||
|
||
<IsShipping>false</IsShipping> | ||
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild> | ||
|
@@ -19,13 +19,14 @@ | |
<!-- Don't automatically include dependencies --> | ||
<IncludePackageReferencesInVSIXContainer>false</IncludePackageReferencesInVSIXContainer> | ||
|
||
<CreateVsixContainer Condition="'$(BuildDependencyVsix)' == 'true'">true</CreateVsixContainer> | ||
<CreateVsixContainer>true</CreateVsixContainer> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📝 There is no more need for this to be conditional. Since the integration test harness knows how to deploy the extension on demand, we can control the deployment exclusively from the integration test project that references this. |
||
<GeneratePkgDefFile>true</GeneratePkgDefFile> | ||
<DeployExtension Condition="'$(BuildDependencyVsix)' == 'true' OR '$(BuildDependencyVsix)' == ''" >true</DeployExtension> | ||
<IncludeAssemblyInVSIXContainer>false</IncludeAssemblyInVSIXContainer> | ||
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer> | ||
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment> | ||
<DefineConstants Condition="'$(IncludeRoslynDeps)' == 'true'">$(DefineConstants);INCLUDE_ROSLYN_DEPS</DefineConstants> | ||
|
||
<!-- This extension will be deployed on demand by the integration test harness --> | ||
<DeployExtension>false</DeployExtension> | ||
</PropertyGroup> | ||
|
||
<ItemGroup> | ||
|
@@ -57,7 +58,7 @@ | |
</ItemGroup> | ||
|
||
<!-- Reference the Roslyn dependencies so that Preview builds work --> | ||
<ItemGroup Condition="'$(IncludeRoslynDeps)' == 'true'"> | ||
<ItemGroup> | ||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion)" /> | ||
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures" Version="$(RoslynPackageVersion)" /> | ||
<PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Wpf" Version="$(RoslynPackageVersion)" /> | ||
|
@@ -68,7 +69,7 @@ | |
<PackageReference Include="Microsoft.VisualStudio.LanguageServices.Implementation.Symbols" Version="$(Tooling_MicrosoftVisualStudioLanguageServicesPackageVersion)" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup Condition="'$(IncludeRoslynDeps)' == 'true'"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📝 It wasn't clear why we need this flag. I've removed it for now, but maybe we need it for something? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. FWIW, it was added in #8086 |
||
<ItemGroup> | ||
<VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.dll" /> | ||
<VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.CSharp.dll" /> | ||
<VSIXSourceItem Include="$(OutputPath)Microsoft.CodeAnalysis.CSharp.Features.dll" /> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
<!-- This is needed to mark this extension as cloud compliant. --> | ||
<AllowClientRole>true</AllowClientRole> | ||
</Metadata> | ||
<Installation AllUsers="true" Experimental="true"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📝 We aren't overriding a built-in extension, so this isn't considered an experimental version of an all-users extension. |
||
<Installation> | ||
<InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[17.0,)"> | ||
<ProductArchitecture>amd64</ProductArchitecture> | ||
</InstallationTarget> | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,11 +15,8 @@ | |
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<ProjectReference Include="..\..\src\RazorDeployment\RazorDeployment.csproj" Private="False" Condition="'$(BuildDependencyVsix)' == 'true'"> | ||
<PrivateAssets>All</PrivateAssets> | ||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
<CopyLocalSatelliteAssemblies>False</CopyLocalSatelliteAssemblies> | ||
</ProjectReference> | ||
<ProjectReference Include="..\..\src\Microsoft.VisualStudio.RazorExtension.Dependencies\Microsoft.VisualStudio.RazorExtension.Dependencies.csproj" Private="false" ReferenceOutputAssembly="false" CopyVsix="true" /> | ||
<ProjectReference Include="..\..\src\Microsoft.VisualStudio.RazorExtension\Microsoft.VisualStudio.RazorExtension.csproj" Private="false" ReferenceOutputAssembly="false" CopyVsix="true" /> | ||
<ProjectReference Include="..\Microsoft.AspNetCore.Razor.Test.Common\Microsoft.AspNetCore.Razor.Test.Common.csproj" /> | ||
<ProjectReference Include="..\Microsoft.VisualStudio.Editor.Razor.Test.Common\Microsoft.VisualStudio.Editor.Razor.Test.Common.csproj" /> | ||
</ItemGroup> | ||
|
@@ -39,4 +36,35 @@ | |
<ItemGroup> | ||
<EmbeddedResource Include="**\TestFiles\**\*" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
<!-- Microsoft.VisualStudio.RazorExtension.vsix cannot be installed without elevation due to a bug in the experimental extension installation logic. --> | ||
<!--<AssemblyAttribute Include="Xunit.Harness.RequireExtensionAttribute"> | ||
<_Parameter1>Microsoft.VisualStudio.RazorExtension.vsix</_Parameter1> | ||
</AssemblyAttribute>--> | ||
<AssemblyAttribute Include="Xunit.Harness.RequireExtensionAttribute"> | ||
<_Parameter1>Microsoft.VisualStudio.RazorExtension.Dependencies.vsix</_Parameter1> | ||
</AssemblyAttribute> | ||
Comment on lines
+45
to
+47
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📝 This is the part to make conditional if there are cases where we don't want to deploy the dependencies. |
||
</ItemGroup> | ||
|
||
<Target Name="PrepareVsixProjectReferences" | ||
BeforeTargets="ResolveProjectReferences" | ||
DependsOnTargets="PrepareProjectReferences"> | ||
<MSBuild | ||
Projects="@(_MSBuildProjectReferenceExistent)" | ||
Targets="VSIXContainerProjectOutputGroup" | ||
BuildInParallel="$(BuildInParallel)" | ||
Properties="%(_MSBuildProjectReferenceExistent.SetConfiguration); %(_MSBuildProjectReferenceExistent.SetPlatform); %(_MSBuildProjectReferenceExistent.SetTargetFramework); CreateVsixContainer=true" | ||
Condition="'%(_MSBuildProjectReferenceExistent.CopyVsix)' == 'true'" | ||
ContinueOnError="!$(BuildingProject)" | ||
RemoveProperties="%(_MSBuildProjectReferenceExistent.GlobalPropertiesToRemove)"> | ||
|
||
<Output TaskParameter="TargetOutputs" ItemName="_ProjectReferenceVsixOutputs" /> | ||
</MSBuild> | ||
|
||
<ItemGroup> | ||
<ReferenceCopyLocalPaths Include="@(_ProjectReferenceVsixOutputs)" /> | ||
</ItemGroup> | ||
</Target> | ||
Comment on lines
+50
to
+68
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 📝 I need to verify this is exactly what we want as a general solution, and get this moved over to microsoft/vs-extension-testing. |
||
|
||
</Project> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
📝 These were unnecessarily complex. The tooling knows how to derive the values from the referenced assemblies at build time.