Skip to content

Commit 7a587d7

Browse files
akoeplingerakoeplinger
committed
Add .NET 4.8 reference assemblies (#16912)
Brings in mono/reference-assemblies#20 (cherry picked from commit f6a080b)
1 parent 35e454a commit 7a587d7

File tree

5 files changed

+19
-2
lines changed

5 files changed

+19
-2
lines changed

‎external/binary-reference-assemblies‎

Submodule binary-reference-assemblies updated 372 files

‎mcs/class/reference-assemblies/Makefile‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ install-local:
2222
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7-api
2323
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.1-api
2424
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.2-api
25+
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.8-api
2526
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.5-api/Facades
2627
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.1-api/Facades
2728
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.5.2-api/Facades
@@ -31,6 +32,7 @@ install-local:
3132
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7-api/Facades
3233
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.1-api/Facades
3334
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.7.2-api/Facades
35+
$(MKINSTALLDIRS) $(PROFILE_DIR)/4.8-api/Facades
3436

3537
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v2.0/*.dll $(PROFILE_DIR)/2.0-api
3638
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v3.5/*.dll $(PROFILE_DIR)/3.5-api
@@ -44,6 +46,7 @@ install-local:
4446
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7/*.dll $(PROFILE_DIR)/4.7-api
4547
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7.1/*.dll $(PROFILE_DIR)/4.7.1-api
4648
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7.2/*.dll $(PROFILE_DIR)/4.7.2-api
49+
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.8/*.dll $(PROFILE_DIR)/4.8-api
4750

4851
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5/Facades/*.dll $(PROFILE_DIR)/4.5-api/Facades
4952
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.5.1/Facades/*.dll $(PROFILE_DIR)/4.5.1-api/Facades
@@ -54,6 +57,7 @@ install-local:
5457
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7/Facades/*.dll $(PROFILE_DIR)/4.7-api/Facades
5558
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7.1/Facades/*.dll $(PROFILE_DIR)/4.7.1-api/Facades
5659
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.7.2/Facades/*.dll $(PROFILE_DIR)/4.7.2-api/Facades
60+
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/v4.8/Facades/*.dll $(PROFILE_DIR)/4.8-api/Facades
5761

5862
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/2.0-api
5963
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.0-api
@@ -65,9 +69,11 @@ install-local:
6569
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.6.2-api
6670
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.7-api
6771
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.7.1-api
68-
rm -f $(PROFILE_DIR)/4.7.1-api/ICSharpCode.SharpZipLib.dll
6972
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.7.2-api
73+
$(INSTALL_LIB) ../../../external/binary-reference-assemblies/mono/*.dll $(PROFILE_DIR)/4.8-api
74+
rm -f $(PROFILE_DIR)/4.7.1-api/ICSharpCode.SharpZipLib.dll
7075
rm -f $(PROFILE_DIR)/4.7.2-api/ICSharpCode.SharpZipLib.dll
76+
rm -f $(PROFILE_DIR)/4.8-api/ICSharpCode.SharpZipLib.dll
7177

7278
# Unfortunately, a few programs (most notably NUnit and FSharp) have hardcoded checks for <prefix>/lib/mono/4.0/mscorlib.dll or Mono.Posix.dll,
7379
# so we need to place something there or those tools break. We decided to symlink to the reference assembly for now.
@@ -77,6 +83,7 @@ install-local:
7783
ln -sf ../4.0-api/Mono.Posix.dll $(PROFILE_DIR)/4.0/Mono.Posix.dll
7884

7985
DISTFILES = \
86+
$(wildcard ../../../external/binary-reference-assemblies/v4.8/Facades/*.dll) \
8087
$(wildcard ../../../external/binary-reference-assemblies/v4.7.2/Facades/*.dll) \
8188
$(wildcard ../../../external/binary-reference-assemblies/v4.7.1/Facades/*.dll) \
8289
$(wildcard ../../../external/binary-reference-assemblies/v4.7/Facades/*.dll) \
@@ -86,6 +93,7 @@ DISTFILES = \
8693
$(wildcard ../../../external/binary-reference-assemblies/v4.5.2/Facades/*.dll) \
8794
$(wildcard ../../../external/binary-reference-assemblies/v4.5.1/Facades/*.dll) \
8895
$(wildcard ../../../external/binary-reference-assemblies/v4.5/Facades/*.dll) \
96+
$(wildcard ../../../external/binary-reference-assemblies/v4.8/*.dll) \
8997
$(wildcard ../../../external/binary-reference-assemblies/v4.7.2/*.dll) \
9098
$(wildcard ../../../external/binary-reference-assemblies/v4.7.1/*.dll) \
9199
$(wildcard ../../../external/binary-reference-assemblies/v4.7/*.dll) \
@@ -99,6 +107,7 @@ DISTFILES = \
99107
$(wildcard ../../../external/binary-reference-assemblies/v3.5/*.dll) \
100108
$(wildcard ../../../external/binary-reference-assemblies/v2.0/*.dll) \
101109
$(wildcard ../../../external/binary-reference-assemblies/mono/*.dll) \
110+
$(wildcard ../../../external/binary-reference-assemblies/src/v4.8/Facades/*.cs) \
102111
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7.2/Facades/*.cs) \
103112
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7.1/Facades/*.cs) \
104113
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7/Facades/*.cs) \
@@ -108,6 +117,7 @@ DISTFILES = \
108117
$(wildcard ../../../external/binary-reference-assemblies/src/v4.5.2/Facades/*.cs) \
109118
$(wildcard ../../../external/binary-reference-assemblies/src/v4.5.1/Facades/*.cs) \
110119
$(wildcard ../../../external/binary-reference-assemblies/src/v4.5/Facades/*.cs) \
120+
$(wildcard ../../../external/binary-reference-assemblies/src/v4.8/*.cs) \
111121
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7.2/*.cs) \
112122
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7.1/*.cs) \
113123
$(wildcard ../../../external/binary-reference-assemblies/src/v4.7/*.cs) \
@@ -121,6 +131,7 @@ DISTFILES = \
121131
$(wildcard ../../../external/binary-reference-assemblies/src/v3.5/*.cs) \
122132
$(wildcard ../../../external/binary-reference-assemblies/src/v2.0/*.cs) \
123133
$(wildcard ../../../external/binary-reference-assemblies/src/mono/*.cs) \
134+
../../../external/binary-reference-assemblies/v4.8/Makefile \
124135
../../../external/binary-reference-assemblies/v4.7.2/Makefile \
125136
../../../external/binary-reference-assemblies/v4.7.1/Makefile \
126137
../../../external/binary-reference-assemblies/v4.7/Makefile \

‎mcs/mcs/ikvm.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,7 @@ static StaticLoader ()
257257
sdk_directory.Add ("4.7", new string [] { "4.7-api", "v4.0.30319" });
258258
sdk_directory.Add ("4.7.1", new string [] { "4.7.1-api", "v4.0.30319" });
259259
sdk_directory.Add ("4.7.2", new string [] { "4.7.2-api", "v4.0.30319" });
260+
sdk_directory.Add ("4.8", new string [] { "4.8-api", "v4.0.30319" });
260261
sdk_directory.Add ("4.x", new string [] { "4.5", "net_4_x", "v4.0.30319" });
261262
}
262263

‎mcs/tools/xbuild/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ install-frameworks:
8383
$(INSTALL_DATA) frameworks/net_4.7.1.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7.1/RedistList/FrameworkList.xml
8484
$(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7.2/RedistList
8585
$(INSTALL_DATA) frameworks/net_4.7.2.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.7.2/RedistList/FrameworkList.xml
86+
$(MKINSTALLDIRS) $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.8/RedistList
87+
$(INSTALL_DATA) frameworks/net_4.8.xml $(DESTDIR)$(NETFRAMEWORK_DIR)/v4.8/RedistList/FrameworkList.xml
8688

8789
install-pcl-targets:
8890
$(MKINSTALLDIRS) $(DESTDIR)$(PORTABLE_TARGETS_DIR)

‎mcs/tools/xbuild/frameworks/net_4.8.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<FileList Name=".NET Framework 4.8" TargetFrameworkDirectory="..\..\..\..\4.8-api">
3+
</FileList>

0 commit comments

Comments
 (0)