Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
bddc993a
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,发现更多精彩内容 >>
提交
bddc993a
编写于
5月 25, 2017
作者:
J
Jason Malinowski
提交者:
Tanner Gooding
6月 07, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow running on newer Visual Studio 2017 versions
上级
cee39cf0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
8 addition
and
13 deletion
+8
-13
src/VisualStudio/IntegrationTest/TestUtilities/App.config
src/VisualStudio/IntegrationTest/TestUtilities/App.config
+1
-1
src/VisualStudio/IntegrationTest/TestUtilities/IntegrationHelper.cs
...Studio/IntegrationTest/TestUtilities/IntegrationHelper.cs
+4
-7
src/VisualStudio/IntegrationTest/TestUtilities/Settings.Designer.cs
...Studio/IntegrationTest/TestUtilities/Settings.Designer.cs
+2
-2
src/VisualStudio/IntegrationTest/TestUtilities/Settings.settings
...ualStudio/IntegrationTest/TestUtilities/Settings.settings
+1
-1
src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs
...egrationTest/TestUtilities/VisualStudioInstanceFactory.cs
+0
-2
未找到文件。
src/VisualStudio/IntegrationTest/TestUtilities/App.config
浏览文件 @
bddc993a
...
...
@@ -10,7 +10,7 @@
<
userSettings
>
<
Microsoft
.
VisualStudio
.
IntegrationTest
.
Utilities
.
Settings
>
<
setting
name
=
"VsProductVersion"
serializeAs
=
"String"
>
<
value
>
15
.
0
</
value
>
<
value
>
15
</
value
>
</
setting
>
<
setting
name
=
"VsRootSuffix"
serializeAs
=
"String"
>
<
value
>
RoslynDev
</
value
>
...
...
src/VisualStudio/IntegrationTest/TestUtilities/IntegrationHelper.cs
浏览文件 @
bddc993a
...
...
@@ -458,7 +458,6 @@ public static DTE TryLocateDteForProcess(Process process)
{
object
dte
=
null
;
var
monikers
=
new
IMoniker
[
1
];
var
vsProgId
=
VisualStudioInstanceFactory
.
VsProgId
;
NativeMethods
.
GetRunningObjectTable
(
0
,
out
var
runningObjectTable
);
runningObjectTable
.
EnumRunning
(
out
var
enumMoniker
);
...
...
@@ -484,16 +483,14 @@ public static DTE TryLocateDteForProcess(Process process)
moniker
.
GetDisplayName
(
bindContext
,
null
,
out
var
fullDisplayName
);
// FullDisplayName will look something like: <ProgID>:<ProccessId>
if
(!
int
.
TryParse
(
fullDisplayName
.
Split
(
':'
).
Last
(),
out
var
displayNameProcessId
))
var
displayNameParts
=
fullDisplayName
.
Split
(
':'
);
if
(!
int
.
TryParse
(
displayNameParts
.
Last
(),
out
var
displayNameProcessId
))
{
continue
;
}
var
displayName
=
fullDisplayName
.
Substring
(
0
,
(
fullDisplayName
.
Length
-
(
displayNameProcessId
.
ToString
().
Length
+
1
)));
var
fullProgId
=
vsProgId
.
StartsWith
(
"!"
)
?
vsProgId
:
$"!
{
vsProgId
}
"
;
if
(
displayName
.
Equals
(
fullProgId
,
StringComparison
.
OrdinalIgnoreCase
)
&&
(
displayNameProcessId
==
process
.
Id
))
if
(
displayNameParts
[
0
].
StartsWith
(
"!VisualStudio.DTE"
,
StringComparison
.
OrdinalIgnoreCase
)
&&
displayNameProcessId
==
process
.
Id
)
{
runningObjectTable
.
GetObject
(
moniker
,
out
dte
);
}
...
...
src/VisualStudio/IntegrationTest/TestUtilities/Settings.Designer.cs
浏览文件 @
bddc993a
...
...
@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.IntegrationTest.Utilities {
[
global
::
System
.
Runtime
.
CompilerServices
.
CompilerGeneratedAttribute
()]
[
global
::
System
.
CodeDom
.
Compiler
.
GeneratedCodeAttribute
(
"Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator"
,
"15.
0
.0.0"
)]
[
global
::
System
.
CodeDom
.
Compiler
.
GeneratedCodeAttribute
(
"Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator"
,
"15.
3
.0.0"
)]
internal
sealed
partial
class
Settings
:
global
::
System
.
Configuration
.
ApplicationSettingsBase
{
private
static
Settings
defaultInstance
=
((
Settings
)(
global
::
System
.
Configuration
.
ApplicationSettingsBase
.
Synchronized
(
new
Settings
())));
...
...
@@ -25,7 +25,7 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio
[
global
::
System
.
Configuration
.
UserScopedSettingAttribute
()]
[
global
::
System
.
Diagnostics
.
DebuggerNonUserCodeAttribute
()]
[
global
::
System
.
Configuration
.
DefaultSettingValueAttribute
(
"15
.0
"
)]
[
global
::
System
.
Configuration
.
DefaultSettingValueAttribute
(
"15"
)]
public
string
VsProductVersion
{
get
{
return
((
string
)(
this
[
"VsProductVersion"
]));
...
...
src/VisualStudio/IntegrationTest/TestUtilities/Settings.settings
浏览文件 @
bddc993a
...
...
@@ -3,7 +3,7 @@
<Profiles
/>
<Settings>
<Setting
Name=
"VsProductVersion"
Type=
"System.String"
Scope=
"User"
>
<Value
Profile=
"(Default)"
>
15
.0
</Value>
<Value
Profile=
"(Default)"
>
15
</Value>
</Setting>
<Setting
Name=
"VsRootSuffix"
Type=
"System.String"
Scope=
"User"
>
<Value
Profile=
"(Default)"
>
RoslynDev
</Value>
...
...
src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs
浏览文件 @
bddc993a
...
...
@@ -20,8 +20,6 @@ public sealed class VisualStudioInstanceFactory : IDisposable
{
public
static
readonly
string
VsProductVersion
=
Settings
.
Default
.
VsProductVersion
;
public
static
readonly
string
VsProgId
=
$"VisualStudio.DTE.
{
VsProductVersion
}
"
;
public
static
readonly
string
VsLaunchArgs
=
$"
{(
string
.
IsNullOrWhiteSpace
(
Settings
.
Default
.
VsRootSuffix
)
?
"/log"
:
$"/rootsuffix
{
Settings
.
Default
.
VsRootSuffix
}
"
)}
/log"
;
/// <summary>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录