From 35b0d68002f9406286e4978022f577820e829ce9 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 16 Feb 2021 12:24:23 +0100 Subject: [PATCH 1/5] Use live dependencies for netcoreapp3.0 depencies (#48176) * Use live dependencies for netcoreapp3.0 deps --- .../Directory.Build.props | 2 ++ ...soft.Extensions.Logging.EventSource.csproj | 5 ++++ .../Directory.Build.props | 7 +++++ .../Microsoft.Extensions.Primitives.csproj | 4 +++ .../Directory.Build.props | 2 ++ ...stem.Reflection.MetadataLoadContext.csproj | 20 ++++++++++--- .../System.Text.Json/Directory.Build.props | 4 +-- .../src/System.Text.Json.csproj | 19 +++++++++++-- .../Text/Json/Serialization/JsonClassInfo.cs | 6 ++-- src/libraries/libraries-packages.proj | 4 +++ src/libraries/pkg/baseline/packageIndex.json | 28 ++++++++++++------- 11 files changed, 79 insertions(+), 22 deletions(-) create mode 100644 src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props index 38cf3ae597c757..19ce7c10cdecd3 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props @@ -3,5 +3,7 @@ $(NoWarn);PKG0001 + 5.0.1 + 5.0.0.1 diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj index b6cd4860ebc8c7..71ce4390a54970 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/src/Microsoft.Extensions.Logging.EventSource.csproj @@ -28,6 +28,11 @@ $(TargetFramework.StartsWith('net4'))"> + + + + + diff --git a/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props b/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props new file mode 100644 index 00000000000000..04717044e67886 --- /dev/null +++ b/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props @@ -0,0 +1,7 @@ + + + + 5.0.1 + 5.0.0.1 + + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj index 192e8f377e1c70..06e66837a4df37 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj +++ b/src/libraries/Microsoft.Extensions.Primitives/src/Microsoft.Extensions.Primitives.csproj @@ -20,6 +20,10 @@ + + + + diff --git a/src/libraries/System.Reflection.MetadataLoadContext/Directory.Build.props b/src/libraries/System.Reflection.MetadataLoadContext/Directory.Build.props index ba1f965d83cae7..0475bcea41e1e1 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/Directory.Build.props +++ b/src/libraries/System.Reflection.MetadataLoadContext/Directory.Build.props @@ -2,5 +2,7 @@ Open + 5.0.1 + 5.0.0.1 diff --git a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj index 7cee550642984c..d072a232a9dfb8 100644 --- a/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj +++ b/src/libraries/System.Reflection.MetadataLoadContext/src/System.Reflection.MetadataLoadContext.csproj @@ -150,11 +150,9 @@ '$(TargetFramework)' == 'netcoreapp3.0'"> - - @@ -163,8 +161,22 @@ - - + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Text.Json/Directory.Build.props b/src/libraries/System.Text.Json/Directory.Build.props index a1cafc714cd721..aadd964949e042 100644 --- a/src/libraries/System.Text.Json/Directory.Build.props +++ b/src/libraries/System.Text.Json/Directory.Build.props @@ -2,8 +2,8 @@ Open - 5.0.1 - 5.0.0.1 + 5.0.2 + 5.0.0.2 true diff --git a/src/libraries/System.Text.Json/src/System.Text.Json.csproj b/src/libraries/System.Text.Json/src/System.Text.Json.csproj index fc5c8ce5591c9f..380942febc5b60 100644 --- a/src/libraries/System.Text.Json/src/System.Text.Json.csproj +++ b/src/libraries/System.Text.Json/src/System.Text.Json.csproj @@ -242,10 +242,8 @@ - - @@ -256,7 +254,22 @@ - + + + + + + + + + + + + + + + + diff --git a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonClassInfo.cs b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonClassInfo.cs index 6f523b19b8294c..f5acbf2f943a9f 100644 --- a/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonClassInfo.cs +++ b/src/libraries/System.Text.Json/src/System/Text/Json/Serialization/JsonClassInfo.cs @@ -319,7 +319,7 @@ static Type GetMemberType(MemberInfo memberInfo) return memberInfo is PropertyInfo propertyInfo ? propertyInfo.PropertyType - : Unsafe.As(memberInfo).FieldType; + : Unsafe.As(memberInfo)!.FieldType; } // Cache the lookup from object property name to JsonPropertyInfo using a case-insensitive comparer. @@ -390,13 +390,13 @@ private static bool PropertyIsOverridenAndIgnored(MemberInfo currentMember, Dict Debug.Assert(currentMember is PropertyInfo || currentMember is FieldInfo); PropertyInfo? currentPropertyInfo = currentMember as PropertyInfo; Type currentMemberType = currentPropertyInfo == null - ? Unsafe.As(currentMember).FieldType + ? Unsafe.As(currentMember)!.FieldType : currentPropertyInfo.PropertyType; Debug.Assert(ignoredProperty is PropertyInfo || ignoredProperty is FieldInfo); PropertyInfo? ignoredPropertyInfo = ignoredProperty as PropertyInfo; Type ignoredPropertyType = ignoredPropertyInfo == null - ? Unsafe.As(ignoredProperty).FieldType + ? Unsafe.As(ignoredProperty)!.FieldType : ignoredPropertyInfo.PropertyType; return currentMemberType == ignoredPropertyType && diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj index 87660e3c2483c9..3351fdf778fdf4 100644 --- a/src/libraries/libraries-packages.proj +++ b/src/libraries/libraries-packages.proj @@ -18,6 +18,10 @@ + + + + diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index 49111acbfe0d44..b6489f2e45a1b6 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -928,11 +928,13 @@ "3.1.0", "3.1.1", "3.1.2", - "5.0.0" + "5.0.0", + "5.0.1" ], "InboxOn": {}, "AssemblyVersionInPackageVersion": { - "5.0.0.0": "5.0.0" + "5.0.0.0": "5.0.0", + "5.0.0.1": "5.0.1" } }, "Microsoft.Extensions.Logging.TraceSource": { @@ -1054,11 +1056,13 @@ "3.1.0", "3.1.1", "3.1.2", - "5.0.0" + "5.0.0", + "5.0.1" ], "InboxOn": {}, "AssemblyVersionInPackageVersion": { - "5.0.0.0": "5.0.0" + "5.0.0.0": "5.0.0", + "5.0.0.1": "5.0.1" } }, "Microsoft.IO.Redist": { @@ -4864,13 +4868,15 @@ "System.Reflection.MetadataLoadContext": { "StableVersions": [ "4.6.0", - "5.0.0" + "5.0.0", + "5.0.1" ], - "BaselineVersion": "5.0.0", + "BaselineVersion": "5.0.1", "InboxOn": {}, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.6.0", - "5.0.0.0": "5.0.0" + "5.0.0.0": "5.0.0", + "5.0.0.1": "5.0.1" } }, "System.Reflection.Primitives": { @@ -6468,9 +6474,10 @@ "StableVersions": [ "4.6.0", "5.0.0", - "5.0.1" + "5.0.1", + "5.0.2" ], - "BaselineVersion": "5.0.0", + "BaselineVersion": "5.0.2", "InboxOn": { "netcoreapp3.0": "4.0.0.0", "net5.0": "5.0.0.0" @@ -6478,7 +6485,8 @@ "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.6.0", "5.0.0.0": "5.0.0", - "5.0.0.1": "5.0.1" + "5.0.0.1": "5.0.1", + "5.0.0.2": "5.0.2" } }, "System.Text.RegularExpressions": { From 1fe00e669f6eafae9350f138a0bef5b574ee28da Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 12 Mar 2021 17:54:53 +0100 Subject: [PATCH 2/5] Disable package validation for two packages --- .../Directory.Build.props | 1 + .../Microsoft.Extensions.Primitives/Directory.Build.props | 1 + 2 files changed, 2 insertions(+) diff --git a/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props b/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props index 19ce7c10cdecd3..2a94254b7fd9f4 100644 --- a/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props +++ b/src/libraries/Microsoft.Extensions.Logging.EventSource/Directory.Build.props @@ -5,5 +5,6 @@ $(NoWarn);PKG0001 5.0.1 5.0.0.1 + true diff --git a/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props b/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props index 04717044e67886..a4a09a47dd1912 100644 --- a/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props +++ b/src/libraries/Microsoft.Extensions.Primitives/Directory.Build.props @@ -3,5 +3,6 @@ 5.0.1 5.0.0.1 + true \ No newline at end of file From ee08cf83ca6598279cc4d13371e0f9f3b0283c8b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 12 Mar 2021 19:03:57 +0100 Subject: [PATCH 3/5] Add baselines for touched packages --- src/libraries/pkg/baseline/packageIndex.json | 32 +++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index b6489f2e45a1b6..d509febabbcb8d 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -931,6 +931,7 @@ "5.0.0", "5.0.1" ], + "BaselineVersion": "5.0.1", "InboxOn": {}, "AssemblyVersionInPackageVersion": { "5.0.0.0": "5.0.0", @@ -1059,6 +1060,7 @@ "5.0.0", "5.0.1" ], + "BaselineVersion": "5.0.1", "InboxOn": {}, "AssemblyVersionInPackageVersion": { "5.0.0.0": "5.0.0", @@ -1506,18 +1508,6 @@ "net45": "4.0.0.0" } }, - "runtime.native.System.Data.SqlClient.sni": { - "StableVersions": [ - "4.0.0", - "4.3.0", - "4.4.0", - "4.5.0", - "4.6.0", - "4.7.0" - ], - "BaselineVersion": "5.0.0", - "InboxOn": {} - }, "runtime.linux-arm.runtime.native.System.IO.Ports": { "StableVersions": [ "4.7.0", @@ -1539,11 +1529,16 @@ ], "InboxOn": {} }, - "runtime.osx-x64.runtime.native.System.IO.Ports": { + "runtime.native.System.Data.SqlClient.sni": { "StableVersions": [ - "4.7.0", - "5.0.0" + "4.0.0", + "4.3.0", + "4.4.0", + "4.5.0", + "4.6.0", + "4.7.0" ], + "BaselineVersion": "5.0.0", "InboxOn": {} }, "runtime.native.System.IO.Ports": { @@ -1555,6 +1550,13 @@ "BaselineVersion": "5.0.1", "InboxOn": {} }, + "runtime.osx-x64.runtime.native.System.IO.Ports": { + "StableVersions": [ + "4.7.0", + "5.0.0" + ], + "InboxOn": {} + }, "SMDiagnostics": { "InboxOn": { "monoandroid10": "Any" From 006c446942a3e9ecfa0f5a2cfd6e9ecd0120fbee Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 12 Mar 2021 19:30:24 +0100 Subject: [PATCH 4/5] Build packages on allconfigurations leg only --- src/libraries/libraries-packages.proj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libraries/libraries-packages.proj b/src/libraries/libraries-packages.proj index 3351fdf778fdf4..2dda951f2fc200 100644 --- a/src/libraries/libraries-packages.proj +++ b/src/libraries/libraries-packages.proj @@ -18,10 +18,10 @@ - - - - + + + + From cbfeb627e5f1aa1aaa745b66a1d4b0d2b6a87532 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Fri, 12 Mar 2021 14:15:25 -0800 Subject: [PATCH 5/5] Fix inbox version of System.Text.Encodings.Web --- src/libraries/pkg/baseline/packageIndex.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/pkg/baseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json index d509febabbcb8d..b96d97af8f8546 100644 --- a/src/libraries/pkg/baseline/packageIndex.json +++ b/src/libraries/pkg/baseline/packageIndex.json @@ -6457,7 +6457,7 @@ "BaselineVersion": "5.0.1", "InboxOn": { "netcoreapp3.0": "4.0.4.0", - "net5.0": "5.0.0.1" + "net5.0": "5.0.0.0" }, "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", @@ -7532,4 +7532,4 @@ "System.Xml.XDocument" ] } -} \ No newline at end of file +}