From: Anirudh Agnihotry Date: Wed, 29 Jan 2020 06:36:54 +0000 (-0800) Subject: Dead Ending Microsoft.CSharp Package and Bumping the leftout assembly versions to... X-Git-Tag: submit/tizen/20210909.063632~10158 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5fca04171171f118bca0f93aa9741f205b8cdc29;p=platform%2Fupstream%2Fdotnet%2Fruntime.git 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 --- diff --git a/src/libraries/Microsoft.CSharp/Directory.Build.props b/src/libraries/Microsoft.CSharp/Directory.Build.props index a37afe183e3..9155a7a0764 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 f70d26fff44..00000000000 --- 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 cbdceb94437..7ac45c966c4 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 1009834ecd4..eb45bddc747 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 781348267d4..7ac45c966c4 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 6faf7bdc579..ea6307a2ca3 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 ac021c8da3d..5f6e490332e 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 11df29a247f..d46b21c2700 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 ced09b67754..52f2002a128 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 ce2b36ac8bb..0a4395bfbcb 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 8cb1e4258da..b612f41f0a5 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 bc6aa5222f1..3ba2a5d9ed0 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