From a62e20b3b50ab7a071eebbad31d57c1236714c64 Mon Sep 17 00:00:00 2001 From: Balaji Soundrarajan Date: Sun, 17 Jul 2016 23:08:05 -0700 Subject: [PATCH] Add dependencies between Swixproj The Swixproj projects encapsulating each Vsix should mention the dependencies betweeen them similar to the dependencies stated in the contained Vsixes. --- .../Microsoft.CodeAnalysis.ExpressionEvaluator.swr | 7 ++++++- ...deAnalysis.VisualStudioInteractiveComponents.swr | 10 +++++++++- ....CodeAnalysis.VisualStudio.Setup.Interactive.swr | 13 ++++++++++++- ...crosoft.CodeAnalysis.VisualStudio.Setup.Next.swr | 7 ++++++- ...icrosoft.CodeAnalysis.VisualStudio.Telemetry.swr | 7 ++++++- 5 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisExpressionEvaluator/Microsoft.CodeAnalysis.ExpressionEvaluator.swr b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisExpressionEvaluator/Microsoft.CodeAnalysis.ExpressionEvaluator.swr index 36b822bbb07..82cbd2c94da 100644 --- a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisExpressionEvaluator/Microsoft.CodeAnalysis.ExpressionEvaluator.swr +++ b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisExpressionEvaluator/Microsoft.CodeAnalysis.ExpressionEvaluator.swr @@ -13,4 +13,9 @@ vs.localizedResources description="Roslyn Expression Evaluators" vs.payloads - vs.payload source=$(OutputPath)ExpressionEvaluatorPackage.vsix \ No newline at end of file + vs.payload source=$(OutputPath)ExpressionEvaluatorPackage.vsix + +vs.dependencies + vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup + version=[15.0,16.0) + type=Required \ No newline at end of file diff --git a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioInteractiveComponents/Microsoft.CodeAnalysis.VisualStudioInteractiveComponents.swr b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioInteractiveComponents/Microsoft.CodeAnalysis.VisualStudioInteractiveComponents.swr index 76408b70cf5..da6d3fbff53 100644 --- a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioInteractiveComponents/Microsoft.CodeAnalysis.VisualStudioInteractiveComponents.swr +++ b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioInteractiveComponents/Microsoft.CodeAnalysis.VisualStudioInteractiveComponents.swr @@ -13,4 +13,12 @@ vs.localizedResources description="Interactive Roslyn components for Visual Studio." vs.payloads - vs.payload source=$(OutputPath)Roslyn.VisualStudio.InteractiveComponents.vsix \ No newline at end of file + vs.payload source=$(OutputPath)Roslyn.VisualStudio.InteractiveComponents.vsix + +vs.dependencies + vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup + version=[15.0,16.0) + type=Required + vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.InteractiveWindow + version=[15.0,16.0) + type=Required \ No newline at end of file diff --git a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupInteractive/Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.swr b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupInteractive/Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.swr index b57e4a9d411..d7c2dee493c 100644 --- a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupInteractive/Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.swr +++ b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupInteractive/Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.swr @@ -13,4 +13,15 @@ vs.localizedResources description="Roslyn interactive language services." vs.payloads - vs.payload source=$(OutputPath)Roslyn.VisualStudio.Setup.Interactive.vsix \ No newline at end of file + vs.payload source=$(OutputPath)Roslyn.VisualStudio.Setup.Interactive.vsix + +vs.dependencies + vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup + version=[15.0,16.0) + type=Required + vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.InteractiveComponents + version=[15.0,16.0) + type=Required + vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.InteractiveWindow + version=[15.0,16.0) + type=Required diff --git a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupNext/Microsoft.CodeAnalysis.VisualStudio.Setup.Next.swr b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupNext/Microsoft.CodeAnalysis.VisualStudio.Setup.Next.swr index 5df390d10a1..cc7d2c477bb 100644 --- a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupNext/Microsoft.CodeAnalysis.VisualStudio.Setup.Next.swr +++ b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioSetupNext/Microsoft.CodeAnalysis.VisualStudio.Setup.Next.swr @@ -13,4 +13,9 @@ vs.localizedResources description="C# and VB.NET language services for Visual Studio.Next" vs.payloads - vs.payload source=$(OutputPath)Roslyn.VisualStudio.Setup.Next.vsix \ No newline at end of file + vs.payload source=$(OutputPath)Roslyn.VisualStudio.Setup.Next.vsix + +vs.dependencies + vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup + version=[15.0,16.0) + type=Required \ No newline at end of file diff --git a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swr b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swr index 5ff91ff592c..8ca4f642bb6 100644 --- a/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swr +++ b/src/Setup/DevDivVsix/MicrosoftCodeAnalysisLanguageServices/MicrosoftCodeAnalysisVisualStudioTelemetry/Microsoft.CodeAnalysis.VisualStudio.Telemetry.swr @@ -13,4 +13,9 @@ vs.localizedResources description="Telemetry implementation for Roslyn atop Visual Studio." vs.payloads - vs.payload source=$(OutputPath)Microsoft.VisualStudio.LanguageServices.Telemetry.vsix \ No newline at end of file + vs.payload source=$(OutputPath)Microsoft.VisualStudio.LanguageServices.Telemetry.vsix + +vs.dependencies + vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup + version=[15.0,16.0) + type=Required \ No newline at end of file -- GitLab