Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
032f9c45
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,发现更多精彩内容 >>
提交
032f9c45
编写于
11月 16, 2016
作者:
K
Kevin Ransom (msft)
提交者:
GitHub
11月 16, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use vssdk from nuget (#1748)
* Use vssdk from nuget * forget to commit packages.config
上级
34690eb6
变更
19
显示空白变更内容
内联
并排
Showing
19 changed file
with
70 addition
and
51 deletion
+70
-51
.gitignore
.gitignore
+1
-1
build.cmd
build.cmd
+35
-25
packages.config
packages.config
+1
-0
src/FSharpSource.Settings.targets
src/FSharpSource.Settings.targets
+5
-1
src/fsharp/FSharp.Build/Microsoft.FSharp.targets
src/fsharp/FSharp.Build/Microsoft.FSharp.targets
+2
-1
src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
...mpiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
+1
-2
src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj
...geService.Compiler/FSharp.LanguageService.Compiler.fsproj
+1
-2
vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
...on/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
+3
-0
vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
...ation/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
+3
-0
vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
...Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
+3
-0
vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
...ration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
+3
-0
vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
+1
-2
vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
...p.LanguageService.Base/FSharp.LanguageService.Base.csproj
+3
-4
vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
.../src/FSharp.LanguageService/FSharp.LanguageService.fsproj
+1
-2
vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
...harp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
+3
-4
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
...tion/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
+1
-2
vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
...ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
+1
-2
vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
+1
-2
vsintegration/src/fsharp.tools.targets
vsintegration/src/fsharp.tools.targets
+1
-1
未找到文件。
.gitignore
浏览文件 @
032f9c45
...
...
@@ -104,5 +104,5 @@ tests/fsharp/typecheck/sigs/neg94-pre.dll
times
/tests/fsharpqa/testenv/bin/System.ValueTuple.dll
source_link.json
/.vs
.vs/
/VSRelease/net40/bin
build.cmd
浏览文件 @
032f9c45
...
...
@@ -346,13 +346,25 @@ echo INCLUDE_TEST_TAGS=%INCLUDE_TEST_TAGS%
echo
.
echo
----------------
Done
with
arguments
,
starting
preparation
-----------------
if
'
%VSSDKInstall%
'
==
''
(
set
VSSDKInstall
=
%~dp0
packages
\Microsoft.VSSDK.BuildTools.15.0.25907
-RC
2
\tools\vssdk
)
if
'
%VSSDKToolsPath%
'
==
''
(
set
VSSDKToolsPath
=
%~dp0
packages
\Microsoft.VSSDK.BuildTools.15.0.25907
-RC
2
\tools\vssdk\bin
)
if
'
%VSSDKIncludes%
'
==
''
(
set
VSSDKIncludes
=
%~dp0
packages
\Microsoft.VSSDK.BuildTools.15.0.25907
-RC
2
\tools\vssdk\inc
)
if
"
%RestorePackages%
"
==
""
(
if
'
%RestorePackages%
'
==
''
(
set
RestorePackages
=
true
)
@echo
on
@echo
VSSDKInstall
:
%VSSDKInstall%
@echo
VSSDKToolsPath
:
%VSSDKToolsPath%
@echo
VSSDKIncludes
:
%VSSDKIncludes%
@echo
on
@call
src
\update.cmd
signonly
:: Check prerequisites
...
...
@@ -406,6 +418,7 @@ if defined APPVEYOR (
set
_msbuildexe
=
%_msbuildexe%
/logger
:
"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
)
)
REM set msbuildflags=/maxcpucount %_nrswitch% /nologo
set
msbuildflags
=
%_nrswitch%
/nologo
set
_ngenexe
=
"
%SystemRoot%
\Microsoft.NET\Framework\v4.0.30319\ngen.exe"
...
...
@@ -526,37 +539,35 @@ if '%BUILD_CORECLR%' == '1' (
%_nugetexe%
restore
.\tests\fsharp\project.json
-PackagesDirectory
packages
-ConfigFile
%_nugetconfig%
echo
Deploy
x86
version
of
compiler
and
dependencies
,
ready
for
testing
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
86
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\win7
-x
86
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
86
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\win7
-x
86
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
86
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\win7
-x
86
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
86
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\win7
-x
86
--copyCompiler
:no
--v
:quiet
echo
Deploy
x64
compiler
to
tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\win7
-x
64
,
ready
for
testing
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\win7
-x
64
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\win7
-x
64
--copyCompiler
:yes
--v
:quiet
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\win7
-x
64
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\win7
-x
64
--copyCompiler
:yes
--v
:quiet
echo
Deploy
x64
runtime
and
FSharp
.Core
library
to
tests
\testbin\
%BUILD_CONFIG%
\coreclr\win7
-x
64
,
ready
for
testing
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\win7
-x
64
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\win7
-x
64
--copyCompiler
:no
--v
:quiet
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\win7
-x
64
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/win7
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\win7
-x
64
--copyCompiler
:no
--v
:quiet
echo
Deploy
linux
compiler
to
tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\ubuntu.14.04
-x
64
,
ready
for
testing
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/ubuntu.14.04
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\ubuntu.14.04
-x
64
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/ubuntu.14.04
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\ubuntu.14.04
-x
64
--copyCompiler
:yes
--v
:quiet
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/ubuntu.14.04
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\ubuntu.14.04
-x
64
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/ubuntu.14.04
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\ubuntu.14.04
-x
64
--copyCompiler
:yes
--v
:quiet
REM echo Deploy linux runtime and FSharp.Core library to tests\testbin\%BUILD_CONFIG%\coreclr\ubuntu.14.04-x64, ready for testing
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/ubuntu.14.04
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\ubuntu.14.04
-x
64
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/ubuntu.14.04
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\ubuntu.14.04
-x
64
--copyCompiler
:no
--v
:quiet
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/ubuntu.14.04
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\ubuntu.14.04
-x
64
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/ubuntu.14.04
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\ubuntu.14.04
-x
64
--copyCompiler
:no
--v
:quiet
echo
Deploy
OSX
compiler
to
tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\osx.10.10
-x
64
,
ready
for
testing
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/osx.10.10
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\osx.10.10
-x
64
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/osx.10.10
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\osx.10.10
-x
64
--copyCompiler
:yes
--v
:quiet
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/osx.10.10
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\osx.10.10
-x
64
--copyCompiler
:yes
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/osx.10.10
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\fsc\osx.10.10
-x
64
--copyCompiler
:yes
--v
:quiet
echo
Deploy
OSX
runtime
and
FSharp
.Core
library
to
tests
\testbin\
%BUILD_CONFIG%
\coreclr\osx.10.10
-x
64
,
ready
for
testing
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/osx.10.10
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\osx.10.10
-x
64
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/osx.10.10
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
\
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\osx.10.10
-x
64
--copyCompiler
:no
--v
:quiet
echo
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/osx.10.10
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\osx.10.10
-x
64
--copyCompiler
:no
--v
:quiet
%_fsiexe%
--exec
tests
\fsharpqa\testenv\src\DeployProj\DeployProj.fsx
--targetPlatformName
:.NETStandard
,
Version
=
v1
.6/osx.10.10
-x
64
--projectJsonLock
:
%~dp0
tests
\fsharp\project.lock.json
--packagesDir
:
%~dp0
packages
--fsharpCore
:
%BUILD_CONFIG%
\coreclr\bin\FSharp.Core.dll
--output
:tests
\testbin\
%BUILD_CONFIG%
\coreclr\osx.10.10
-x
64
--copyCompiler
:no
--v
:quiet
)
if
'TEST_NET40_COMPILERUNIT_SUITE'
==
'0'
and
'TEST_PORTABLE_COREUNIT_SUITE'
==
'0'
and
'TEST_CORECLR_COREUNIT_SUITE'
==
'0'
and
'TEST_VS_IDEUNIT_SUITE'
==
'0'
and
'TEST_NET40_FSHARP_SUITE'
==
'0'
and
'TEST_NET40_FSHARPQA_SUITE'
==
'0'
goto
:success
echo
----------------
Done
with
update
,
starting
tests
-----------------------
if
NOT
"
%INCLUDE_TEST_SPEC_NUNIT%
"
==
""
(
set
WHERE_ARG_NUNIT
=
--where
"
%INCLUDE_TEST_SPEC_NUNIT%
"
)
...
...
@@ -565,7 +576,6 @@ if NOT "%INCLUDE_TEST_TAGS%" == "" (
)
echo
WHERE_ARG_NUNIT
=
!WHERE_ARG_NUNIT!
set
NUNITPATH
=
%~dp0
tests
\fsharpqa\testenv\bin\nunit\
set
NUNIT3_CONSOLE
=
%~dp0
packages
\NUnit.Console.3.0.0\tools\nunit3
-console
.exe
set
link_exe
=
%~dp0
packages
\VisualCppTools.14.0.24519
-Pre
\lib\native\bin\link.exe
...
...
packages.config
浏览文件 @
032f9c45
...
...
@@ -30,6 +30,7 @@
<
package
id
=
"VisualCppTools"
version
=
"14.0.24519-Pre"
/>
<
package
id
=
"Newtonsoft.Json"
version
=
"6.0.8"
/>
<
package
id
=
"Microsoft.FSharp.TupleSample"
version
=
"1.0.0-alpha-161112"
/>
<
package
id
=
"Microsoft.VSSDK.BuildTools"
version
=
"15.0.25907-RC2"
/>
<!--
Annoyingly
the
build
of
FSharp
.
Compiler
.
Server
.
Shared
references
a
Visual
Studio
-
specific
attribute
-->
<!--
That
DLL
is
logically
part
of
the
F
# Compiler and F# Interactive but is shipped as part of the Visual F# IDE Tools -->
...
...
src/FSharpSource.Settings.targets
浏览文件 @
032f9c45
...
...
@@ -44,6 +44,10 @@
<UseSourceLink>
true
</UseSourceLink>
<UseGatherBinaries>
true
</UseGatherBinaries>
<AddVsSdkAttributesToSomeCoreComponents>
true
</AddVsSdkAttributesToSomeCoreComponents>
<VsSDKInstall>
$(MSBuildThisFileDirectory)..\packages\Microsoft.VSSDK.BuildTools.15.0.25907-RC2\tools\vssdk
</VsSDKInstall>
<VsSDKToolPath>
$(MSBuildThisFileDirectory)..\packages\Microsoft.VSSDK.BuildTools.15.0.25907-RC2\tools\vssdk\bin
</VsSDKToolPath>
<VsSDKIncludes>
$(MSBuildThisFileDirectory)..\packages\Microsoft.VSSDK.BuildTools.15.0.25907-RC2\tools\vssdk\inc
</VsSDKIncludes>
<VsixSchemaPath>
$(MSBuildThisFileDirectory)..\packages\Microsoft.VSSDK.BuildTools.15.0.25907-RC2\tools\vssdk\schemas\VSIXManifestSchema.xsd
</VsixSchemaPath>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(ProjectLanguage)' == 'FSharp' "
>
...
...
src/fsharp/FSharp.Build/Microsoft.FSharp.targets
浏览文件 @
032f9c45
...
...
@@ -19,6 +19,7 @@ this file.
<UsingTask TaskName="Fsc" AssemblyFile="FSharp.Build{BuildSuffix}.dll"/>
<UsingTask TaskName="CreateFSharpManifestResourceName" AssemblyFile="FSharp.Build{BuildSuffix}.dll"/>
<UsingTask TaskName="SetEnv" AssemblyFile="FSharp.Build{BuildSuffix}.dll"/>
<PropertyGroup>
<ImportByWildcardBeforeMicrosoftFSharpTargets Condition="'$(ImportByWildcardBeforeMicrosoftFSharpTargets)' == ''">true</ImportByWildcardBeforeMicrosoftFSharpTargets>
...
...
src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
浏览文件 @
032f9c45
...
...
@@ -11,7 +11,6 @@
<ProjectGuid>
{d5870cf0-ed51-4cbc-b3d7-6f56da84ac06}
</ProjectGuid>
<OutputType>
Library
</OutputType>
<AssemblyName>
FSharp.Compiler.Server.Shared
</AssemblyName>
<VsSdkTargetsDir>
$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK
</VsSdkTargetsDir>
<ImportVSSDKTargets>
true
</ImportVSSDKTargets>
<CreateVsixContainer>
false
</CreateVsixContainer>
<DeployExtension>
false
</DeployExtension>
...
...
@@ -45,7 +44,7 @@
</ProjectReference>
</ItemGroup>
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.targets"
/>
<Import
Project=
"$(VsS
dkTargetsDir
)\Microsoft.VsSDK.targets"
Condition=
"'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'"
/>
<Import
Project=
"$(VsS
DKInstall
)\Microsoft.VsSDK.targets"
Condition=
"'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'"
/>
<Target
Name=
"GatherBinariesToBeSigned"
AfterTargets=
"Localize"
Condition=
"'$(UseGatherBinaries)' == 'true'"
>
<ItemGroup>
...
...
src/fsharp/FSharp.LanguageService.Compiler/FSharp.LanguageService.Compiler.fsproj
浏览文件 @
032f9c45
...
...
@@ -20,7 +20,6 @@
<ProjectGuid>
{a437a6ec-5323-47c2-8f86-e2cac54ff152}
</ProjectGuid>
<AllowCrossTargeting>
true
</AllowCrossTargeting>
<BaseAddress>
0x06800000
</BaseAddress>
<VsSdkTargetsDir>
$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK
</VsSdkTargetsDir>
<ImportVSSDKTargets>
true
</ImportVSSDKTargets>
<CreateVsixContainer>
false
</CreateVsixContainer>
<DeployExtension>
false
</DeployExtension>
...
...
@@ -599,7 +598,7 @@
</ItemGroup>
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.targets"
/>
<Import
Project=
"$(FSharpSourcesRoot)\..\packages\FsLexYacc.7.0.1\build\FsLexYacc.targets"
/>
<Import
Project=
"$(VsS
dkTargetsDir
)\Microsoft.VsSDK.targets"
Condition=
"'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'"
/>
<Import
Project=
"$(VsS
DKInstall
)\Microsoft.VsSDK.targets"
Condition=
"'$(AddVsSdkAttributesToSomeCoreComponents)' == 'true'"
/>
<PropertyGroup>
<OtherFlags>
$(OtherFlags) /warnon:1182
</OtherFlags>
</PropertyGroup>
...
...
vsintegration/Vsix/VisualFSharpDesktop/Source.extension.vsixmanifest
浏览文件 @
032f9c45
...
...
@@ -57,4 +57,7 @@
<Asset
Type=
"Microsoft.VisualStudio.MefComponent"
d:Source=
"Project"
d:ProjectName=
"FSharp.Editor"
Path=
"|FSharp.Editor|"
AssemblyName=
"|FSharp.Editor;AssemblyName|"
/>
<Asset
Type=
"Microsoft.VisualStudio.Analyzer"
d:Source=
"Project"
d:ProjectName=
"FSharp.Editor"
Path=
"|FSharp.Editor|"
/>
</Assets>
<Prerequisites>
<Prerequisite
Id=
"Microsoft.VisualStudio.Component.CoreEditor"
Version=
"[15.0,16.0)"
DisplayName=
"Visual Studio core editor"
/>
</Prerequisites>
</PackageManifest>
\ No newline at end of file
vsintegration/Vsix/VisualFSharpFull/Source.extension.vsixmanifest
浏览文件 @
032f9c45
...
...
@@ -62,4 +62,7 @@
<Asset
Type=
"Microsoft.VisualStudio.MefComponent"
d:Source=
"Project"
d:ProjectName=
"FSharp.Editor"
Path=
"|FSharp.Editor|"
AssemblyName=
"|FSharp.Editor;AssemblyName|"
/>
<Asset
Type=
"Microsoft.VisualStudio.Analyzer"
d:Source=
"Project"
d:ProjectName=
"FSharp.Editor"
Path=
"|FSharp.Editor|"
/>
</Assets>
<Prerequisites>
<Prerequisite
Id=
"Microsoft.VisualStudio.Component.CoreEditor"
Version=
"[15.0,16.0)"
DisplayName=
"Visual Studio core editor"
/>
</Prerequisites>
</PackageManifest>
\ No newline at end of file
vsintegration/Vsix/VisualFSharpOpenSource/Source.extension.vsixmanifest
浏览文件 @
032f9c45
...
...
@@ -62,4 +62,7 @@
<Asset
Type=
"Microsoft.VisualStudio.MefComponent"
d:Source=
"Project"
d:ProjectName=
"FSharp.Editor"
Path=
"|FSharp.Editor|"
AssemblyName=
"|FSharp.Editor;AssemblyName|"
/>
<Asset
Type=
"Microsoft.VisualStudio.Analyzer"
d:Source=
"Project"
d:ProjectName=
"FSharp.Editor"
Path=
"|FSharp.Editor|"
/>
</Assets>
<Prerequisites>
<Prerequisite
Id=
"Microsoft.VisualStudio.Component.CoreEditor"
Version=
"[15.0,16.0)"
DisplayName=
"Visual Studio core editor"
/>
</Prerequisites>
</PackageManifest>
\ No newline at end of file
vsintegration/Vsix/VisualFSharpWeb/Source.extension.vsixmanifest
浏览文件 @
032f9c45
...
...
@@ -57,4 +57,7 @@
<Asset
Type=
"Microsoft.VisualStudio.MefComponent"
d:Source=
"Project"
d:ProjectName=
"FSharp.Editor"
Path=
"|FSharp.Editor|"
AssemblyName=
"|FSharp.Editor;AssemblyName|"
/>
<Asset
Type=
"Microsoft.VisualStudio.Analyzer"
d:Source=
"Project"
d:ProjectName=
"FSharp.Editor"
Path=
"|FSharp.Editor|"
/>
</Assets>
<Prerequisites>
<Prerequisite
Id=
"Microsoft.VisualStudio.Component.CoreEditor"
Version=
"[15.0,16.0)"
DisplayName=
"Visual Studio core editor"
/>
</Prerequisites>
</PackageManifest>
\ No newline at end of file
vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
浏览文件 @
032f9c45
...
...
@@ -20,7 +20,6 @@
<NoWarn>
$(NoWarn);75
</NoWarn>
<Tailcalls
Condition=
"'$(CodeCoverage)' != ''"
>
false
</Tailcalls>
<OtherFlags>
$(OtherFlags) --warnon:1182 --subsystemversion:6.00
</OtherFlags>
<VsSdkTargetsDir>
$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK
</VsSdkTargetsDir>
<ImportVSSDKTargets>
true
</ImportVSSDKTargets>
<CreateVsixContainer>
false
</CreateVsixContainer>
<DeployExtension>
false
</DeployExtension>
...
...
@@ -183,7 +182,7 @@
</Reference>
</ItemGroup>
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.targets"
/>
<Import
Project=
"$(VsS
dkTargetsDir
)\Microsoft.VsSDK.targets"
/>
<Import
Project=
"$(VsS
DKInstall
)\Microsoft.VsSDK.targets"
/>
<Import
Project=
"$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets"
/>
<Target
Name=
"GatherBinariesToBeSigned"
AfterTargets=
"Localize"
Condition=
"'$(UseGatherBinaries)' == 'true'"
>
<ItemGroup>
...
...
vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
浏览文件 @
032f9c45
...
...
@@ -26,7 +26,6 @@
<DefineConstants>
$(DefineConstants);FSHARP_CORE_4_5
</DefineConstants>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<VsSdkTargetsDir>
$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK
</VsSdkTargetsDir>
<ImportVSSDKTargets>
true
</ImportVSSDKTargets>
<CreateVsixContainer>
false
</CreateVsixContainer>
<DeployExtension>
false
</DeployExtension>
...
...
@@ -171,8 +170,8 @@
</ItemGroup>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<Import
Project=
"$(VsSdkTargetsDir)\Microsoft.VsSDK.targets"
/>
<Import
Project=
"$(FSharpSourcesRoot)\Microbuild.Settings.targets"
/>
<Import
Project=
"$(VsSDKInstall)\Microsoft.VsSDK.targets"
/>
<Target
Name=
"GatherBinariesToBeSigned"
AfterTargets=
"Localize"
Condition=
"'$(UseGatherBinaries)' == 'true'"
>
<ItemGroup>
...
...
vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
浏览文件 @
032f9c45
...
...
@@ -6,7 +6,6 @@
<ProjectLanguage>
FSharp
</ProjectLanguage>
<SIGN_WITH_MSFT_KEY>
true
</SIGN_WITH_MSFT_KEY>
<TargetFrameworkVersion>
v4.6
</TargetFrameworkVersion>
<VsSdkTargetsDir>
$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK
</VsSdkTargetsDir>
<ImportVSSDKTargets>
true
</ImportVSSDKTargets>
<CreateVsixContainer>
false
</CreateVsixContainer>
<DeployExtension>
false
</DeployExtension>
...
...
@@ -31,7 +30,7 @@
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.settings.targets"
/>
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.targets"
/>
<Import
Project=
"$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets"
/>
<Import
Project=
"$(VsS
dkTargetsDir
)\Microsoft.VsSDK.targets"
/>
<Import
Project=
"$(VsS
DKInstall
)\Microsoft.VsSDK.targets"
/>
<Target
Name=
"GatherBinariesToBeSigned"
AfterTargets=
"Localize"
Condition=
"'$(UseGatherBinaries)' == 'true'"
>
<ItemGroup>
<BinariesToBeSigned
Include=
"$(OutDir)$(AssemblyName).dll"
/>
...
...
vsintegration/src/FSharp.ProjectSystem.Base/Project/ProjectSystem.Base.csproj
浏览文件 @
032f9c45
...
...
@@ -25,7 +25,6 @@
<DefineConstants>
$(DefineConstants);FSHARP_CORE_4_5
</DefineConstants>
<DefineConstants>
$(DefineConstants);FX_PREFERRED_UI_LANG
</DefineConstants>
<TargetFrameworkProfile></TargetFrameworkProfile>
<VsSdkTargetsDir>
$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK
</VsSdkTargetsDir>
<ImportVSSDKTargets>
true
</ImportVSSDKTargets>
<CreateVsixContainer>
false
</CreateVsixContainer>
<DeployExtension>
false
</DeployExtension>
...
...
@@ -226,7 +225,7 @@
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
/>
<Import
Project=
"$(FSharpSourcesRoot)\Microbuild.Settings.targets"
/>
<Import
Project=
"$(VsS
dkTargetsDir
)\Microsoft.VsSDK.targets"
/>
<Import
Project=
"$(VsS
DKInstall
)\Microsoft.VsSDK.targets"
/>
<Target
Name=
"GatherBinariesToBeSigned"
AfterTargets=
"Localize"
Condition=
"'$(UseGatherBinaries)' == 'true'"
>
<ItemGroup>
...
...
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
浏览文件 @
032f9c45
...
...
@@ -5,7 +5,6 @@
<FSharpSourcesRoot>
$(MSBuildProjectDirectory)\..\..\..\src
</FSharpSourcesRoot>
<ProjectLanguage>
FSharp
</ProjectLanguage>
<SIGN_WITH_MSFT_KEY>
true
</SIGN_WITH_MSFT_KEY>
<VsSdkTargetsDir>
$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK
</VsSdkTargetsDir>
<MinimumVisualStudioVersion
Condition=
"'$(MinimumVisualStudioVersion)' == ''"
>
11
</MinimumVisualStudioVersion>
</PropertyGroup>
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.settings.targets"
/>
...
...
@@ -163,7 +162,7 @@
</ItemGroup>
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.targets"
/>
<Import
Project=
"$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets"
/>
<Import
Project=
"$(VsS
dkTargetsDir
)\Microsoft.VsSDK.targets"
/>
<Import
Project=
"$(VsS
DKInstall
)\Microsoft.VsSDK.targets"
/>
<PropertyGroup>
<BuildingProject>
true
</BuildingProject>
<BuildDependsOn>
VSCTCompile;CopyCtoFile;$(BuildDependsOn)
</BuildDependsOn>
...
...
vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
浏览文件 @
032f9c45
...
...
@@ -36,7 +36,6 @@
<DefineConstants>
$(DefineConstants),FSHARP_CORE_4_5=True
</DefineConstants>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<VsSdkTargetsDir>
$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK
</VsSdkTargetsDir>
<ImportVSSDKTargets>
true
</ImportVSSDKTargets>
<CreateVsixContainer>
false
</CreateVsixContainer>
<DeployExtension>
false
</DeployExtension>
...
...
@@ -320,7 +319,7 @@
</PropertyGroup>
<Import
Project=
"$(FSharpSourcesRoot)\Microbuild.Settings.targets"
/>
<Import
Project=
"$(VsS
dkTargetsDir
)\Microsoft.VsSDK.targets"
/>
<Import
Project=
"$(VsS
DKInstall
)\Microsoft.VsSDK.targets"
/>
<Target
Name=
"GatherBinariesToBeSigned"
AfterTargets=
"Localize"
Condition=
"'$(UseGatherBinaries)' == 'true'"
>
<ItemGroup>
...
...
vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
浏览文件 @
032f9c45
...
...
@@ -20,7 +20,6 @@
<TargetType>
LIBRARY
</TargetType>
<NoWarn>
$(NoWarn);47;75
</NoWarn>
<OtherFlags>
$(OtherFlags) --subsystemversion:6.00
</OtherFlags>
<VsSdkTargetsDir>
$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\VSSDK
</VsSdkTargetsDir>
<ImportVSSDKTargets>
true
</ImportVSSDKTargets>
<CreateVsixContainer>
false
</CreateVsixContainer>
<DeployExtension>
false
</DeployExtension>
...
...
@@ -147,7 +146,7 @@
</ItemGroup>
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.targets"
/>
<Import
Project=
"$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets"
/>
<Import
Project=
"$(VsS
dkTargetsDir
)\Microsoft.VsSDK.targets"
/>
<Import
Project=
"$(VsS
DKInstall
)\Microsoft.VsSDK.targets"
/>
<Target
Name=
"GatherBinariesToBeSigned"
AfterTargets=
"Localize"
Condition=
"'$(UseGatherBinaries)' == 'true'"
>
<ItemGroup>
<BinariesToBeSigned
Include=
"$(OutDir)$(AssemblyName).dll"
/>
...
...
vsintegration/src/fsharp.tools.targets
浏览文件 @
032f9c45
...
...
@@ -6,6 +6,6 @@
<Import
Project=
"..\..\src\FSharpSource.Settings.targets"
Condition=
"Exists('..\..\src\FSharpSource.Settings.targets') And '$(DevDivBuild)' != 'true' "
/>
<Import
Project=
"$(MSBuildToolsPath)\Microsoft.CSharp.targets"
Condition=
"'$(DevDivBuild)' == ''"
/>
<Import
Project=
"$(VS
ToolsPath)\VSSDK
\Microsoft.VsSDK.targets"
Condition=
"'$(VSToolsPath)' != ''"
/>
<Import
Project=
"$(VS
SDKInstall)
\Microsoft.VsSDK.targets"
Condition=
"'$(VSToolsPath)' != ''"
/>
</Project>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录