Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
ec679313
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
ec679313
编写于
5月 01, 2019
作者:
D
dotnet-automerge-bot
提交者:
GitHub
5月 01, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #35425 from dotnet/merges/release/dev16.1-to-master
Merge release/dev16.1 to master
上级
4014a161
97144f48
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
9 addition
and
12 deletion
+9
-12
azure-pipelines-integration.yml
azure-pipelines-integration.yml
+2
-4
azure-pipelines.yml
azure-pipelines.yml
+2
-4
src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj
...mpl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj
+4
-3
src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
...o/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+1
-1
未找到文件。
azure-pipelines-integration.yml
浏览文件 @
ec679313
...
...
@@ -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
...
...
azure-pipelines.yml
浏览文件 @
ec679313
...
...
@@ -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
...
...
src/VisualStudio/CSharp/Impl/Microsoft.VisualStudio.LanguageServices.CSharp.csproj
浏览文件 @
ec679313
...
...
@@ -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"
>
...
...
src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
浏览文件 @
ec679313
...
...
@@ -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)"
/>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录