Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
8310819d
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,发现更多精彩内容 >>
提交
8310819d
编写于
11月 28, 2016
作者:
G
Gaston Cababie
提交者:
Don Syme
11月 28, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added references to frameworks 4.6.1 and 4.6.2 (#1868)
上级
ecb43074
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
12 addition
and
4 deletion
+12
-4
build.cmd
build.cmd
+3
-1
tests/fsharp/test-framework.fs
tests/fsharp/test-framework.fs
+3
-1
tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd
tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd
+3
-1
vsintegration/update-vsintegration.cmd
vsintegration/update-vsintegration.cmd
+3
-1
未找到文件。
build.cmd
浏览文件 @
8310819d
...
...
@@ -662,7 +662,9 @@ if "%OSARCH%"=="AMD64" set SYSWOW64=SysWoW64
if
not
"
%OSARCH%
"
==
"x86"
set
REGEXE32BIT
=
%WINDIR%
\syswow64\reg.exe
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.2\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
...
...
tests/fsharp/test-framework.fs
浏览文件 @
8310819d
...
...
@@ -154,7 +154,9 @@ module WindowsPlatform =
CORDIR <- CORDIR.Replace("
Framework
", "
Framework64
")
let allSDK =
[ regQueryREG_SOFTWARE @"
Software
\
Microsoft
\
Microsoft
SDKs
\
NETFXSDK
\
4
.
6
\
WinSDK
-
NetFx40Tools
" "
InstallationFolder
"
[ regQueryREG_SOFTWARE @"
Software
\
WOW6432Node
\
Microsoft
\
Microsoft
SDKs
\
NETFXSDK
\
4
.
6
.
2
\
WinSDK
-
NetFx40Tools
" "
InstallationFolder
"
regQueryREG_SOFTWARE @"
Software
\
WOW6432Node
\
Microsoft
\
Microsoft
SDKs
\
NETFXSDK
\
4
.
6
.
1
\
WinSDK
-
NetFx40Tools
" "
InstallationFolder
"
regQueryREG_SOFTWARE @"
Software
\
Microsoft
\
Microsoft
SDKs
\
NETFXSDK
\
4
.
6
\
WinSDK
-
NetFx40Tools
" "
InstallationFolder
"
regQueryREG_SOFTWARE @"
Software
\
Microsoft
\
Microsoft
SDKs
\
Windows
\
v8
.
1
A
\
WinSDK
-
NetFx40Tools
" "
InstallationFolder
"
regQueryREG_SOFTWARE @"
Software
\
Microsoft
\
Microsoft
SDKs
\
Windows
\
v8
.
0
A
\
WinSDK
-
NetFx40Tools
" "
InstallationFolder
"
regQueryREG_SOFTWARE @"
Software
\
Microsoft
\
Microsoft
SDKs
\
Windows
\
v7
.
1
\
WinSDK
-
NetFx40Tools
" "
InstallationFolder
"
...
...
tests/fsharpqa/Source/CodeGen/EmittedIL/CompareIL.cmd
浏览文件 @
8310819d
...
...
@@ -11,7 +11,9 @@ rem
if
exist
"
%WindowsSDK
_ExecutablePath_x86
%
"
set
WINSDKNETFXTOOLS_X86
=
%WindowsSDK
_ExecutablePath_x86
%
if
not
"
%WindowsSDK
_ExecutablePath_x86
%
"
==
""
goto
:havesdk
set
REGEXE32BIT
=
reg.exe
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS_x86
=
%%B
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.2\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS_x86
=
%%B
if
"
%WINSDKNETFXTOOLS
_x86
%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS_x86
=
%%B
if
"
%WINSDKNETFXTOOLS
_x86
%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS_x86
=
%%B
if
"
%WINSDKNETFXTOOLS
_x86
%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS_x86
=
%%B
if
"
%WINSDKNETFXTOOLS
_x86
%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS_x86
=
%%B
if
"
%WINSDKNETFXTOOLS
_x86
%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS_x86
=
%%B
...
...
vsintegration/update-vsintegration.cmd
浏览文件 @
8310819d
...
...
@@ -26,7 +26,9 @@ if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" set X86_PROGRAMFILES=%ProgramFiles(x86
set
REGEXE32BIT
=
reg.exe
if
not
"
%OSARCH%
"
==
"x86"
set
REGEXE32BIT
=
%WINDIR%
\syswow64\reg.exe
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.2\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\WOW6432Node\Microsoft\Microsoft SDKs\NETFXSDK\4.6.1\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\NETFXSDK\4.6\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.1A\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v8.0A\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
if
"
%WINSDKNETFXTOOLS%
"
==
""
FOR
/F
"tokens=2* delims= "
%%A
IN
(
'
%REGEXE3
2BIT
%
QUERY "HKLM\Software\Microsoft\Microsoft SDKs\Windows\v7.1\WinSDK-NetFx40Tools" /v InstallationFolder'
)
DO
SET
WINSDKNETFXTOOLS
=
%%B
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录