Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
7dac4a14
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,发现更多精彩内容 >>
未验证
提交
7dac4a14
编写于
2月 05, 2019
作者:
S
Sam Harwell
提交者:
GitHub
2月 05, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #33106 from sharwell/require-dev16
Require dev16 for integration testing
上级
f9fc5ea4
1c343c2e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
7 addition
and
11 deletion
+7
-11
azure-pipelines-integration.yml
azure-pipelines-integration.yml
+0
-4
global.json
global.json
+1
-1
src/VisualStudio/IntegrationTest/TestUtilities/App.config
src/VisualStudio/IntegrationTest/TestUtilities/App.config
+1
-1
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
+2
-2
未找到文件。
azure-pipelines-integration.yml
浏览文件 @
7dac4a14
...
@@ -3,9 +3,7 @@ trigger:
...
@@ -3,9 +3,7 @@ trigger:
-
master
-
master
-
master-vs-deps
-
master-vs-deps
-
dev16.0-preview2
-
dev16.0-preview2
-
dev16.0-preview2-vs-deps
-
dev16.0-preview3
-
dev16.0-preview3
-
dev16.0-preview3-vs-deps
-
dev16.1-preview1
-
dev16.1-preview1
-
dev16.1-preview1-vs-deps
-
dev16.1-preview1-vs-deps
...
@@ -16,9 +14,7 @@ pr:
...
@@ -16,9 +14,7 @@ pr:
-
features/*
-
features/*
-
demos/*
-
demos/*
-
dev16.0-preview2
-
dev16.0-preview2
-
dev16.0-preview2-vs-deps
-
dev16.0-preview3
-
dev16.0-preview3
-
dev16.0-preview3-vs-deps
-
dev16.1-preview1
-
dev16.1-preview1
-
dev16.1-preview1-vs-deps
-
dev16.1-preview1-vs-deps
...
...
global.json
浏览文件 @
7dac4a14
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
"tools"
:
{
"tools"
:
{
"dotnet"
:
"2.1.401"
,
"dotnet"
:
"2.1.401"
,
"vs"
:
{
"vs"
:
{
"version"
:
"1
5.8
"
"version"
:
"1
6.0
"
},
},
"xcopy-msbuild"
:
"15.9.0-alpha"
"xcopy-msbuild"
:
"15.9.0-alpha"
},
},
...
...
src/VisualStudio/IntegrationTest/TestUtilities/App.config
浏览文件 @
7dac4a14
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<
userSettings
>
<
userSettings
>
<
Microsoft
.
VisualStudio
.
IntegrationTest
.
Utilities
.
Settings
>
<
Microsoft
.
VisualStudio
.
IntegrationTest
.
Utilities
.
Settings
>
<
setting
name
=
"VsProductVersion"
serializeAs
=
"String"
>
<
setting
name
=
"VsProductVersion"
serializeAs
=
"String"
>
<
value
>
1
5
</
value
>
<
value
>
1
6
</
value
>
</
setting
>
</
setting
>
<
setting
name
=
"VsRootSuffix"
serializeAs
=
"String"
>
<
setting
name
=
"VsRootSuffix"
serializeAs
=
"String"
>
<
value
>
RoslynDev
</
value
>
<
value
>
RoslynDev
</
value
>
...
...
src/VisualStudio/IntegrationTest/TestUtilities/Settings.Designer.cs
浏览文件 @
7dac4a14
...
@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.IntegrationTest.Utilities {
...
@@ -12,7 +12,7 @@ namespace Microsoft.VisualStudio.IntegrationTest.Utilities {
[
global
::
System
.
Runtime
.
CompilerServices
.
CompilerGeneratedAttribute
()]
[
global
::
System
.
Runtime
.
CompilerServices
.
CompilerGeneratedAttribute
()]
[
global
::
System
.
CodeDom
.
Compiler
.
GeneratedCodeAttribute
(
"Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator"
,
"1
5.3
.0.0"
)]
[
global
::
System
.
CodeDom
.
Compiler
.
GeneratedCodeAttribute
(
"Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator"
,
"1
6.0
.0.0"
)]
internal
sealed
partial
class
Settings
:
global
::
System
.
Configuration
.
ApplicationSettingsBase
{
internal
sealed
partial
class
Settings
:
global
::
System
.
Configuration
.
ApplicationSettingsBase
{
private
static
Settings
defaultInstance
=
((
Settings
)(
global
::
System
.
Configuration
.
ApplicationSettingsBase
.
Synchronized
(
new
Settings
())));
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
...
@@ -25,7 +25,7 @@ internal sealed partial class Settings : global::System.Configuration.Applicatio
[
global
::
System
.
Configuration
.
UserScopedSettingAttribute
()]
[
global
::
System
.
Configuration
.
UserScopedSettingAttribute
()]
[
global
::
System
.
Diagnostics
.
DebuggerNonUserCodeAttribute
()]
[
global
::
System
.
Diagnostics
.
DebuggerNonUserCodeAttribute
()]
[
global
::
System
.
Configuration
.
DefaultSettingValueAttribute
(
"1
5
"
)]
[
global
::
System
.
Configuration
.
DefaultSettingValueAttribute
(
"1
6
"
)]
public
string
VsProductVersion
{
public
string
VsProductVersion
{
get
{
get
{
return
((
string
)(
this
[
"VsProductVersion"
]));
return
((
string
)(
this
[
"VsProductVersion"
]));
...
...
src/VisualStudio/IntegrationTest/TestUtilities/Settings.settings
浏览文件 @
7dac4a14
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
<Profiles
/>
<Profiles
/>
<Settings>
<Settings>
<Setting
Name=
"VsProductVersion"
Type=
"System.String"
Scope=
"User"
>
<Setting
Name=
"VsProductVersion"
Type=
"System.String"
Scope=
"User"
>
<Value
Profile=
"(Default)"
>
1
5
</Value>
<Value
Profile=
"(Default)"
>
1
6
</Value>
</Setting>
</Setting>
<Setting
Name=
"VsRootSuffix"
Type=
"System.String"
Scope=
"User"
>
<Setting
Name=
"VsRootSuffix"
Type=
"System.String"
Scope=
"User"
>
<Value
Profile=
"(Default)"
>
RoslynDev
</Value>
<Value
Profile=
"(Default)"
>
RoslynDev
</Value>
...
...
src/VisualStudio/IntegrationTest/TestUtilities/VisualStudioInstanceFactory.cs
浏览文件 @
7dac4a14
...
@@ -39,9 +39,9 @@ static VisualStudioInstanceFactory()
...
@@ -39,9 +39,9 @@ static VisualStudioInstanceFactory()
{
{
var
majorVsProductVersion
=
VsProductVersion
.
Split
(
'.'
)[
0
];
var
majorVsProductVersion
=
VsProductVersion
.
Split
(
'.'
)[
0
];
if
(
int
.
Parse
(
majorVsProductVersion
)
<
1
5
)
if
(
int
.
Parse
(
majorVsProductVersion
)
<
1
6
)
{
{
throw
new
PlatformNotSupportedException
(
"The Visual Studio Integration Test Framework is only supported on Visual Studio 1
5
.0 and later."
);
throw
new
PlatformNotSupportedException
(
"The Visual Studio Integration Test Framework is only supported on Visual Studio 1
6
.0 and later."
);
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录