Fix build issues and add internal feed for LiveShare

microsoft · Sep 6, 2018 · a12224a · a12224a
1 parent e75a80d
commit a12224a
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/Build/15.0/nuget.config b/Build/15.0/nuget.config
@@ -2,6 +2,7 @@
   <packageSources>
     <add key="VS Editor" value="https://vside.myget.org/F/vssdk/api/v3/index.json" protocolVersion="3" />
     <add key="VS Editor Impl" value="https://vside.myget.org/F/vs-impl/api/v3/index.json" protocolVersion="3" />
+    <add key="Cascade Internal" value="https://devdiv.pkgs.visualstudio.com/_packaging/CascadeInternalApis/nuget/v3/index.json" protocolVersion="3" />
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
diff --git a/Build/16.0/packages.config b/Build/16.0/packages.config
@@ -3,6 +3,10 @@
   <package id="Microsoft.VSSDK.BuildTools" version="15.7.109" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
   <package id="MicroBuild.Core" version="0.2.0" />
+  <package id="Microsoft.Cascade.LanguageServices.Common" version="0.3.536" />
+  <package id="Microsoft.Cascade.Common" version="0.3.536" />
+  <package id="Microsoft.Cascade.Client" version="0.3.536" />
+  <package id="Microsoft.VisualStudio.Cascade.Contracts" version="0.3.536" />
   <package id="Microsoft.VisualStudio.Debugger.InteropA" version="9.0.21022" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Debugger.Interop.10.0" version="10.0.30320" />
   <package id="Microsoft.VisualStudio.Debugger.Interop.11.0" version="11.0.50728" />

diff --git a/Build/Common.Build.CSharp.targets b/Build/Common.Build.CSharp.targets
@@ -18,6 +18,7 @@
       <_NugetAssemblies Include="$(PackagesPath)\Microsoft.VisualStudio.*\lib\net35\Microsoft.VisualStudio.*.dll" />
       <_NugetAssemblies Include="$(PackagesPath)\Microsoft.VisualStudio.*\lib\net45\Microsoft.VisualStudio.*.dll" />
       <_NugetAssemblies Include="$(PackagesPath)\Microsoft.VisualStudio.*\lib\net46\Microsoft.VisualStudio.*.dll" />
+      <_NugetAssemblies Include="$(PackagesPath)\Microsoft.VisualStudio.*\lib\net461\Microsoft.VisualStudio.*.dll" />
     </ItemGroup>
     <PropertyGroup>
       <AssemblySearchPaths>

diff --git a/Build/NuGet.exe b/Build/NuGet.exe
diff --git a/Python/Product/LiveShare/LiveShare.csproj b/Python/Product/LiveShare/LiveShare.csproj
@@ -62,18 +62,11 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Cascade.LanguageServices.Common">
-      <HintPath>$(PackagesPath)\Microsoft.Cascade.LanguageServices.Common.0.3.536\lib\net461\Microsoft.Cascade.LanguageServices.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Cascade.Common">
-      <HintPath>$(PackagesPath)\Microsoft.Cascade.Common.0.3.536\lib\net461\Microsoft.Cascade.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Cascade.Client">
-      <HintPath>$(PackagesPath)\Microsoft.Cascade.Client.0.3.536\lib\net461\Microsoft.Cascade.Client.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.VisualStudio.Cascade.Contracts">
-      <HintPath>$(PackagesPath)\Microsoft.VisualStudio.Cascade.Contracts.0.3.536\lib\net461\Microsoft.VisualStudio.Cascade.Contracts.dll</HintPath>
-    </Reference>
+    <_NugetAssemblies Include="$(PackagesPath)\Microsoft.Cascade.*\lib\net461\Microsoft.Cascade.*.dll" />
+    <Reference Include="Microsoft.Cascade.LanguageServices.Common" />
+    <Reference Include="Microsoft.Cascade.Common" />
+    <Reference Include="Microsoft.Cascade.Client" />
+    <Reference Include="Microsoft.VisualStudio.Cascade.Contracts" />
     <Reference Include="Microsoft.VisualStudio.Threading" />
     <Reference Include="Microsoft.VisualStudio.Shell.Framework" />
     <!-- <Reference Include="Microsoft.VisualStudio.Text.UI" /> -->

diff --git a/Python/Product/LiveShare/source.extension.vsixmanifest b/Python/Product/LiveShare/source.extension.vsixmanifest
@@ -1,20 +1,20 @@
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="2cd11de7-1df1-4d50-8a29-9c0e9a6a548d" Version="15.8.0" Language="en-US" Publisher="Microsoft Corporation" />
+        <Identity Id="2cd11de7-1df1-4d50-8a29-9c0e9a6a548d" Version="16.0.0" Language="en-US" Publisher="Microsoft Corporation" />
         <DisplayName>Python - LiveShare</DisplayName>
         <Description xml:space="preserve">Provides LiveShare integration for Python projects</Description>
         <MoreInfo>http://aka.ms/ptvs</MoreInfo>
         <GettingStartedGuide>http://aka.ms/ptvstutorial</GettingStartedGuide>
     </Metadata>
     <Installation SystemComponent="true" AllUsers="true" InstalledByMsi="true">
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0,16.0)" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0,17.0)" />
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" Version="4.6" />
-        <Dependency Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" DisplayName="Python" Version="[15.0,16.0)" />
+        <Dependency Id="96492FC7-7BC6-46F7-8559-66BB4E09FD1E" DisplayName="Python" Version="[16.0,17.0)" />
     </Dependencies>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
     <Assets>
         <Asset Type="Microsoft.VisualStudio.Assembly" Path="|%CurrentProject%;_GetTargetPath|" AssemblyName="|%CurrentProject%;_GetAssemblyName|" />

diff --git a/Python/PythonTools.sln b/Python/PythonTools.sln