Merge pull request #14312 from jmarolf/updating-vsix-setup-dependencies

Add dependency on MinShell

src/Setup/DevDivVsix/CompilersPackage/Microsoft.CodeAnalysis.Compilers.vsmanproj

@@ -7,6 +7,8 @@
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
     <OutputPath>$(OutDir)Insertion\</OutputPath>
     <IsPackage>true</IsPackage>
+    <FinalizeValidate>false</FinalizeValidate>
+    <ValidateManifest>false</ValidateManifest>
   </PropertyGroup>
 
   <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.props" />
@@ -19,4 +21,6 @@
   <ItemGroup>
     <MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.Compilers.json" />
   </ItemGroup>
+
+  <Target Name="ValidateManifest" />
 </Project>

src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/Microsoft.CodeAnalysis.LanguageServices.vsmanproj

@@ -8,6 +8,8 @@
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <OutputPath>$(OutDir)Insertion</OutputPath>
     <IsPackage>true</IsPackage>
+    <FinalizeValidate>false</FinalizeValidate>
+    <ValidateManifest>false</ValidateManifest>
   </PropertyGroup>
 
   <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.props" />
@@ -28,4 +30,6 @@
     <MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.json" />
     <MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.VisualStudio.Setup.Next.json" />
   </ItemGroup>
+
+  <Target Name="ValidateManifest" />
 </Project>

src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisExpressionEvaluator/Microsoft.CodeAnalysis.ExpressionEvaluator.swr

@@ -15,6 +15,7 @@ vs.payloads
   vs.payload source=$(OutputPath)ExpressionEvaluatorPackage.vsix
 
 vs.dependencies
+  vs.dependency id=Microsoft.VisualStudio.MinShell
   vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup
                 version=$(Version)
                 type=Required

src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioInteractiveComponents/Microsoft.CodeAnalysis.VisualStudioInteractiveComponents.swr

@@ -15,6 +15,7 @@ vs.payloads
   vs.payload source=$(OutputPath)Roslyn.VisualStudio.InteractiveComponents.vsix
 
 vs.dependencies
+  vs.dependency id=Microsoft.VisualStudio.MinShell
   vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup
                 version=$(Version)
                 type=Required

src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetup/Microsoft.CodeAnalysis.VisualStudio.Setup.swr

@@ -13,3 +13,6 @@ vs.localizedResources
 
 vs.payloads
   vs.payload source=$(OutputPath)Roslyn.VisualStudio.Setup.vsix
+
+vs.dependencies
+  vs.dependency id=Microsoft.VisualStudio.MinShell

src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupInteractive/Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.swr

@@ -15,6 +15,7 @@ vs.payloads
   vs.payload source=$(OutputPath)Roslyn.VisualStudio.Setup.Interactive.vsix
 
 vs.dependencies
+  vs.dependency id=Microsoft.VisualStudio.MinShell
   vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup
                 version=$(Version)
                 type=Required

src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupNext/Microsoft.CodeAnalysis.VisualStudio.Setup.Next.swr

@@ -15,6 +15,7 @@ vs.payloads
   vs.payload source=$(OutputPath)Roslyn.VisualStudio.Setup.Next.vsix
 
 vs.dependencies
+  vs.dependency id=Microsoft.VisualStudio.MinShell
   vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup
                 version=$(Version)
                 type=Required

src/Setup/DevDivVsix/PortableFacades/PortableFacades.vsmanproj

@@ -7,6 +7,8 @@
     <FinalizeSkipLayout>true</FinalizeSkipLayout>
     <OutputPath>$(OutDir)Insertion\</OutputPath>
     <IsPackage>true</IsPackage>
+    <FinalizeValidate>false</FinalizeValidate>
+    <ValidateManifest>false</ValidateManifest>
   </PropertyGroup>
 
   <Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.props" />
@@ -19,4 +21,6 @@
   <ItemGroup>
     <MergeManifest Include="$(OutputPath)PortableFacades.json" />
   </ItemGroup>
+
+  <Target Name="ValidateManifest" />
 </Project>