Add LiveShare extension to setup files

microsoft · Nov 28, 2018 · 1e325c6 · 1e325c6
1 parent 8f8cb72
commit 1e325c6
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 0 deletions.
diff --git a/Python/Setup/loclayout.proj b/Python/Setup/loclayout.proj
@@ -26,6 +26,7 @@
         Microsoft.PythonTools.dll;
         Microsoft.PythonTools.EnvironmentsList.dll;
         Microsoft.PythonTools.Ipc.Json.dll;
+        Microsoft.PythonTools.LiveShare.dll;
         Microsoft.PythonTools.Profiling.dll;
         Microsoft.PythonTools.ProjectWizards.dll;
         Microsoft.PythonTools.RunElevated.exe;

diff --git a/Python/Setup/signlayout.proj b/Python/Setup/signlayout.proj
@@ -33,6 +33,7 @@
         Microsoft.PythonTools.dll;
         Microsoft.PythonTools.EnvironmentsList.dll;
         Microsoft.PythonTools.Ipc.Json.dll;
+        Microsoft.PythonTools.LiveShare.dll;
         Microsoft.PythonTools.Profiling.dll;
         Microsoft.PythonTools.ProjectWizards.dll;
         Microsoft.PythonTools.RunElevated.exe;

diff --git a/Python/Setup/swix/Packages/Microsoft.PythonTools.LiveShare.Vsix.Resources.swixproj b/Python/Setup/swix/Packages/Microsoft.PythonTools.LiveShare.Vsix.Resources.swixproj
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <OutputLocalized>true</OutputLocalized>
+    <Lang Condition="$(Lang) == ''">enu</Lang>
+  </PropertyGroup>
+
+  <Import Project="SetupProjectBefore.settings" />
+
+  <PropertyGroup>
+    <SourcePath>$(LayoutOutputPath)Microsoft.PythonTools.LiveShare</SourcePath>
+    <ExtraOptions>-i "\.dll$" -i "\.exe$"</ExtraOptions>
+    <GenerateSwrDependsOnTargets>SetSwrProperties</GenerateSwrDependsOnTargets>
+  </PropertyGroup>
+
+  <Target Name="SetSwrProperties">
+    <Error Condition="$(Culture) == ''" Text="Culture property was not provided" />
+    <Error Condition="$(Lang) == ''" Text="Lang property was not provided" />
+    <ItemGroup>
+      <SwrSource>
+        <BaseInstall>InstallDir:\Common7\IDE\Extensions\Microsoft\Python\LiveShare\$(Culture)</BaseInstall>
+        <ExtraOptions>%(ExtraOptions) -r "$(BinariesOutputPath)localize\$(Lang)"</ExtraOptions>
+      </SwrSource>
+    </ItemGroup>
+  </Target>
+
+  <ItemGroup>
+    <PackageSearchPaths Include="$(BinariesOutputPath)localize\$(Lang)" />
+  </ItemGroup>
+
+  <Import Project="SetupProjectAfter.settings" />
+</Project>
+
diff --git a/Python/Setup/swix/Packages/Microsoft.PythonTools.LiveShare.Vsix.swixproj b/Python/Setup/swix/Packages/Microsoft.PythonTools.LiveShare.Vsix.swixproj
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="SetupProjectBefore.settings" />
+
+  <PropertyGroup>
+    <BaseInstall>InstallDir:\Common7\IDE\Extensions\Microsoft\Python\LiveShare</BaseInstall>
+    <SourcePath>$(LayoutOutputPath)Microsoft.PythonTools.LiveShare</SourcePath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageSearchPaths Include="$(SourcePath)" />
+    <Dependency Include="Microsoft.PythonTools.Core.Vsix" />
+    <Dependency Include="$(MSBuildProjectName).Resources" />
+  </ItemGroup>
+
+  <Import Project="SetupProjectAfter.settings" />
+</Project>
+
diff --git a/Python/Setup/swix/Packages/dirs.proj b/Python/Setup/swix/Packages/dirs.proj
@@ -24,13 +24,15 @@
     <ProjectFile Include="Microsoft.PythonTools.Django.Templates.Vsix.swixproj" Condition="'$(IncludeDjango)' == 'True'"/>
     <ProjectFile Include="Microsoft.PythonTools.IronPython.Vsix.swixproj" Condition="'$(IncludeIronPython)' == 'True'"/>
     <ProjectFile Include="Microsoft.PythonTools.IronPython.Templates.Vsix.swixproj" Condition="'$(IncludeIronPython)' == 'True'"/>
+    <ProjectFile Include="Microsoft.PythonTools.LiveShare.Vsix.swixproj" Condition="'$(IncludeLiveShare)' == 'True'"/>
     <ProjectFile Include="Microsoft.PythonTools.NativeDevelopment.Templates.Vsix.swixproj"/>
     <ProjectFile Include="Microsoft.PythonTools.Profiling.Vsix.swixproj"/>
     <ProjectFile Include="Microsoft.PythonTools.Web.Templates.Vsix.swixproj"/>
     <LocProjectFile Include="Microsoft.CookiecutterTools.Vsix.Resources.swixproj" Condition="'$(LocType)' != ''" />
     <LocProjectFile Include="Microsoft.PythonTools.Core.Vsix.Resources.swixproj" Condition="'$(LocType)' != ''" />
     <LocProjectFile Include="Microsoft.PythonTools.Django.Vsix.Resources.swixproj" Condition="'$(LocType)' != ''" />
     <LocProjectFile Include="Microsoft.PythonTools.IronPython.Vsix.Resources.swixproj" Condition="'$(LocType)' != ''" />
+    <LocProjectFile Include="Microsoft.PythonTools.LiveShare.Vsix.Resources.swixproj" Condition="'$(LocType)' != ''"/>
     <LocProjectFile Include="Microsoft.PythonTools.Profiling.Vsix.Resources.swixproj" Condition="'$(LocType)' != ''" />
   </ItemGroup>