Skip to content
Permalink
Browse files

Merge pull request #35425 from dotnet/merges/release/dev16.1-to-master

Merge release/dev16.1 to master
  • Loading branch information...
dotnet-automerge-bot committed May 2, 2019
2 parents 4014a16 + 97144f4 commit ec6793139feef111e1232151aba2e47e5c17bfd5
@@ -2,27 +2,25 @@
trigger:
- master
- master-vs-deps
- release/*
- dev16.0
- dev16.0-vs-deps
- dev16.1-preview2
- dev16.1-preview2-vs-deps
- dev16.1-preview3
- dev16.1-preview3-vs-deps
- dev16.1
- dev16.1-vs-deps

# Branches that trigger builds on PR
pr:
- master
- master-vs-deps
- release/*
- features/*
- demos/*
- dev16.0
- dev16.0-vs-deps
- dev16.1-preview2
- dev16.1-preview2-vs-deps
- dev16.1
- dev16.1-vs-deps

jobs:
- job: VS_Integration
@@ -2,6 +2,7 @@
trigger:
- master
- master-vs-deps
- release/*
- features/*
- demos/*
- dev16.0
@@ -10,21 +11,18 @@ trigger:
- dev16.1-preview2-vs-deps
- dev16.1-preview3
- dev16.1-preview3-vs-deps
- dev16.1
- dev16.1-vs-deps

# Branches that trigger builds on PR
pr:
- master
- master-vs-deps
- release/*
- features/*
- demos/*
- dev16.0
- dev16.0-vs-deps
- dev16.1-preview2
- dev16.1-preview2-vs-deps
- dev16.1
- dev16.1-vs-deps

jobs:
- job: Windows_Desktop_Unit_Tests
@@ -41,17 +41,18 @@
<PackageReference Include="EnvDTE" Version="$(EnvDTEVersion)" />
<PackageReference Include="EnvDTE80" Version="$(EnvDTE80Version)" />
<PackageReference Include="Microsoft.MSXML" Version="$(MicrosoftMSXMLVersion)" />
<PackageReference Include="Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime" Version="$(MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Editor" Version="$(MicrosoftVisualStudioEditorVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MicrosoftVisualStudioLanguageIntellisenseVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150Version)" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Design" Version="$(MicrosoftVisualStudioShellDesignVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Framework" Version="$(MicrosoftVisualStudioShellFrameworkVersion)" />
<PackageReference Include="Microsoft.VisualStudio.GraphModel" Version="$(MicrosoftVisualStudioGraphModelVersion)" />
<PackageReference Include="Microsoft.Internal.VisualStudio.Shell.Interop.14.0.DesignTime" Version="$(MicrosoftInternalVisualStudioShellInterop140DesignTimeVersion)" />
<PackageReference Include="Microsoft.VisualStudio.ComponentModelHost" Version="$(MicrosoftVisualStudioComponentModelHostVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Shell.Design" Version="$(MicrosoftVisualStudioShellDesignVersion)" />
<PackageReference Include="VSLangProj80" Version="$(VSLangProj80Version)" />
<PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="$(MicrosoftVisualStudioSDKEmbedInteropTypesVersion)" />
<!-- The reference does not flow from Microsoft.VisualStudio.LanguageServices since it's private in that project -->
<PackageReference Include="Microsoft.VisualStudio.VsInteractiveWindow" Version="$(MicrosoftVisualStudioVsInteractiveWindowVersion)" />
<PackageReference Include="VSLangProj80" Version="$(VSLangProj80Version)" />
</ItemGroup>
<ItemGroup>
<Compile Update="CSharpVSResources.Designer.cs">
@@ -191,7 +191,7 @@
<PackageReference Include="Microsoft.VisualStudio.TextManager.Interop.12.1.DesignTime" Version="$(MicrosoftVisualStudioTextManagerInterop121DesignTimeVersion)" />
<PackageReference Include="Microsoft.VisualStudio.TextManager.Interop.16.0.DesignTime" Version="$(MicrosoftVisualStudioTextManagerInterop160DesignTimeVersion)" />
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.VisualStudio.VsInteractiveWindow" Version="$(MicrosoftVisualStudioVsInteractiveWindowVersion)" />
<PackageReference Include="Microsoft.VisualStudio.VsInteractiveWindow" Version="$(MicrosoftVisualStudioVsInteractiveWindowVersion)" PrivateAssets="all"/>
<PackageReference Include="Microsoft.VisualStudio.Designer.Interfaces" Version="$(MicrosoftVisualStudioDesignerInterfacesVersion)" />
<PackageReference Include="Microsoft.DiaSymReader" Version="$(MicrosoftDiaSymReaderVersion)" PrivateAssets="all" />
<PackageReference Include="Microsoft.MSXML" Version="$(MicrosoftMSXMLVersion)" />

0 comments on commit ec67931

Please sign in to comment.
You can’t perform that action at this time.