From bf001d02af7761ea20fe3e194541abe7528dfba0 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 14 Jul 2021 12:33:57 -0700 Subject: [PATCH 1/6] Add a System.Runtime.Experimental package so users can still use the generic math preview This reverts commit f6eb259db626d563c15ba340feb6f440d1e1c8ee. --- src/coreclr/clr.featuredefines.props | 2 +- .../Directory.Build.props | 6 + .../System.Runtime.Experimental/NuGet.config | 12 ++ .../System.Runtime.Experimental.sln | 105 ++++++++++++++++++ .../ref/System.Runtime.Experimental.csproj | 21 ++++ .../src/MatchingRefApiCompatBaseline.txt | 26 +++++ .../src/System.Runtime.Experimental.csproj | 19 ++++ .../System.Runtime.Experimental.Tests.csproj | 47 ++++++++ .../src/MatchingRefApiCompatBaseline.txt | 23 +++- .../System.Private.CoreLib.csproj | 2 +- 10 files changed, 260 insertions(+), 3 deletions(-) create mode 100644 src/libraries/System.Runtime.Experimental/Directory.Build.props create mode 100644 src/libraries/System.Runtime.Experimental/NuGet.config create mode 100644 src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln create mode 100644 src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj create mode 100644 src/libraries/System.Runtime.Experimental/src/MatchingRefApiCompatBaseline.txt create mode 100644 src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.csproj create mode 100644 src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj diff --git a/src/coreclr/clr.featuredefines.props b/src/coreclr/clr.featuredefines.props index 184e885470f63..08fca8de6dd64 100644 --- a/src/coreclr/clr.featuredefines.props +++ b/src/coreclr/clr.featuredefines.props @@ -9,7 +9,7 @@ true true true - false + true true diff --git a/src/libraries/System.Runtime.Experimental/Directory.Build.props b/src/libraries/System.Runtime.Experimental/Directory.Build.props new file mode 100644 index 0000000000000..63f02a0f817ef --- /dev/null +++ b/src/libraries/System.Runtime.Experimental/Directory.Build.props @@ -0,0 +1,6 @@ + + + + Microsoft + + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Experimental/NuGet.config b/src/libraries/System.Runtime.Experimental/NuGet.config new file mode 100644 index 0000000000000..a66b7f9b01324 --- /dev/null +++ b/src/libraries/System.Runtime.Experimental/NuGet.config @@ -0,0 +1,12 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln b/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln new file mode 100644 index 0000000000000..1e50768832ff3 --- /dev/null +++ b/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln @@ -0,0 +1,105 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", "..\..\coreclr\System.Private.CoreLib\System.Private.CoreLib.csproj", "{71AB8240-F179-4B21-A8BE-8BE6CD774ED9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental", "ref\System.Runtime.Experimental.csproj", "{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental", "src\System.Runtime.Experimental.csproj", "{A83A8520-F5E2-49B4-83BC-0F82A412951D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental.Tests", "tests\System.Runtime.Experimental.Tests.csproj", "{4EE36055-AD7C-4779-B3F6-08687960DCC3}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BDCC9986-D51F-48D9-9650-388E172CD91E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F4F10B6C-21C0-4C9D-8909-76FC52145120}" +EndProject +Global + GlobalSection(NestedProjects) = preSolution + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF} + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C} = {F4F10B6C-21C0-4C9D-8909-76FC52145120} + {A83A8520-F5E2-49B4-83BC-0F82A412951D} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF} + {4EE36055-AD7C-4779-B3F6-08687960DCC3} = {BDCC9986-D51F-48D9-9650-388E172CD91E} + EndGlobalSection + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + Checked|Any CPU = Checked|Any CPU + Checked|x64 = Checked|x64 + Checked|x86 = Checked|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|Any CPU.ActiveCfg = Debug|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|Any CPU.Build.0 = Debug|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x64.ActiveCfg = Debug|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x64.Build.0 = Debug|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x86.ActiveCfg = Debug|x86 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Debug|x86.Build.0 = Debug|x86 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|Any CPU.ActiveCfg = Release|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|Any CPU.Build.0 = Release|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x64.ActiveCfg = Release|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x64.Build.0 = Release|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x86.ActiveCfg = Release|x86 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Release|x86.Build.0 = Release|x86 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|Any CPU.ActiveCfg = Checked|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|Any CPU.Build.0 = Checked|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x64.ActiveCfg = Checked|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x64.Build.0 = Checked|x64 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x86.ActiveCfg = Checked|x86 + {71AB8240-F179-4B21-A8BE-8BE6CD774ED9}.Checked|x86.Build.0 = Checked|x86 + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x64.ActiveCfg = Debug|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x64.Build.0 = Debug|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x86.ActiveCfg = Debug|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Debug|x86.Build.0 = Debug|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|Any CPU.Build.0 = Release|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x64.ActiveCfg = Release|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x64.Build.0 = Release|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x86.ActiveCfg = Release|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Release|x86.Build.0 = Release|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|x64.ActiveCfg = Debug|Any CPU + {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|x86.ActiveCfg = Debug|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x64.ActiveCfg = Debug|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x64.Build.0 = Debug|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x86.ActiveCfg = Debug|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x86.Build.0 = Debug|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|Any CPU.Build.0 = Release|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x64.ActiveCfg = Release|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x64.Build.0 = Release|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x86.ActiveCfg = Release|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x86.Build.0 = Release|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|x64.ActiveCfg = Debug|Any CPU + {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|x86.ActiveCfg = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x64.ActiveCfg = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x64.Build.0 = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x86.ActiveCfg = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x86.Build.0 = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|Any CPU.Build.0 = Release|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x64.ActiveCfg = Release|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x64.Build.0 = Release|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x86.ActiveCfg = Release|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Release|x86.Build.0 = Release|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Checked|Any CPU.ActiveCfg = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Checked|x64.ActiveCfg = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Checked|x86.ActiveCfg = Debug|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {19706846-1F47-42ED-B649-B0982EE96E6B} + EndGlobalSection +EndGlobal diff --git a/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj b/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj new file mode 100644 index 0000000000000..39a199fe033e9 --- /dev/null +++ b/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj @@ -0,0 +1,21 @@ + + + System.Runtime + true + true + + v4.0.30319 + + $(NoWarn);0809;0618;CS8614;CS3015 + $(NetCoreAppCurrent) + enable + + + $(DefineConstants);FEATURE_GENERIC_MATH + + + + + diff --git a/src/libraries/System.Runtime.Experimental/src/MatchingRefApiCompatBaseline.txt b/src/libraries/System.Runtime.Experimental/src/MatchingRefApiCompatBaseline.txt new file mode 100644 index 0000000000000..f37135db83a41 --- /dev/null +++ b/src/libraries/System.Runtime.Experimental/src/MatchingRefApiCompatBaseline.txt @@ -0,0 +1,26 @@ +Compat issues with assembly System.Runtime: +MembersMustExist : Member 'public void System.AppContext.add_FirstChanceException(System.EventHandler)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.AppContext.add_ProcessExit(System.EventHandler)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.AppContext.add_UnhandledException(System.UnhandledExceptionEventHandler)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.AppContext.remove_FirstChanceException(System.EventHandler)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.AppContext.remove_ProcessExit(System.EventHandler)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.AppContext.remove_UnhandledException(System.UnhandledExceptionEventHandler)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.AppContext.SetData(System.String, System.Object)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.Environment.FailFast(System.String, System.Exception, System.String)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'protected void System.WeakReference..ctor()' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public System.Diagnostics.DebugProvider System.Diagnostics.Debug.SetProvider(System.Diagnostics.DebugProvider)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'protected System.ModuleHandle System.Reflection.Module.GetModuleHandleImpl()' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'protected System.String System.String System.Resources.ResourceManager.BaseNameField' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'protected System.Resources.IResourceReader System.Resources.IResourceReader System.Resources.ResourceSet.Reader' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public System.Boolean System.Runtime.Serialization.SerializationInfo.DeserializationInProgress.get()' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public System.Runtime.Serialization.DeserializationToken System.Runtime.Serialization.SerializationInfo.StartDeserialization()' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.Runtime.Serialization.SerializationInfo.ThrowIfDeserializationInProgress()' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.Runtime.Serialization.SerializationInfo.ThrowIfDeserializationInProgress(System.String, System.Int32)' does not exist in the reference but it does exist in the implementation. +MembersMustExist : Member 'public void System.Runtime.Serialization.SerializationInfo.UpdateValue(System.String, System.Object, System.Type)' does not exist in the reference but it does exist in the implementation. +# These are now virtual in the implementation, which should be ok. +CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInfo.Exists' is abstract in the reference but is not abstract in the implementation. +CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name' is abstract in the reference but is not abstract in the implementation. +CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInfo.Exists.get()' is abstract in the reference but is not abstract in the implementation. +CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name.get()' is abstract in the reference but is not abstract in the implementation. +# C# generates backing fields for fixed buffers as public. +TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation. diff --git a/src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.csproj b/src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.csproj new file mode 100644 index 0000000000000..ba5cfc0ad0bd7 --- /dev/null +++ b/src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.csproj @@ -0,0 +1,19 @@ + + + System.Runtime + true + $(NetCoreAppCurrent) + enable + + + + + + + + + + + + + diff --git a/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj b/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj new file mode 100644 index 0000000000000..55744297d2c49 --- /dev/null +++ b/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj @@ -0,0 +1,47 @@ + + + System.Runtime.Tests + true + true + $(NoWarn),1718,SYSLIB0013 + true + true + $(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser + disable + + $(Features.Replace('nullablePublicOnly', '') + + + $(DefineConstants);FEATURE_GENERIC_MATH + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt b/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt index cbe8cabdbb295..340fd11ced640 100644 --- a/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt +++ b/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt @@ -24,4 +24,25 @@ CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInf CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name.get()' is abstract in the reference but is not abstract in the implementation. # C# generates backing fields for fixed buffers as public. TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation. - +# Experimental generic math feature +CannotRemoveBaseTypeOrInterface : Type 'System.Byte' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Char' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.DateOnly' does not implement interface 'System.IComparisonOperators' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.DateTime' does not implement interface 'System.IAdditionOperators' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.DateTimeOffset' does not implement interface 'System.IAdditionOperators' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Decimal' does not implement interface 'System.IMinMaxValue' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Double' does not implement interface 'System.IBinaryFloatingPoint' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Guid' does not implement interface 'System.IComparisonOperators' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Half' does not implement interface 'System.IBinaryFloatingPoint' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Int16' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Int32' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Int64' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.IntPtr' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.SByte' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.Single' does not implement interface 'System.IBinaryFloatingPoint' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.TimeOnly' does not implement interface 'System.IComparisonOperators' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.TimeSpan' does not implement interface 'System.IAdditionOperators' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.UInt16' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.UInt32' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.UInt64' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. +CannotRemoveBaseTypeOrInterface : Type 'System.UIntPtr' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. diff --git a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj index 8488d916e6df0..4edae171504d1 100644 --- a/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj +++ b/src/mono/System.Private.CoreLib/System.Private.CoreLib.csproj @@ -109,7 +109,7 @@ true true true - false + true true true true From 5f70f4aaeb72f18d196841585f9f35cac97439ac Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 14 Jul 2021 14:22:14 -0700 Subject: [PATCH 2/6] Simplify S.R.Experimental so it only produces a ref and its build version is 100 higher --- .../Directory.Build.props | 4 ++- .../System.Runtime.Experimental.sln | 22 +--------------- .../ref/System.Runtime.Experimental.csproj | 12 +++++++++ .../src/MatchingRefApiCompatBaseline.txt | 26 ------------------- .../src/System.Runtime.Experimental.csproj | 19 -------------- .../src/MatchingRefApiCompatBaseline.txt | 22 ---------------- .../System.Runtime/src/System.Runtime.csproj | 3 ++- 7 files changed, 18 insertions(+), 90 deletions(-) delete mode 100644 src/libraries/System.Runtime.Experimental/src/MatchingRefApiCompatBaseline.txt delete mode 100644 src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.csproj diff --git a/src/libraries/System.Runtime.Experimental/Directory.Build.props b/src/libraries/System.Runtime.Experimental/Directory.Build.props index 63f02a0f817ef..949be36e55724 100644 --- a/src/libraries/System.Runtime.Experimental/Directory.Build.props +++ b/src/libraries/System.Runtime.Experimental/Directory.Build.props @@ -1,6 +1,8 @@  + false + false Microsoft - \ No newline at end of file + diff --git a/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln b/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln index 1e50768832ff3..488f21fdfd347 100644 --- a/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln +++ b/src/libraries/System.Runtime.Experimental/System.Runtime.Experimental.sln @@ -3,12 +3,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Private.CoreLib", ". EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental", "ref\System.Runtime.Experimental.csproj", "{F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental", "src\System.Runtime.Experimental.csproj", "{A83A8520-F5E2-49B4-83BC-0F82A412951D}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.Runtime.Experimental.Tests", "tests\System.Runtime.Experimental.Tests.csproj", "{4EE36055-AD7C-4779-B3F6-08687960DCC3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C7032EBC-8AB7-4BE6-9D95-B420F058FAAF}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{BDCC9986-D51F-48D9-9650-388E172CD91E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{F4F10B6C-21C0-4C9D-8909-76FC52145120}" @@ -17,7 +13,6 @@ Global GlobalSection(NestedProjects) = preSolution {71AB8240-F179-4B21-A8BE-8BE6CD774ED9} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF} {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C} = {F4F10B6C-21C0-4C9D-8909-76FC52145120} - {A83A8520-F5E2-49B4-83BC-0F82A412951D} = {C7032EBC-8AB7-4BE6-9D95-B420F058FAAF} {4EE36055-AD7C-4779-B3F6-08687960DCC3} = {BDCC9986-D51F-48D9-9650-388E172CD91E} EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -65,22 +60,7 @@ Global {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|Any CPU.ActiveCfg = Debug|Any CPU {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|x64.ActiveCfg = Debug|Any CPU {F39E2C7E-5FE1-460C-AC2C-7E2B50955F2C}.Checked|x86.ActiveCfg = Debug|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x64.ActiveCfg = Debug|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x64.Build.0 = Debug|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x86.ActiveCfg = Debug|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Debug|x86.Build.0 = Debug|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|Any CPU.Build.0 = Release|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x64.ActiveCfg = Release|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x64.Build.0 = Release|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x86.ActiveCfg = Release|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Release|x86.Build.0 = Release|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|x64.ActiveCfg = Debug|Any CPU - {A83A8520-F5E2-49B4-83BC-0F82A412951D}.Checked|x86.ActiveCfg = Debug|Any CPU - {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|Any CPU.Build.0 = Debug|Any CPU {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x64.ActiveCfg = Debug|Any CPU {4EE36055-AD7C-4779-B3F6-08687960DCC3}.Debug|x64.Build.0 = Debug|Any CPU diff --git a/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj b/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj index 39a199fe033e9..50c4da0750cae 100644 --- a/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj +++ b/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj @@ -18,4 +18,16 @@ + + + <_FileVersionMaj>$(FileVersion.Split('.')[0]) + <_FileVersionMin>$(FileVersion.Split('.')[1]) + <_FileVersionBld>$(FileVersion.Split('.')[2]) + <_FileVersionRev>$(FileVersion.Split('.')[3]) + + + + + diff --git a/src/libraries/System.Runtime.Experimental/src/MatchingRefApiCompatBaseline.txt b/src/libraries/System.Runtime.Experimental/src/MatchingRefApiCompatBaseline.txt deleted file mode 100644 index f37135db83a41..0000000000000 --- a/src/libraries/System.Runtime.Experimental/src/MatchingRefApiCompatBaseline.txt +++ /dev/null @@ -1,26 +0,0 @@ -Compat issues with assembly System.Runtime: -MembersMustExist : Member 'public void System.AppContext.add_FirstChanceException(System.EventHandler)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.AppContext.add_ProcessExit(System.EventHandler)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.AppContext.add_UnhandledException(System.UnhandledExceptionEventHandler)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.AppContext.remove_FirstChanceException(System.EventHandler)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.AppContext.remove_ProcessExit(System.EventHandler)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.AppContext.remove_UnhandledException(System.UnhandledExceptionEventHandler)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.AppContext.SetData(System.String, System.Object)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.Environment.FailFast(System.String, System.Exception, System.String)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'protected void System.WeakReference..ctor()' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public System.Diagnostics.DebugProvider System.Diagnostics.Debug.SetProvider(System.Diagnostics.DebugProvider)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'protected System.ModuleHandle System.Reflection.Module.GetModuleHandleImpl()' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'protected System.String System.String System.Resources.ResourceManager.BaseNameField' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'protected System.Resources.IResourceReader System.Resources.IResourceReader System.Resources.ResourceSet.Reader' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public System.Boolean System.Runtime.Serialization.SerializationInfo.DeserializationInProgress.get()' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public System.Runtime.Serialization.DeserializationToken System.Runtime.Serialization.SerializationInfo.StartDeserialization()' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.Runtime.Serialization.SerializationInfo.ThrowIfDeserializationInProgress()' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.Runtime.Serialization.SerializationInfo.ThrowIfDeserializationInProgress(System.String, System.Int32)' does not exist in the reference but it does exist in the implementation. -MembersMustExist : Member 'public void System.Runtime.Serialization.SerializationInfo.UpdateValue(System.String, System.Object, System.Type)' does not exist in the reference but it does exist in the implementation. -# These are now virtual in the implementation, which should be ok. -CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInfo.Exists' is abstract in the reference but is not abstract in the implementation. -CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name' is abstract in the reference but is not abstract in the implementation. -CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInfo.Exists.get()' is abstract in the reference but is not abstract in the implementation. -CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name.get()' is abstract in the reference but is not abstract in the implementation. -# C# generates backing fields for fixed buffers as public. -TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation. diff --git a/src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.csproj b/src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.csproj deleted file mode 100644 index ba5cfc0ad0bd7..0000000000000 --- a/src/libraries/System.Runtime.Experimental/src/System.Runtime.Experimental.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - System.Runtime - true - $(NetCoreAppCurrent) - enable - - - - - - - - - - - - - diff --git a/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt b/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt index 340fd11ced640..f37135db83a41 100644 --- a/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt +++ b/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt @@ -24,25 +24,3 @@ CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInf CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name.get()' is abstract in the reference but is not abstract in the implementation. # C# generates backing fields for fixed buffers as public. TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation. -# Experimental generic math feature -CannotRemoveBaseTypeOrInterface : Type 'System.Byte' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.Char' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.DateOnly' does not implement interface 'System.IComparisonOperators' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.DateTime' does not implement interface 'System.IAdditionOperators' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.DateTimeOffset' does not implement interface 'System.IAdditionOperators' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.Decimal' does not implement interface 'System.IMinMaxValue' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.Double' does not implement interface 'System.IBinaryFloatingPoint' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.Guid' does not implement interface 'System.IComparisonOperators' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.Half' does not implement interface 'System.IBinaryFloatingPoint' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.Int16' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.Int32' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.Int64' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.IntPtr' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.SByte' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.Single' does not implement interface 'System.IBinaryFloatingPoint' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.TimeOnly' does not implement interface 'System.IComparisonOperators' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.TimeSpan' does not implement interface 'System.IAdditionOperators' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.UInt16' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.UInt32' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.UInt64' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. -CannotRemoveBaseTypeOrInterface : Type 'System.UIntPtr' does not implement interface 'System.IBinaryInteger' in the reference but it does in the implementation. diff --git a/src/libraries/System.Runtime/src/System.Runtime.csproj b/src/libraries/System.Runtime/src/System.Runtime.csproj index 6e3a18228e7e6..eedb651c3bad5 100644 --- a/src/libraries/System.Runtime/src/System.Runtime.csproj +++ b/src/libraries/System.Runtime/src/System.Runtime.csproj @@ -1,11 +1,12 @@ + $(LibrariesProjectRoot)System.Runtime.Experimental\ref\System.Runtime.Experimental.csproj true $(NetCoreAppCurrent) enable - + From 45471303da31430ea410178f6a68131af3391a17 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Wed, 14 Jul 2021 17:13:54 -0700 Subject: [PATCH 3/6] Ensure a nuget package is being produced and resolve PR feedback --- src/libraries/Directory.Build.targets | 18 +++++++++++------- .../Directory.Build.props | 3 +-- .../ref/System.Runtime.Experimental.csproj | 15 +++++++++------ .../src/MatchingRefApiCompatBaseline.txt | 1 + .../System.Runtime/src/System.Runtime.csproj | 1 + src/libraries/libraries-packages.proj | 1 + 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets index dd17dace8e4ba..60e98a9dd70fa 100644 --- a/src/libraries/Directory.Build.targets +++ b/src/libraries/Directory.Build.targets @@ -24,7 +24,7 @@ $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(NetCoreAppCurrentBuildSettings)')) $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)')) $([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)')) - + $(PackageOutputPath) $(NoWarn);nullable @@ -282,10 +282,14 @@ + + <_intellisenseRootFolder>$(BuildOutputTargetFolder) + <_intellisenseRootFolder Condition="'$(_intellisenseRootFolder)' == ''">lib + + PackagePath="$(_intellisenseRootFolder)/$(TargetFramework)" /> @@ -294,8 +298,8 @@ - @@ -313,9 +317,9 @@ - <_TargetPathsToSymbols Include="@(_AnalyzerFile)" TargetPath="/%(_AnalyzerFile.PackagePath)" Condition="%(_AnalyzerFile.IsSymbol)" /> @@ -331,7 +335,7 @@ <_AnalyzerPackFile Include="@(_TargetPathsToSymbols)" IsSymbol="true" /> <_AnalyzerPackFile PackagePath="$(_analyzerPath)/%(TargetPath)" /> - diff --git a/src/libraries/System.Runtime.Experimental/Directory.Build.props b/src/libraries/System.Runtime.Experimental/Directory.Build.props index 949be36e55724..f3de1649b566f 100644 --- a/src/libraries/System.Runtime.Experimental/Directory.Build.props +++ b/src/libraries/System.Runtime.Experimental/Directory.Build.props @@ -1,8 +1,7 @@  - false - false + false Microsoft diff --git a/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj b/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj index 50c4da0750cae..4c6ae1a740fe2 100644 --- a/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj +++ b/src/libraries/System.Runtime.Experimental/ref/System.Runtime.Experimental.csproj @@ -8,12 +8,17 @@ - $(NoWarn);0809;0618;CS8614;CS3015 + $(NoWarn);0809;0618;CS8614;CS3015;NU5131 $(NetCoreAppCurrent) enable - - $(DefineConstants);FEATURE_GENERIC_MATH + + + ref + $(DefineConstants);FEATURE_GENERIC_MATH + true + Exposes new experimental APIs from System.Runtime + $(MSBuildProjectName) @@ -25,9 +30,7 @@ <_FileVersionMin>$(FileVersion.Split('.')[1]) <_FileVersionBld>$(FileVersion.Split('.')[2]) <_FileVersionRev>$(FileVersion.Split('.')[3]) + $(_FileVersionMaj).$(_FileVersionMin).$([MSBuild]::Add($(_FileVersionBld), 100)).$(_FileVersionRev) - - - diff --git a/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt b/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt index f37135db83a41..cbe8cabdbb295 100644 --- a/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt +++ b/src/libraries/System.Runtime/src/MatchingRefApiCompatBaseline.txt @@ -24,3 +24,4 @@ CannotMakeMemberAbstract : Member 'public System.Boolean System.IO.FileSystemInf CannotMakeMemberAbstract : Member 'public System.String System.IO.FileSystemInfo.Name.get()' is abstract in the reference but is not abstract in the implementation. # C# generates backing fields for fixed buffers as public. TypesMustExist : Type 'System.IO.Enumeration.FileSystemEntry.<_fileNameBuffer>e__FixedBuffer' does not exist in the reference but it does exist in the implementation. + diff --git a/src/libraries/System.Runtime/src/System.Runtime.csproj b/src/libraries/System.Runtime/src/System.Runtime.csproj index eedb651c3bad5..38cdb0e8526dc 100644 --- a/src/libraries/System.Runtime/src/System.Runtime.csproj +++ b/src/libraries/System.Runtime/src/System.Runtime.csproj @@ -1,5 +1,6 @@ + $(LibrariesProjectRoot)System.Runtime.Experimental\ref\System.Runtime.Experimental.csproj true $(NetCoreAppCurrent) diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj index 383dd088e127c..d47cd90675e54 100644 --- a/src/libraries/libraries-packages.proj +++ b/src/libraries/libraries-packages.proj @@ -3,6 +3,7 @@ + Date: Thu, 15 Jul 2021 09:04:46 -0700 Subject: [PATCH 4/6] Update src/libraries/System.Runtime.Experimental/Directory.Build.props --- .../System.Runtime.Experimental/Directory.Build.props | 1 + src/libraries/libraries-packages.proj | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Runtime.Experimental/Directory.Build.props b/src/libraries/System.Runtime.Experimental/Directory.Build.props index f3de1649b566f..64242a92fce4f 100644 --- a/src/libraries/System.Runtime.Experimental/Directory.Build.props +++ b/src/libraries/System.Runtime.Experimental/Directory.Build.props @@ -1,6 +1,7 @@  + false Microsoft diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj index d47cd90675e54..f67803e79972b 100644 --- a/src/libraries/libraries-packages.proj +++ b/src/libraries/libraries-packages.proj @@ -3,7 +3,8 @@ - + Date: Wed, 14 Jul 2021 22:59:51 -0700 Subject: [PATCH 5/6] Add a reference to System.Runtime.Experimental so mono can build --- .../tests/System.Runtime.Experimental.Tests.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj b/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj index 55744297d2c49..b78447f47a02b 100644 --- a/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj +++ b/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj @@ -42,6 +42,7 @@ + From 0ab5f2d188ab8348210fb02831d0bef39adcc1a3 Mon Sep 17 00:00:00 2001 From: Tanner Gooding Date: Thu, 15 Jul 2021 12:51:00 -0700 Subject: [PATCH 6/6] Disable System.Runtime.Experimental.Tests on WASM AOT --- .../tests/System.Runtime.Experimental.Tests.csproj | 1 - src/libraries/tests.proj | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj b/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj index b78447f47a02b..b1cd60dc72330 100644 --- a/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj +++ b/src/libraries/System.Runtime.Experimental/tests/System.Runtime.Experimental.Tests.csproj @@ -1,6 +1,5 @@ - System.Runtime.Tests true true $(NoWarn),1718,SYSLIB0013 diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj index 4884a9416d9fe..fbc717a148846 100644 --- a/src/libraries/tests.proj +++ b/src/libraries/tests.proj @@ -205,7 +205,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -278,6 +278,9 @@ + + +