Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
bingbingbingbing
mono
提交
9667b4ef
M
mono
项目概览
bingbingbingbing
/
mono
与 Fork 源项目一致
从无法访问的项目Fork
通知
35
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
mono
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9667b4ef
编写于
5月 04, 2017
作者:
A
Alexander Köplinger
提交者:
GitHub
5月 04, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[bcl] Add .NET 4.7 reference assemblies (#4791)
上级
49bb738e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
17 addition
and
1 deletion
+17
-1
external/binary-reference-assemblies
external/binary-reference-assemblies
+1
-1
mcs/class/reference-assemblies/Makefile
mcs/class/reference-assemblies/Makefile
+9
-0
mcs/mcs/ikvm.cs
mcs/mcs/ikvm.cs
+1
-0
mcs/tools/xbuild/Makefile
mcs/tools/xbuild/Makefile
+3
-0
mcs/tools/xbuild/frameworks/net_4.7.xml
mcs/tools/xbuild/frameworks/net_4.7.xml
+3
-0
未找到文件。
binary-reference-assemblies
@
142cbeb6
比较
febc100f
...
142cbeb6
Subproject commit
febc100f0313f0dc9d75dd1bcea45e87134b5b55
Subproject commit
142cbeb62ffabf1dd9c1414d8dd76f93bcbed0c2
mcs/class/reference-assemblies/Makefile
浏览文件 @
9667b4ef
...
...
@@ -19,12 +19,14 @@ install-local:
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.6-api
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.6.1-api
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.6.2-api
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.7-api
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.5-api/Facades
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.5.1-api/Facades
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.5.2-api/Facades
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.6-api/Facades
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.6.1-api/Facades
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.6.2-api/Facades
$(MKINSTALLDIRS)
$(PROFILE_DIR)
/4.7-api/Facades
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v2.0/*.dll
$(PROFILE_DIR)/2.0-api
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v3.5/*.dll
$(PROFILE_DIR)/3.5-api
...
...
@@ -35,12 +37,14 @@ install-local:
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.6/*.dll
$(PROFILE_DIR)/4.6-api
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.6.1/*.dll
$(PROFILE_DIR)/4.6.1-api
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.6.2/*.dll
$(PROFILE_DIR)/4.6.2-api
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.7/*.dll
$(PROFILE_DIR)/4.7-api
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.5/Facades/*.dll
$(PROFILE_DIR)/4.5-api/Facades
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.5.1/Facades/*.dll
$(PROFILE_DIR)/4.5.1-api/Facades
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.5.2/Facades/*.dll
$(PROFILE_DIR)/4.5.2-api/Facades
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.6/Facades/*.dll
$(PROFILE_DIR)/4.6-api/Facades
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.6.1/Facades/*.dll
$(PROFILE_DIR)/4.6.1-api/Facades
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.6.2/Facades/*.dll
$(PROFILE_DIR)/4.6.2-api/Facades
$(INSTALL_LIB)
../../../external/binary-reference-assemblies/v4.7/Facades/*.dll
$(PROFILE_DIR)/4.7-api/Facades
# Unfortunately, a few programs (most notably NUnit and FSharp) have hardcoded checks for <prefix>/lib/mono/4.0/mscorlib.dll or Mono.Posix.dll,
# so we need to place something there or those tools break. We decided to symlink to the reference assembly for now.
...
...
@@ -50,12 +54,14 @@ install-local:
ln
-sf
../4.0-api/Mono.Posix.dll
$(PROFILE_DIR)/4.0/Mono.Posix.dll
DISTFILES
=
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.7/Facades/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.6.2/Facades/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.6.1/Facades/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.6/Facades/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.5.2/Facades/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.5.1/Facades/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.5/Facades/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.7/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.6.2/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.6.1/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v4.6/
*
.dll
)
\
...
...
@@ -65,12 +71,14 @@ DISTFILES = \
$(
wildcard
../../../external/binary-reference-assemblies/v4.0/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v3.5/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/v2.0/
*
.dll
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.7/Facades/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.6.2/Facades/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.6.1/Facades/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.6/Facades/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.5.2/Facades/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.5.1/Facades/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.5/Facades/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.7/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.6.2/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.6.1/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.6/
*
.cs
)
\
...
...
@@ -80,6 +88,7 @@ DISTFILES = \
$(
wildcard
../../../external/binary-reference-assemblies/src/v4.0/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v3.5/
*
.cs
)
\
$(
wildcard
../../../external/binary-reference-assemblies/src/v2.0/
*
.cs
)
\
../../../external/binary-reference-assemblies/v4.7/Makefile
\
../../../external/binary-reference-assemblies/v4.6.2/Makefile
\
../../../external/binary-reference-assemblies/v4.6.1/Makefile
\
../../../external/binary-reference-assemblies/v4.6/Makefile
\
...
...
mcs/mcs/ikvm.cs
浏览文件 @
9667b4ef
...
...
@@ -254,6 +254,7 @@ namespace Mono.CSharp
sdk_directory
.
Add
(
"4.6"
,
new
string
[]
{
"4.6-api"
,
"v4.0.30319"
});
sdk_directory
.
Add
(
"4.6.1"
,
new
string
[]
{
"4.6.1-api"
,
"v4.0.30319"
});
sdk_directory
.
Add
(
"4.6.2"
,
new
string
[]
{
"4.6.2-api"
,
"v4.0.30319"
});
sdk_directory
.
Add
(
"4.7"
,
new
string
[]
{
"4.7-api"
,
"v4.0.30319"
});
sdk_directory
.
Add
(
"4.x"
,
new
string
[]
{
"4.5"
,
"net_4_x"
,
"v4.0.30319"
});
}
...
...
mcs/tools/xbuild/Makefile
浏览文件 @
9667b4ef
...
...
@@ -79,6 +79,8 @@ install-frameworks:
$(INSTALL_DATA)
frameworks/net_4.6.1.xml
$(DESTDIR)$(NETFRAMEWORK_DIR)
/v4.6.1/RedistList/FrameworkList.xml
$(MKINSTALLDIRS)
$(DESTDIR)$(NETFRAMEWORK_DIR)
/v4.6.2/RedistList
$(INSTALL_DATA)
frameworks/net_4.6.2.xml
$(DESTDIR)$(NETFRAMEWORK_DIR)
/v4.6.2/RedistList/FrameworkList.xml
$(MKINSTALLDIRS)
$(DESTDIR)$(NETFRAMEWORK_DIR)
/v4.7/RedistList
$(INSTALL_DATA)
frameworks/net_4.7.xml
$(DESTDIR)$(NETFRAMEWORK_DIR)
/v4.7/RedistList/FrameworkList.xml
install-pcl-targets
:
$(MKINSTALLDIRS)
$(DESTDIR)$(PORTABLE_TARGETS_DIR)
...
...
@@ -183,6 +185,7 @@ EXTRA_DISTFILES = \
frameworks/net_4.6.xml
\
frameworks/net_4.6.1.xml
\
frameworks/net_4.6.2.xml
\
frameworks/net_4.7.xml
\
targets/Microsoft.WebApplication.targets
\
$(NUGET_BUILDTASKS_REPO_DIR)
/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportBefore.props
\
$(NUGET_BUILDTASKS_REPO_DIR)
/src/Microsoft.NuGet.Build.Tasks/ImportBeforeAfter/Microsoft.NuGet.ImportAfter.targets
\
...
...
mcs/tools/xbuild/frameworks/net_4.7.xml
0 → 100644
浏览文件 @
9667b4ef
<?xml version="1.0" encoding="utf-8"?>
<FileList
Name=
".NET Framework 4.7"
TargetFrameworkDirectory=
"..\..\..\..\4.7-api"
>
</FileList>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录