Skip to content

Commit

Permalink
Revert "Remove InteractiveWindow from Willow authoring (dotnet#13588)"
Browse files Browse the repository at this point in the history
This reverts commit b9dcaa1.
  • Loading branch information
tmat committed Sep 8, 2016
1 parent 4b8cef0 commit 1a6aef2
Show file tree
Hide file tree
Showing 6 changed files with 73 additions and 0 deletions.
Expand Up @@ -13,6 +13,10 @@
<Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.props" />
<Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.targets" />

<ItemGroup>
<ProjectReference Include="..\MicrosoftVisualStudioInteractiveWindow\Microsoft.VisualStudio.InteractiveWindow.vsmanproj" />
</ItemGroup>

<Target Name="BeforeBuild">
<MSBuild Projects="MicrosoftCodeAnalysisExpressionEvaluator\Microsoft.CodeAnalysis.ExpressionEvaluator.swixproj" Targets="Build" />
<MSBuild Projects="MicrosoftCodeAnalysisVisualStudioInteractiveComponents\Microsoft.CodeAnalysis.VisualStudioInteractiveComponents.swixproj" Targets="Build" />
Expand All @@ -27,5 +31,6 @@
<MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.VisualStudio.Setup.json" />
<MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.VisualStudio.Setup.Interactive.json" />
<MergeManifest Include="$(OutputPath)Microsoft.CodeAnalysis.VisualStudio.Setup.Next.json" />
<MergeManifest Include="$(OutputPath)Microsoft.VisualStudio.InteractiveWindow.json" />
</ItemGroup>
</Project>
Expand Up @@ -18,3 +18,6 @@ vs.dependencies
vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.Setup
version=$(Version)
type=Required
vs.dependency id=Microsoft.VisualStudio.InteractiveWindow
version=$(Version)
type=Required
Expand Up @@ -21,3 +21,6 @@ vs.dependencies
vs.dependency id=Microsoft.CodeAnalysis.VisualStudio.InteractiveComponents
version=$(Version)
type=Required
vs.dependency id=Microsoft.VisualStudio.InteractiveWindow
version=$(Version)
type=Required
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />

<PropertyGroup>
<OutputArchitecture>neutral</OutputArchitecture>
<OutputLocalized>false</OutputLocalized>
<OutputPath>$(OutDir)Insertion</OutputPath>
<OutputType>manifest</OutputType>
</PropertyGroup>

<Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.props" />

<PropertyGroup>
<PackagePreprocessorDefinitions>$(PackagePreprocessorDefinitions);Version=$(VsixVersion);OutputPath=$(OutDir);LicenseUri=http://www.microsoft.com</PackagePreprocessorDefinitions>
<IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
</PropertyGroup>

<ItemGroup>
<Package Include="Microsoft.VisualStudio.InteractiveWindow.swr" />
</ItemGroup>

<Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.targets" />
</Project>
@@ -0,0 +1,15 @@
use vs

package name=Microsoft.VisualStudio.InteractiveWindow
version=$(Version)
vs.package.type=vsix
vs.package.vsixId=1F42C6D0-F876-4AF0-8185-1BEB0A325BB2
vs.package.installSize=253952

vs.localizedResources
vs.localizedResource language=en-us
title="VisualStudio Interactive Components"
description="Interactive components for Visual Studio."

vs.payloads
vs.payload source=$(OutputPath)Microsoft.VisualStudio.VsInteractiveWindow.vsix
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\..\build\Targets\ProducesNoOutput.Settings.targets" />

<PropertyGroup>
<FinalizeManifest>true</FinalizeManifest>
<FinalizeSkipLayout>true</FinalizeSkipLayout>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<OutputPath>$(OutDir)Insertion</OutputPath>
<IsPackage>true</IsPackage>
</PropertyGroup>

<Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.props" />
<Import Project="$(NuGetPackageRoot)\MicroBuild.Core\$(MicroBuildVersion)\build\MicroBuild.Core.targets" />

<Target Name="BeforeBuild">
<MSBuild Projects="Microsoft.VisualStudio.InteractiveWindow.swixproj" Targets="Build" />
</Target>

<ItemGroup>
<MergeManifest Include="$(OutputPath)Microsoft.VisualStudio.InteractiveWindow.json" />
</ItemGroup>
</Project>

0 comments on commit 1a6aef2

Please sign in to comment.