From a7b4c9e3fdc9aaa9f2d2b74f83294ac1f420a48c Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 24 Jan 2020 17:08:13 -0800 Subject: [PATCH 1/3] Allow the System.Runtime.CompilerServices.Unsafe and the runtime Microsoft.CSharp assembly versions to match the defaults. --- src/libraries/Microsoft.CSharp/Directory.Build.props | 1 - .../System.Runtime.CompilerServices.Unsafe/Directory.Build.props | 1 - 2 files changed, 2 deletions(-) diff --git a/src/libraries/Microsoft.CSharp/Directory.Build.props b/src/libraries/Microsoft.CSharp/Directory.Build.props index a37afe183e322..9155a7a076498 100644 --- a/src/libraries/Microsoft.CSharp/Directory.Build.props +++ b/src/libraries/Microsoft.CSharp/Directory.Build.props @@ -1,7 +1,6 @@ - 4.0.4.0 Microsoft true diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props b/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props index ac021c8da3d65..5f6e490332e15 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props @@ -1,7 +1,6 @@  - 4.0.5.0 Microsoft true From 3b687dbc86eb95350190876952e4b1b7a32703bd Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 27 Jan 2020 12:57:51 -0800 Subject: [PATCH 2/3] Update System.Runtime.CompilerServices.Unsafe versions in IL since the assembly version isn't injected by the IL SDK during build. --- .../src/System.Runtime.CompilerServices.Unsafe.il | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il index ced09b67754c2..75fa0b4d0c7f2 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il @@ -13,8 +13,8 @@ // --- The following custom attribute is added automatically, do not uncomment ------- // .custom instance void [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 ) - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 34 2E 30 2E 30 2E 30 00 00 ) // ...4.0.0.0.. - .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 07 34 2E 30 2E 30 2E 30 00 00 ) // ...4.0.0.0.. + .custom instance void [System.Runtime]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 ) // ...5.0.0.0.. + .custom instance void [System.Runtime]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 ) // ...5.0.0.0.. .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyTitleAttribute::.ctor(string) = ( 01 00 26 53 79 73 74 65 6D 2E 52 75 6E 74 69 6D // ..&System.Runtim 65 2E 43 6F 6D 70 69 6C 65 72 53 65 72 76 69 63 // e.CompilerServic 65 73 2E 55 6E 73 61 66 65 00 00 ) // es.Unsafe.. @@ -41,7 +41,7 @@ 01 00 00 00 00 ) // false .hash algorithm 0x00008004 - .ver 4:0:5:0 + .ver 5:0:0:0 } .module System.Runtime.CompilerServices.Unsafe.dll // MVID: {1E97D84A-565B-49C5-B60A-F31A1A4ACE13} From d3a9e0b63472bb26de8c16c7c7e02a8eba7db780 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 27 Jan 2020 13:42:42 -0800 Subject: [PATCH 3/3] Fix assembly ref in attributes. --- .../src/System.Runtime.CompilerServices.Unsafe.il | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il index 75fa0b4d0c7f2..52f2002a128ef 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.il @@ -13,8 +13,8 @@ // --- The following custom attribute is added automatically, do not uncomment ------- // .custom instance void [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute::.ctor(valuetype [CORE_ASSEMBLY]System.Diagnostics.DebuggableAttribute/DebuggingModes) = ( 01 00 02 00 00 00 00 00 ) - .custom instance void [System.Runtime]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 ) // ...5.0.0.0.. - .custom instance void [System.Runtime]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 ) // ...5.0.0.0.. + .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyFileVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 ) // ...5.0.0.0.. + .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyInformationalVersionAttribute::.ctor(string) = ( 01 00 07 35 2E 30 2E 30 2E 30 00 00 ) // ...5.0.0.0.. .custom instance void [CORE_ASSEMBLY]System.Reflection.AssemblyTitleAttribute::.ctor(string) = ( 01 00 26 53 79 73 74 65 6D 2E 52 75 6E 74 69 6D // ..&System.Runtim 65 2E 43 6F 6D 70 69 6C 65 72 53 65 72 76 69 63 // e.CompilerServic 65 73 2E 55 6E 73 61 66 65 00 00 ) // es.Unsafe..