Skip to content

Commit

Permalink
[bcl] Fix more assembly identity mismatches (mono#6870)
Browse files Browse the repository at this point in the history
As a follow up to mono#6848 I checked
all the assemblies and found some more identity mismatches with .NET
  • Loading branch information
akoeplinger committed Feb 8, 2018
1 parent 9adf4bd commit c84e6c8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion external/api-snapshot
Submodule api-snapshot updated 1 files
+1 −1 profiles/net_4_x/Microsoft.VisualC.cs
2 changes: 1 addition & 1 deletion mcs/class/Facades/System.IO.Compression.ZipFile/Makefile
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion mcs/class/Microsoft.VisualC/Assembly/AssemblyInfo.cs
Expand Up @@ -33,7 +33,7 @@
using System.Runtime.InteropServices;
using System.Resources;

[assembly: AssemblyVersion (Consts.VsVersion)]
[assembly: AssemblyVersion ("10.0.0.0")]

/* TODO COMPLETE INFORMATION
Expand Down
2 changes: 1 addition & 1 deletion mcs/class/System.Dynamic/Makefile
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mcs/class/System.Reflection.Context/Makefile
Expand Up @@ -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
Expand Down

0 comments on commit c84e6c8

Please sign in to comment.