Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
62e9bdfe
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,发现更多精彩内容 >>
未验证
提交
62e9bdfe
编写于
11月 27, 2017
作者:
B
Brett V. Forsgren
提交者:
GitHub
11月 27, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
restore coreclr.dll from a NuGet package (#4005)
上级
ae558289
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
5 addition
and
3 deletion
+5
-3
tests/fsharp/packages.config
tests/fsharp/packages.config
+2
-0
tests/fsharp/test-framework.fs
tests/fsharp/test-framework.fs
+3
-3
未找到文件。
tests/fsharp/packages.config
浏览文件 @
62e9bdfe
...
...
@@ -3,6 +3,8 @@
<
package
id
=
"NUnit3TestAdapter"
version
=
"3.7.0"
targetFramework
=
"net45"
/>
<
package
id
=
"runtime.win-x64.Microsoft.NETCore.ILDAsm"
version
=
"2.0.3"
/>
<
package
id
=
"runtime.win-x86.Microsoft.NETCore.ILDAsm"
version
=
"2.0.3"
/>
<
package
id
=
"runtime.win-x64.Microsoft.NETCore.Runtime.CoreCLR"
version
=
"2.0.3"
/>
<
package
id
=
"runtime.win-x86.Microsoft.NETCore.Runtime.CoreCLR"
version
=
"2.0.3"
/>
<
package
id
=
"System.Collections.Immutable"
version
=
"1.3.1"
targetFramework
=
"net45"
/>
<
package
id
=
"System.Reflection.Metadata"
version
=
"1.4.2"
targetFramework
=
"net45"
/>
</
packages
>
\ No newline at end of file
tests/fsharp/test-framework.fs
浏览文件 @
62e9bdfe
...
...
@@ -178,6 +178,7 @@ let config configurationName envVars =
let architectureMoniker = if Is64BitOperatingSystem then "
x64
" else "
x86
"
let CSC = requireFile (CORDIR ++ "
csc
.
exe
")
let ILDASM = requireFile (packagesDir ++ ("
runtime
.
win
-
" + architectureMoniker + "
.
Microsoft
.
NETCore
.
ILDAsm
.
2
.
0
.
3")
++
"
runtimes
" ++ ("
win
-
" + architectureMoniker) ++ "
native
" ++ "
ildasm
.
exe
")
let coreclrdll = requireFile (packagesDir ++ ("
runtime
.
win
-
" + architectureMoniker + "
.
Microsoft
.
NETCore
.
Runtime
.
CoreCLR
.
2
.
0
.
3")
++
"
runtimes
" ++ ("
win
-
" + architectureMoniker) ++ "
native
" ++ "
coreclr
.
dll
")
let PEVERIFY = requireFile (CORSDK ++ "
peverify
.
exe
")
let FSI_FOR_SCRIPTS =
match envVars |> Map.tryFind "
_
fsiexe
" with
...
...
@@ -191,9 +192,8 @@ let config configurationName envVars =
|
_
->
failwithf
"Found more than one 'FSharp.Compiler.Tools' inside '%s', please clean up."
packagesDir
let
toolsDir
=
SCRIPT_ROOT
++
".."
++
".."
++
"Tools"
let
dotNetExe
=
toolsDir
++
"dotnetcli"
++
"dotnet.exe"
// ildasm requires coreclr.dll to run which has already been restored to the tools directory
let
coreclrSource
=
toolsDir
++
"dotnet20"
++
"shared"
++
"Microsoft.NETCore.App"
++
"2.0.0"
++
"coreclr.dll"
File
.
Copy
(
coreclrSource
,
Path
.
GetDirectoryName
(
ILDASM
)
++
"coreclr.dll"
,
overwrite
=
true
)
// ildasm requires coreclr.dll to run which has already been restored to the packages directory
File
.
Copy
(
coreclrdll
,
Path
.
GetDirectoryName
(
ILDASM
)
++
"coreclr.dll"
,
overwrite
=
true
)
#
if
!
FSHARP_SUITE_DRIVES_CORECLR_TESTS
let
FSI
=
requireFile
(
FSCBinPath
++
"fsi.exe"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录