Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
ef6d9e5b
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,发现更多精彩内容 >>
提交
ef6d9e5b
编写于
12月 11, 2015
作者:
K
KevinRansom
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix up some testing, update deployment
上级
b50a6d05
变更
6
展开全部
隐藏空白更改
内联
并排
Showing
6 changed file
with
13015 addition
and
177 deletion
+13015
-177
src/fsharp/FSharp.Core/project.lock.json
src/fsharp/FSharp.Core/project.lock.json
+1194
-3
src/fsharp/Fsc/project.lock.json
src/fsharp/Fsc/project.lock.json
+2268
-157
tests/BuildTestTools.cmd
tests/BuildTestTools.cmd
+8
-8
tests/fsharp/project.lock.json
tests/fsharp/project.lock.json
+9535
-2
tests/fsharp/single-test-run.bat
tests/fsharp/single-test-run.bat
+2
-0
tests/fsharpqa/testenv/src/deployProj/DeployProj.fsx
tests/fsharpqa/testenv/src/deployProj/DeployProj.fsx
+8
-7
未找到文件。
src/fsharp/FSharp.Core/project.lock.json
浏览文件 @
ef6d9e5b
此差异已折叠。
点击以展开。
src/fsharp/Fsc/project.lock.json
浏览文件 @
ef6d9e5b
此差异已折叠。
点击以展开。
tests/BuildTestTools.cmd
浏览文件 @
ef6d9e5b
...
...
@@ -73,20 +73,20 @@ if not exist "%NUNITPATH%" (
echo
%_fsiexe%
rem deploy x86 version of compiler and dependencies
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
86
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\fsc\win7
-x
86
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
86
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\win7
-x
86
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--
configFile
:
%~dp0
..\.nuget\nuget.config
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--
projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
86
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\fsc\win7
-x
86
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--
configFile
:
%~dp0
..\.nuget\nuget.config
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--
projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
86
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\win7
-x
86
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:no
--v
:quiet
rem deploy x64 version of compiler
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\fsc\win7
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\win7
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--
configFile
:
%~dp0
..\.nuget\nuget.config
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--
projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\fsc\win7
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--
configFile
:
%~dp0
..\.nuget\nuget.config
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--
projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\win7
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:no
--v
:quiet
rem deploy linux version of built compiler
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/ubuntu.14.04
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\fsc\ubuntu.14.04
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\ubuntu.14.04
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--
configFile
:
%~dp0
..\.nuget\nuget.config
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--
projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/ubuntu.14.04
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\fsc\ubuntu.14.04
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--
configFile
:
%~dp0
..\.nuget\nuget.config
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--
projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\ubuntu.14.04
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:no
--v
:quiet
rem deploy osx version of built compiler
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/ubuntu.14.04
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\fsc\osx.10.10
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\osx.10.10
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--
configFile
:
%~dp0
..\.nuget\nuget.config
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--
projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/ubuntu.14.04
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\fsc\osx.10.10
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
%~dp0
fsharpqa
\testenv\src\DeployProj\DeployProj.fsx
--
configFile
:
%~dp0
..\.nuget\nuget.config
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--
projectJson
:
%~dp0
fsharp
\project.json
--projectJsonLock
:
%~dp0
fsharp
\project.lock.json
--packagesDir
:
%~dp0
..\packages
--targetPlatformName
:DNXCore
,
Version
=
v5
.0/win7
-x
64
--fsharpCore
:
%~dp0
..\
%
1
\coreclr\bin\fsharp.core.dll
--output
:
%~dp0
testbin
\
%
1
\coreclr\osx.10.10
-x
64
--nugetPath
:
%~dp0
..\.nuget\nuget.exe
--nugetConfig
:
%~dp0
..\.nuget\nuget.config
--copyCompiler
:no
--v
:quiet
echo
"
%NUNITPATH%
*.*"
"
%~dp0
\fsharpqa\testenv\bin\nunit\*.*"
/S /Q /Y
xcopy
"
%NUNITPATH%
*.*"
"
%~dp0
\fsharpqa\testenv\bin\nunit\*.*"
/S /Q /Y
...
...
tests/fsharp/project.lock.json
浏览文件 @
ef6d9e5b
此差异已折叠。
点击以展开。
tests/fsharp/single-test-run.bat
浏览文件 @
ef6d9e5b
...
...
@@ -13,6 +13,7 @@ if errorlevel 1 (
set
ERRORMSG
=
%ERRORMSG%
config
.bat
failed
;
goto
:ERROR
)
if
not
exist
"
%FSC%
"
(
set
ERRORMSG
=
%ERRORMSG%
fsc
.exe
not
found
at
the
location
"
%FSC%
"
goto
:ERROR
...
...
@@ -51,6 +52,7 @@ if exist test2-hw.fsx (set sourceshw=%sourceshw% test2-hw.fsx)
:START
set
PERMUTATIONS_LIST
=
FSI_FILE
FSI_STDIN
FSI_STDIN_OPT
FSI_STDIN_GUI
FSC_BASIC
%FSC
_BASIC_64
%
FSC_HW
FSC_O3
GENERATED_SIGNATURE
EMPTY_SIGNATURE
EMPTY_SIGNATURE_OPT
FSC_OPT_MINUS_DEBUG
FSC_OPT_PLUS_DEBUG
FRENCH
SPANISH
AS_DLL
WRAPPER_NAMESPACE
WRAPPER_NAMESPACE_OPT
if
"
%REDUCED_RUNTIME%
"
==
"1"
(
echo
REDUCED_RUNTIME
set
...
...
tests/fsharpqa/testenv/src/deployProj/DeployProj.fsx
浏览文件 @
ef6d9e5b
...
...
@@ -25,14 +25,15 @@ let GetArgumentFromCommandLine switchName defaultValue =
|
Some
(
file
)
->
if
file
.
Length
<>
0
then
file
else
defaultValue
|
_
->
defaultValue
let
ProjectJson
=
GetArgumentFromCommandLine
"--projectJson:"
@
"tests
\
fsharp
\
project.json"
let
ProjectJson
=
GetArgumentFromCommandLine
"--projectJson:"
@
"tests
\
fsharp
\
project.json"
let
configFile
=
GetArgumentFromCommandLine
"--configFile:"
@
".nuget
\n
uget.config"
let
ProjectJsonLock
=
GetArgumentFromCommandLine
"--projectJsonLock:"
@
"tests
\
fsharp
\
project.lock.json"
let
PackagesDir
=
GetArgumentFromCommandLine
"--packagesDir:"
@
"packages"
let
PackagesDir
=
GetArgumentFromCommandLine
"--packagesDir:"
@
"packages"
let
TargetPlatformName
=
GetArgumentFromCommandLine
"--targetPlatformName:"
@
"DNXCore,Version=v5.0/win7-x64"
let
FSharpCore
=
GetArgumentFromCommandLine
"--fsharpCore:"
@
"Release
\
coreclr
\b
in
\
fsharp.core.dll"
let
Output
=
GetArgumentFromCommandLine
"--output:"
@
"."
let
NugetPath
=
GetArgumentFromCommandLine
"--nugetPath:"
@
".nuget
\n
uget.exe"
let
Verbosity
=
GetArgumentFromCommandLine
"--v:"
@
"quiet"
let
FSharpCore
=
GetArgumentFromCommandLine
"--fsharpCore:"
@
"Release
\
coreclr
\b
in
\
fsharp.core.dll"
let
Output
=
GetArgumentFromCommandLine
"--output:"
@
"."
let
NugetPath
=
GetArgumentFromCommandLine
"--nugetPath:"
@
".nuget
\n
uget.exe"
let
Verbosity
=
GetArgumentFromCommandLine
"--v:"
@
"quiet"
let
CopyCompiler
=
GetArgumentFromCommandLine
"--copyCompiler:"
@
"no"
let
FSharpCompilerFiles
=
...
...
@@ -91,7 +92,7 @@ let executeProcess filename arguments =
else
0
let
_
=
let
arguments
=
"restore -PackagesDirectory "
+
PackagesDir
+
" "
+
ProjectJson
let
arguments
=
"restore -
configFile "
+
configFile
+
" -
PackagesDirectory "
+
PackagesDir
+
" "
+
ProjectJson
executeProcess
NugetPath
arguments
let
setPathSeperators
(
path
:
string
)
=
path
.
Replace
(
'
/
'
,
'\\'
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录