From 95f86ea52a8835af3aeaa35d6443df6b0d6c4886 Mon Sep 17 00:00:00 2001 From: Anirudh Agnihotry Date: Tue, 28 Jan 2020 22:36:54 -0800 Subject: [PATCH 1/6] Dead Ending Microsoft.CSharp Package and Bumping the leftout assembly versions to 5.0.0.0 (#2264) * deadending Microsoft.Csharp Package and bumping the assembly versions * retargeting and clean up * Update Microsoft.CSharp.csproj * fixing the build * reference -> projectreference * adding ignored reference --- .../Microsoft.CSharp/Directory.Build.props | 1 - .../pkg/Microsoft.CSharp.pkgproj | 44 ------------------- .../Microsoft.CSharp/ref/Configurations.props | 2 +- .../ref/Microsoft.CSharp.csproj | 11 +++-- .../Microsoft.CSharp/src/Configurations.props | 3 +- .../src/Microsoft.CSharp.csproj | 3 +- .../Directory.Build.props | 1 - ...em.Runtime.CompilerServices.Unsafe.pkgproj | 2 +- .../System.Runtime.CompilerServices.Unsafe.il | 6 +-- .../packageIndex.json | 7 +-- src/libraries/pkg/descriptions.json | 11 ----- .../netcoreapp5.0/settings.targets | 4 ++ 12 files changed, 23 insertions(+), 72 deletions(-) delete mode 100644 src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj diff --git a/src/libraries/Microsoft.CSharp/Directory.Build.props b/src/libraries/Microsoft.CSharp/Directory.Build.props index a37afe183e3221..9155a7a0764984 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/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj b/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj deleted file mode 100644 index f70d26fff448fe..00000000000000 --- a/src/libraries/Microsoft.CSharp/pkg/Microsoft.CSharp.pkgproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - net461;netcoreapp2.0;$(AllXamarinFrameworks) - - - - - - - true - - - true - - - true - - - - - - - - - true - - - true - - - true - - - true - - - - .NETStandard,Version=v1.0;.NETStandard,Version=v1.1;.NETStandard,Version=v1.2 - - - - \ No newline at end of file diff --git a/src/libraries/Microsoft.CSharp/ref/Configurations.props b/src/libraries/Microsoft.CSharp/ref/Configurations.props index cbdceb9443745a..7ac45c966c4562 100644 --- a/src/libraries/Microsoft.CSharp/ref/Configurations.props +++ b/src/libraries/Microsoft.CSharp/ref/Configurations.props @@ -1,7 +1,7 @@  - netstandard2.0; + $(NetCoreAppCurrent); \ No newline at end of file diff --git a/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj index 1009834ecd49ae..eb45bddc747428 100644 --- a/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj +++ b/src/libraries/Microsoft.CSharp/ref/Microsoft.CSharp.csproj @@ -1,11 +1,14 @@ - - 4.0.0.0 - netstandard2.0-Debug;netstandard2.0-Release + $(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release + + + + + + \ No newline at end of file diff --git a/src/libraries/Microsoft.CSharp/src/Configurations.props b/src/libraries/Microsoft.CSharp/src/Configurations.props index 781348267d404a..7ac45c966c4562 100644 --- a/src/libraries/Microsoft.CSharp/src/Configurations.props +++ b/src/libraries/Microsoft.CSharp/src/Configurations.props @@ -1,8 +1,7 @@  - netstandard2.0; - _$(NetFrameworkCurrent); + $(NetCoreAppCurrent); \ No newline at end of file diff --git a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj index 6faf7bdc579dc9..ea6307a2ca3d97 100644 --- a/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj +++ b/src/libraries/Microsoft.CSharp/src/Microsoft.CSharp.csproj @@ -2,7 +2,7 @@ Microsoft.CSharp Microsoft.CSharp - netstandard2.0-Debug;netstandard2.0-Release + $(NetCoreAppCurrent)-Debug;$(NetCoreAppCurrent)-Release @@ -161,6 +161,7 @@ + diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props b/src/libraries/System.Runtime.CompilerServices.Unsafe/Directory.Build.props index ac021c8da3d65c..5f6e490332e15a 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 diff --git a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj index 11df29a247f2fa..d46b21c27009b8 100644 --- a/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj +++ b/src/libraries/System.Runtime.CompilerServices.Unsafe/pkg/System.Runtime.CompilerServices.Unsafe.pkgproj @@ -3,7 +3,7 @@ - net45;netcoreapp1.0;$(AllXamarinFrameworks) + net45;netcoreapp1.0;netcore50;netcore45;wp8;wpa81;$(AllXamarinFrameworks) 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 ced09b67754c2d..52f2002a128efd 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 [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.. @@ -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} diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index ce2b36ac8bbac2..0a4395bfbcbaac 100644 --- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -83,7 +83,6 @@ "4.5.0", "4.6.0" ], - "BaselineVersion": "5.0.0", "InboxOn": { "netcoreapp2.0": "4.0.3.0", "netcoreapp2.1": "4.0.4.0", @@ -4051,7 +4050,8 @@ "4.5.0", "4.5.1", "4.5.2", - "4.6.0" + "4.6.0", + "4.7.0" ], "BaselineVersion": "5.0.0", "InboxOn": { @@ -4062,7 +4062,8 @@ "4.0.3.0": "4.4.0", "4.0.4.0": "4.5.0", "4.0.4.1": "4.5.2", - "4.0.5.0": "4.6.0" + "4.0.5.0": "4.6.0", + "5.0.0.0": "5.0.0" } }, "System.Runtime.CompilerServices.VisualC": { diff --git a/src/libraries/pkg/descriptions.json b/src/libraries/pkg/descriptions.json index 8cb1e4258dab3f..b612f41f0a573c 100644 --- a/src/libraries/pkg/descriptions.json +++ b/src/libraries/pkg/descriptions.json @@ -14,17 +14,6 @@ "Description": "Provides a portable version of the Microsoft.Cci library", "CommonTypes": [] }, - { - "Name": "Microsoft.CSharp", - "Description": "Provides support for compilation and code generation, including dynamic, using the C# language.", - "CommonTypes": [ - "Microsoft.CSharp.RuntimeBinder.Binder", - "Microsoft.CSharp.RuntimeBinder.RuntimeBinderException", - "Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfo", - "Microsoft.CSharp.RuntimeBinder.CSharpArgumentInfoFlags", - "Microsoft.CSharp.RuntimeBinder.CSharpBinderFlags" - ] - }, { "Name": "Microsoft.Bcl.HashCode", "Description": "Provides the HashCode type for .NET Standard 2.0. This package is not required starting with .NET Standard 2.1 and .NET Core 3.0.", diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets index bc6aa5222f1057..3ba2a5d9ed039f 100644 --- a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets @@ -5,4 +5,8 @@ + + + + \ No newline at end of file From a67cf49c6978f35ee83e322f447167e59b5e845d Mon Sep 17 00:00:00 2001 From: Anipik Date: Mon, 3 Feb 2020 11:12:59 -0800 Subject: [PATCH 2/6] removing package references and making R2rDump bin place to a specifc output directory --- .../ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj | 8 -------- .../ILCompiler.Reflection.ReadyToRun.csproj | 7 +------ src/coreclr/src/tools/r2rdump/R2RDump.csproj | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj index 04b7026bc7bd70..cf0339d5fa07bf 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj @@ -22,14 +22,6 @@ - - - 1.6.0 - - - 4.3.0 - - diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj index 157974d1ab00b4..d25e0c88ee063c 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj @@ -7,18 +7,13 @@ AnyCPU Open true - netstandard2.0 + $(NetCoreAppCurrent) false 8002,NU1701 win-x64;win-x86 $(BinDir) - - - - - diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.csproj b/src/coreclr/src/tools/r2rdump/R2RDump.csproj index 5f4d67190cb899..0cb411ce0ffb5b 100644 --- a/src/coreclr/src/tools/r2rdump/R2RDump.csproj +++ b/src/coreclr/src/tools/r2rdump/R2RDump.csproj @@ -12,7 +12,7 @@ false 8002,NU1701 win-x64;win-x86 - $(BinDir) + $(BinDir)/R2RDump From 2c2e61ae755f42625fd360e74525f82c02ab7ac5 Mon Sep 17 00:00:00 2001 From: Anipik Date: Mon, 3 Feb 2020 11:18:33 -0800 Subject: [PATCH 3/6] remove package reference from R2r dump as well --- src/coreclr/src/tools/r2rdump/R2RDump.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.csproj b/src/coreclr/src/tools/r2rdump/R2RDump.csproj index 0cb411ce0ffb5b..97c2321b57ead1 100644 --- a/src/coreclr/src/tools/r2rdump/R2RDump.csproj +++ b/src/coreclr/src/tools/r2rdump/R2RDump.csproj @@ -22,9 +22,6 @@ 0.2.0-alpha.19174.3 - - 1.6.0 - From 37441d4a9cebeff66cd99bcb3dc17fda06002fa5 Mon Sep 17 00:00:00 2001 From: Anipik Date: Mon, 3 Feb 2020 16:47:33 -0800 Subject: [PATCH 4/6] adding comment and targeting netstandard2.0 --- .../ILCompiler.Reflection.ReadyToRun.csproj | 2 +- .../pkg/test/frameworkSettings/netcoreapp5.0/settings.targets | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj index 45429bfd990368..692dfd06d46fa7 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj @@ -7,7 +7,7 @@ AnyCPU Open true - $(NetCoreAppCurrent) + netstandard2.0 false 8002,NU1701 win-x64;win-x86 diff --git a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets index 66f4d44a858ced..6652c6d907de2e 100644 --- a/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets +++ b/src/libraries/pkg/test/frameworkSettings/netcoreapp5.0/settings.targets @@ -9,6 +9,7 @@ + From 2db270074c4ab4a8a3e98fd25c45b00bdfabc009 Mon Sep 17 00:00:00 2001 From: Anipik Date: Tue, 4 Feb 2020 09:33:57 -0800 Subject: [PATCH 5/6] adding back package references for netstandard lib build --- .../ILCompiler.Reflection.ReadyToRun.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj index 692dfd06d46fa7..ec4c0094d4b018 100644 --- a/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj +++ b/src/coreclr/src/tools/crossgen2/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj @@ -15,6 +15,11 @@ AnyCPU;x64 + + + + + From 71a7c68a4e3b977ed231ddccd5f12783d78c4297 Mon Sep 17 00:00:00 2001 From: Anipik Date: Tue, 4 Feb 2020 09:53:15 -0800 Subject: [PATCH 6/6] adding back baseline version for consistency --- .../pkg/Microsoft.Private.PackageBaseline/packageIndex.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index 0a4395bfbcbaac..721c40d53c02fe 100644 --- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -83,6 +83,7 @@ "4.5.0", "4.6.0" ], + "BaselineVersion": "4.6.0", "InboxOn": { "netcoreapp2.0": "4.0.3.0", "netcoreapp2.1": "4.0.4.0",