Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
cd0d9f24
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,发现更多精彩内容 >>
未验证
提交
cd0d9f24
编写于
11月 30, 2020
作者:
K
Kevin Ransom (msft)
提交者:
GitHub
11月 30, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix net sdk references discovery (#10569)
* Fix net sdk references discovery * Do numbers properly * version filter
上级
0edf3245
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
7 deletion
+17
-7
src/fsharp/CompilerConfig.fs
src/fsharp/CompilerConfig.fs
+0
-2
src/fsharp/DotNetFrameworkDependencies.fs
src/fsharp/DotNetFrameworkDependencies.fs
+17
-5
未找到文件。
src/fsharp/CompilerConfig.fs
浏览文件 @
cd0d9f24
...
...
@@ -877,8 +877,6 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
#
endif
None
,
data
.
legacyReferenceResolver
.
HighestInstalledNetFrameworkVersion
()
let
systemAssemblies
=
systemAssemblies
member
x
.
primaryAssembly
=
data
.
primaryAssembly
member
x
.
noFeedback
=
data
.
noFeedback
member
x
.
stackReserveSize
=
data
.
stackReserveSize
...
...
src/fsharp/DotNetFrameworkDependencies.fs
浏览文件 @
cd0d9f24
...
...
@@ -29,7 +29,7 @@ module internal FSharp.Compiler.DotNetFrameworkDependencies
location
let
inline
ifEmptyUse
alternative
filename
=
if
String
.
IsNullOrWhiteSpace
filename
then
alternative
else
filename
let
getFSharpCoreLibraryName
=
"FSharp.Core"
let
getFsiLibraryName
=
"FSharp.Compiler.Interactive.Settings"
let
getDefaultFSharpCoreLocation
=
Path
.
Combine
(
fSharpCompilerLocation
,
getFSharpCoreLibraryName
+
".dll"
)
...
...
@@ -62,15 +62,27 @@ module internal FSharp.Compiler.DotNetFrameworkDependencies
// packs\Microsoft.NETCore.App.Ref\sdk-version\netcoreappn.n
// we will rely on the sdk-version match on the two paths to ensure that we get the product that ships with the
// version of the runtime we are executing on
// Use the reference assemblies for the highest netcoreapp tfm that we find in that location.
// Use the reference assemblies for the highest netcoreapp tfm that we find in that location that is
// lower than or equal to the implementation version.
let
zeroVersion
=
Version
(
"0.0.0.0"
)
let
version
,
frameworkRefsPackDirectoryRoot
=
try
let
version
=
DirectoryInfo
(
implementationAssemblyDir
).
Name
let
computeVersion
version
=
match
Version
.
TryParse
(
version
)
with
|
true
,
v
->
v
|
false
,
_
->
zeroVersion
let
version
=
computeVersion
(
DirectoryInfo
(
implementationAssemblyDir
).
Name
)
let
microsoftNETCoreAppRef
=
Path
.
Combine
(
implementationAssemblyDir
,
"../../../packs/Microsoft.NETCore.App.Ref"
)
if
Directory
.
Exists
(
microsoftNETCoreAppRef
)
then
Some
version
,
Some
microsoftNETCoreAppRef
let
directory
=
DirectoryInfo
(
microsoftNETCoreAppRef
).
GetDirectories
()
|>
Array
.
map
(
fun
di
->
computeVersion
di
.
Name
)
|>
Array
.
sort
|>
Array
.
filter
(
fun
v
->
v
<=
version
)
|>
Array
.
last
Some
(
directory
.
ToString
()
),
Some
microsoftNETCoreAppRef
else
Some
version
,
None
None
,
None
with
|
_
->
None
,
None
// Tries to figure out the tfm for the compiler instance.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录