Skip to content

Commit 604c176

Browse files
Set DeployExtension for all the extensions we expect to deploy (#79334)
This fixes the ability to F5.
2 parents be0277d + f71444b commit 604c176

File tree

9 files changed

+10
-9
lines changed

9 files changed

+10
-9
lines changed

eng/targets/Settings.props

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<!-- Set to non-existent file to prevent common targets from importing Microsoft.CodeAnalysis.targets -->
3535
<CodeAnalysisTargets>NON_EXISTENT_FILE</CodeAnalysisTargets>
3636

37-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
37+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
3838
<VisualStudioReferenceMajorVersion Condition="'$(VisualStudioReferenceMajorVersion)' == ''">$(VisualStudioVersion.Substring($([System.Convert]::ToInt32(0)), $(VisualStudioVersion.IndexOf('.'))))</VisualStudioReferenceMajorVersion>
3939
<VisualStudioReferenceAssemblyVersion Condition="'$(VisualStudioReferenceAssemblyVersion)' == ''">$(VisualStudioReferenceMajorVersion).0.0.0</VisualStudioReferenceAssemblyVersion>
4040
<MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
@@ -137,11 +137,6 @@
137137
<CreateHardLinksForPublishFilesIfPossible>true</CreateHardLinksForPublishFilesIfPossible>
138138
</PropertyGroup>
139139

140-
<!-- Windows specific settings -->
141-
<PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
142-
<DeployExtension Condition="'$(VisualStudioVersion)' != '15.0' and '$(VisualStudioVersion)' != '16.0'">false</DeployExtension>
143-
</PropertyGroup>
144-
145140
<PropertyGroup Condition="'$(DevEnvDir)' == ''">
146141
<DevEnvDir>$([System.Environment]::ExpandEnvironmentVariables("%VS$(VisualStudioReferenceMajorVersion)0COMNTOOLS%"))</DevEnvDir>
147142
<DevEnvDir>$(DevEnvDir)\..\IDE</DevEnvDir>

src/Compilers/Extension/Roslyn.Compilers.Extension.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
1515
<IncludeCopyLocalReferencesInVSIXContainer>false</IncludeCopyLocalReferencesInVSIXContainer>
1616
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
17+
<DeployExtension>true</DeployExtension>
18+
1719
</PropertyGroup>
1820
<ItemGroup Label="PkgDef">
1921
<PkgDefPackageRegistration Include="{31c0675e-87a4-4061-a0dd-a4e510fccf97}"

src/ExpressionEvaluator/Package/ExpressionEvaluatorPackage.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
1414
<ExtensionInstallationRoot>$(CommonExtensionInstallationRoot)</ExtensionInstallationRoot>
1515
<ExtensionInstallationFolder>Microsoft\VBCSharp\ExpressionEvaluators</ExtensionInstallationFolder>
16+
<DeployExtension>true</DeployExtension>
1617

1718
<!-- VS Insertion -->
1819
<VisualStudioInsertionComponent>Microsoft.CodeAnalysis.LanguageServices</VisualStudioInsertionComponent>

src/VisualStudio/IntegrationTest/TestSetup/Microsoft.VisualStudio.IntegrationTest.Setup.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
1414
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
1515
<IncludeDebugSymbolsInLocalVSIXDeployment>true</IncludeDebugSymbolsInLocalVSIXDeployment>
16+
<DeployExtension>true</DeployExtension>
17+
1618
</PropertyGroup>
1719
<ItemGroup>
1820
<None Include="source.extension.vsixmanifest">

src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
1616
<ExtensionInstallationRoot>$(CommonExtensionInstallationRoot)</ExtensionInstallationRoot>
1717
<ExtensionInstallationFolder>Microsoft\VBCSharp\Dependencies</ExtensionInstallationFolder>
18+
<DeployExtension>true</DeployExtension>
1819
</PropertyGroup>
1920
<ItemGroup>
2021
<!--

src/VisualStudio/Setup.ServiceHub/Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
1212
<ExtensionInstallationRoot>$(CommonExtensionInstallationRoot)</ExtensionInstallationRoot>
1313
<ExtensionInstallationFolder>$(LanguageServicesExtensionInstallationFolder)\Core</ExtensionInstallationFolder>
14+
<DeployExtension>true</DeployExtension>
1415

1516
<!-- VS Insertion -->
1617
<!--

src/VisualStudio/Setup.ServiceHub/arm64/Roslyn.VisualStudio.ServiceHub.Setup.arm64.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
is for crossgen, which we don't run during F5. Since either project will work equally well (even if you were developing on
1111
an arm64 machine), we'll just disable this one. -->
1212
<DeployExtension>false</DeployExtension>
13-
<!-- Workaround an issue in Arcade where the value of `DeployExtension` is always overwritten to be `true`.
14-
See: https://github.com/dotnet/arcade/pull/14052 -->
15-
<DeployProjectOutput>false</DeployProjectOutput>
1613
</PropertyGroup>
1714
<ItemGroup Label="Project References">
1815
<ProjectReference Include="..\..\..\Workspaces\Remote\ServiceHub.CoreComponents\arm64\Microsoft.CodeAnalysis.Remote.ServiceHub.CoreComponents.arm64.csproj">

src/VisualStudio/Setup/Roslyn.VisualStudio.Setup.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<ExtensionInstallationRoot>$(CommonExtensionInstallationRoot)</ExtensionInstallationRoot>
1616
<ExtensionInstallationFolder>$(LanguageServicesExtensionInstallationFolder)</ExtensionInstallationFolder>
1717
<VssdkCompatibleExtension>true</VssdkCompatibleExtension>
18+
<DeployExtension>true</DeployExtension>
1819

1920
<!-- VS Insertion -->
2021
<VisualStudioInsertionComponent>Microsoft.CodeAnalysis.LanguageServices</VisualStudioInsertionComponent>

src/VisualStudio/VisualStudioDiagnosticsToolWindow/Roslyn.VisualStudio.DiagnosticsWindow.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
1616
<IncludeDebugSymbolsInLocalVSIXDeployment>false</IncludeDebugSymbolsInLocalVSIXDeployment>
1717
<UseCodebase>true</UseCodebase>
18+
<DeployExtension>true</DeployExtension>
1819
</PropertyGroup>
1920
<ItemGroup Label="PkgDef">
2021
<PkgDefPackageRegistration Include="{49e24138-9ee3-49e0-8ede-6b39f49303bf}"

0 commit comments

Comments
 (0)