Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
d02a4252
F
fsharp
项目概览
dotNET Platform
/
fsharp
12 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d02a4252
编写于
6月 17, 2015
作者:
L
latkin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
More places in IDE unit tests that need to use Assembly.EscapedCodeBase
上级
942d2924
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
5 deletion
+5
-5
vsintegration/src/unittests/Tests.LanguageService.General.fs
vsintegration/src/unittests/Tests.LanguageService.General.fs
+2
-2
vsintegration/src/unittests/Tests.ProjectSystem.MultiTargeting.fs
...ation/src/unittests/Tests.ProjectSystem.MultiTargeting.fs
+1
-1
vsintegration/src/unittests/Tests.ProjectSystem.References.fs
...tegration/src/unittests/Tests.ProjectSystem.References.fs
+2
-2
未找到文件。
vsintegration/src/unittests/Tests.LanguageService.General.fs
浏览文件 @
d02a4252
...
...
@@ -65,7 +65,7 @@ type GeneralTests() =
let
publicTypesInAsm
(
asmfile
:
string
)
=
printfn
"Validating assembly '%s'"
asmfile
let
codeBase
=
(
new
Uri
(
Assembly
.
GetExecutingAssembly
()
.
CodeBase
)).
LocalPath
|>
Path
.
GetDirectoryName
let
codeBase
=
(
new
Uri
(
Assembly
.
GetExecutingAssembly
()
.
Escaped
CodeBase
)).
LocalPath
|>
Path
.
GetDirectoryName
let
asm
=
Assembly
.
LoadFrom
(
Path
.
Combine
(
codeBase
,
asmfile
))
// For public types that have ComVisible, validate that the constructor is internal
...
...
@@ -175,7 +175,7 @@ type GeneralTests() =
member
public
this
.
``PublicSurfaceArea.DotNetReflectionAndTypeProviders``
()
=
let
tp
=
publicTypesInAsm
@
"FSharp.Data.TypeProviders.dll"
Assert
.
AreEqual
(
1
,
tp
)
// the 'DataProviders' type that is decorated with [<TypeProvider>] must be public\
let
curDir
=
(
new
Uri
(
Assembly
.
GetExecutingAssembly
()
.
CodeBase
)).
LocalPath
|>
Path
.
GetDirectoryName
let
curDir
=
(
new
Uri
(
Assembly
.
GetExecutingAssembly
()
.
Escaped
CodeBase
)).
LocalPath
|>
Path
.
GetDirectoryName
let
script
=
"""
open Microsoft.FSharp.Core.CompilerServices
...
...
vsintegration/src/unittests/Tests.ProjectSystem.MultiTargeting.fs
浏览文件 @
d02a4252
...
...
@@ -29,7 +29,7 @@ type MultiTargeting() =
member
private
this
.
prepTest
(
projFile
)
=
let
dirName
=
Path
.
GetDirectoryName
(
projFile
)
let
libDirName
=
Directory
.
CreateDirectory
(
Path
.
Combine
(
dirName
,
"lib"
)).
FullName
let
codeBase
=
(
new
Uri
(
Assembly
.
GetExecutingAssembly
()
.
CodeBase
)).
LocalPath
|>
Path
.
GetDirectoryName
let
codeBase
=
(
new
Uri
(
Assembly
.
GetExecutingAssembly
()
.
Escaped
CodeBase
)).
LocalPath
|>
Path
.
GetDirectoryName
let
refLibPath
=
Path
.
Combine
(
libDirName
,
"FSharp.Core.Unittests.dll"
)
File
.
Copy
(
Path
.
Combine
(
codeBase
,
"FSharp.Core.Unittests.dll"
),
refLibPath
)
File
.
AppendAllText
(
projFile
,
TheTests
.
FsprojTextWithProjectReferencesAndOtherFlags
([],
[
refLibPath
],
[]
,
null
,
""
,
"v2.0"
))
...
...
vsintegration/src/unittests/Tests.ProjectSystem.References.fs
浏览文件 @
d02a4252
...
...
@@ -559,7 +559,7 @@ type References() =
DoWithTempFile
"Test.fsproj"
(
fun
projFile
->
let
dirName
=
Path
.
GetDirectoryName
(
projFile
)
let
libDirName
=
Directory
.
CreateDirectory
(
Path
.
Combine
(
dirName
,
"lib"
)).
FullName
let
codeBase
=
(
new
Uri
(
Assembly
.
GetExecutingAssembly
()
.
CodeBase
)).
LocalPath
|>
Path
.
GetDirectoryName
let
codeBase
=
(
new
Uri
(
Assembly
.
GetExecutingAssembly
()
.
Escaped
CodeBase
)).
LocalPath
|>
Path
.
GetDirectoryName
let
refLibPath
=
Path
.
Combine
(
libDirName
,
"nunit.core.dll"
)
File
.
Copy
(
Path
.
Combine
(
codeBase
,
"nunit.core.dll"
),
refLibPath
)
File
.
AppendAllText
(
projFile
,
TheTests
.
SimpleFsprojText
([],
[
refLibPath
],
""
))
...
...
@@ -574,7 +574,7 @@ type References() =
let
l
=
new
List
<
ReferenceContainerNode
>()
project
.
FindNodesOfType
(
l
)
l
.[
0
]
let
mscorlibPath
=
(
new
Uri
(
""
.
GetType
()
.
Assembly
.
CodeBase
)).
LocalPath
let
mscorlibPath
=
(
new
Uri
(
""
.
GetType
()
.
Assembly
.
Escaped
CodeBase
)).
LocalPath
let
selectorData
=
new
VSCOMPONENTSELECTORDATA
(
``type``
=
VSCOMPONENTTYPE
.
VSCOMPONENTTYPE_ComPlus
,
bstrFile
=
mscorlibPath
)
refContainer
.
AddReferenceFromSelectorData
(
selectorData
)
|>
Assert
.
IsNotNull
let
l
=
new
List
<
AssemblyReferenceNode
>()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录