[bcl] Fix more assembly identity mismatches (mono#6870)

akoeplinger · web-flow · commit c84e6c81a2b9 · 2018-02-08T22:22:37.000+01:00
As a follow up to mono#6848 I checked all the assemblies and found some more identity mismatches with .NET
diff --git a/external/api-snapshot b/external/api-snapshot
@@ -1 +1 @@
-Subproject commit 90fca15144b4e6bba4813765a428eec4d16238ff
+Subproject commit fc7d7ec169976e9a7725e2ceafa0c141c5606189
diff --git a/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile b/mcs/class/Facades/System.IO.Compression.ZipFile/Makefile
@@ -9,7 +9,7 @@ LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
 
 LIBRARY = System.IO.Compression.ZipFile.dll
 
-KEYFILE = ../../msfinal.pub
+KEYFILE = ../../ecma.pub
 SIGN_FLAGS = /delaysign /nowarn:1616,1699
 LIB_REFS = System System.IO.Compression.FileSystem
 LIB_MCS_FLAGS = $(SIGN_FLAGS)
diff --git a/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs b/mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs
@@ -33,7 +33,7 @@
 using System.Runtime.InteropServices;
 using System.Resources;
 
-[assembly: AssemblyVersion (Consts.VsVersion)]
+[assembly: AssemblyVersion ("10.0.0.0")]
 
 /* TODO COMPLETE INFORMATION
 
diff --git a/mcs/class/System.Dynamic/Makefile b/mcs/class/System.Dynamic/Makefile
@@ -5,7 +5,7 @@ include ../../build/rules.make
 LIBRARY = System.Dynamic.dll
 
 LIB_REFS = System.Core System
-KEYFILE = ../ecma.pub
+KEYFILE = ../msfinal.pub
 LIB_MCS_FLAGS = -unsafe -d:CODEPLEX_40 -nowarn:414,169
 
 # This is a .NET 4.0+ only assembly
diff --git a/mcs/class/System.Reflection.Context/Makefile b/mcs/class/System.Reflection.Context/Makefile
@@ -4,7 +4,7 @@ include ../../build/rules.make
 
 LIBRARY = System.Reflection.Context.dll
 LIB_REFS = System
-KEYFILE = ../msfinal.pub
+KEYFILE = ../ecma.pub
 LIB_MCS_FLAGS =
 
 NO_TEST = yes
