diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index 160b5b7d7a2e..1beb0f977d8d 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -1687,8 +1687,8 @@ "4.0.10.0": "4.0.10", "4.0.20.0": "4.0.20", "4.1.0.0": "4.1.0", - "4.2.0.0": "4.2.0", - "4.0.21.0": "4.0.21" + "4.0.21.0": "4.0.21", + "4.1.1.0": "4.3.0" } }, "System.Runtime.InteropServices.RuntimeInformation": { @@ -2078,7 +2078,7 @@ "4.0.0.0": "4.0.0", "4.0.10.0": "4.0.10", "4.1.0.0": "4.0.12", - "4.2.0.0": "4.2.0", + "4.1.1.0": "4.3.0", "4.0.11.0": "4.0.11", "4.0.12.0": "4.0.12" } diff --git a/src/System.Runtime.InteropServices/dir.props b/src/System.Runtime.InteropServices/dir.props index ec6b27deddb1..34b2edfd209d 100644 --- a/src/System.Runtime.InteropServices/dir.props +++ b/src/System.Runtime.InteropServices/dir.props @@ -1,7 +1,7 @@ - 4.2.0.0 + 4.1.1.0 diff --git a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj index 9649b51b6818..5a01ce1054f3 100644 --- a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj +++ b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj @@ -2,26 +2,8 @@ - - net45;netcore45 - - - net451;netcore451;wpa81 - - - net46;netcore50 - - - net462 - - net463;netcoreapp1.0;$(AllXamarinFrameworks) - - - net462 - - - net463 + netcoreapp1.1 diff --git a/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj index 9a7c1ae134d1..d2d9d12cb82c 100644 --- a/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj +++ b/src/System.Runtime.InteropServices/pkg/any/System.Runtime.InteropServices.pkgproj @@ -8,15 +8,6 @@ - - netcore50 - - - - - runtimes/aot/lib/netcore50 - aot - diff --git a/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj b/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj index 6b30cdf063e1..d9827ceb9202 100644 --- a/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj +++ b/src/System.Runtime.InteropServices/pkg/aot/System.Runtime.InteropServices.pkgproj @@ -7,11 +7,5 @@ true - - - netcore50aot - - - \ No newline at end of file diff --git a/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj deleted file mode 100644 index 29f2b6abdae9..000000000000 --- a/src/System.Runtime.InteropServices/ref/4.0.0/System.Runtime.InteropServices.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.0.0.0 - Library - netstandard1.1 - .NETStandard,Version=v1.1 - - - - - - \ No newline at end of file diff --git a/src/System.Runtime.InteropServices/ref/4.0.0/project.json b/src/System.Runtime.InteropServices/ref/4.0.0/project.json deleted file mode 100644 index f78a316cbb2c..000000000000 --- a/src/System.Runtime.InteropServices/ref/4.0.0/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime.InteropServices": "4.0.0" - }, - "frameworks": { - "netstandard1.1": { - "imports": [ - "dotnet5.2" - ] - } - } -} diff --git a/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj deleted file mode 100644 index 7aa0e70c3a3a..000000000000 --- a/src/System.Runtime.InteropServices/ref/4.0.10/System.Runtime.InteropServices.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.0.10.0 - Library - netstandard1.2 - .NETStandard,Version=v1.2 - - - - - - \ No newline at end of file diff --git a/src/System.Runtime.InteropServices/ref/4.0.10/project.json b/src/System.Runtime.InteropServices/ref/4.0.10/project.json deleted file mode 100644 index 2f51f34bfb20..000000000000 --- a/src/System.Runtime.InteropServices/ref/4.0.10/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime.InteropServices": "4.0.10" - }, - "frameworks": { - "netstandard1.2": { - "imports": [ - "dotnet5.3" - ] - } - } -} diff --git a/src/System.Runtime.InteropServices/ref/4.0.20/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.0.20/System.Runtime.InteropServices.depproj deleted file mode 100644 index 2c8e3437c172..000000000000 --- a/src/System.Runtime.InteropServices/ref/4.0.20/System.Runtime.InteropServices.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.0.20.0 - Library - netstandard1.3 - .NETStandard,Version=v1.3 - - - - - - \ No newline at end of file diff --git a/src/System.Runtime.InteropServices/ref/4.0.20/project.json b/src/System.Runtime.InteropServices/ref/4.0.20/project.json deleted file mode 100644 index 1c2e27c27d9b..000000000000 --- a/src/System.Runtime.InteropServices/ref/4.0.20/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime.InteropServices": "4.0.20" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ - "dotnet5.4" - ] - } - } -} diff --git a/src/System.Runtime.InteropServices/ref/4.1/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/ref/4.1/System.Runtime.InteropServices.depproj deleted file mode 100644 index 73aa35f607b0..000000000000 --- a/src/System.Runtime.InteropServices/ref/4.1/System.Runtime.InteropServices.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.1.0.0 - Library - netstandard1.5 - .NETStandard,Version=v1.5 - - - - - - \ No newline at end of file diff --git a/src/System.Runtime.InteropServices/ref/4.1/project.json b/src/System.Runtime.InteropServices/ref/4.1/project.json deleted file mode 100644 index c8d08047db31..000000000000 --- a/src/System.Runtime.InteropServices/ref/4.1/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Runtime.InteropServices": "4.0.20" - }, - "frameworks": { - "netstandard1.5": { - "imports": [ - "dotnet5.4" - ] - } - } -} diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs index 0ccef4649327..c1e50db4ea03 100644 --- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs +++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.cs @@ -493,7 +493,7 @@ public static void GetNativeVariantForObject(T obj, System.IntPtr pDstNativeV [System.Security.SecurityCriticalAttribute] public static string PtrToStringUTF8(System.IntPtr ptr) { return default(string); } [System.Security.SecurityCriticalAttribute] - public static string PtrToStringUTF8(System.IntPtr ptr, int byteLen) { return default(string); } + public static string PtrToStringUTF8(System.IntPtr ptr, int byteLen) { return default(string); } [System.ComponentModel.EditorBrowsableAttribute((System.ComponentModel.EditorBrowsableState)(1))] [System.Security.SecurityCriticalAttribute] public static void PtrToStructure(System.IntPtr ptr, object structure) { } diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj index 0c1c7ce0a4d0..5df34c2aa0f7 100644 --- a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj +++ b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj @@ -7,7 +7,7 @@ 618 true Library - netstandard1.6 + netcoreapp1.1 .NETStandard,Version=v1.6 {B17014F1-D902-417F-89B0-271204695831} diff --git a/src/System.Runtime.InteropServices/src/ApiCompatBaseline.net463.txt b/src/System.Runtime.InteropServices/src/ApiCompatBaseline.net463.txt deleted file mode 100644 index cea5e4e39d60..000000000000 --- a/src/System.Runtime.InteropServices/src/ApiCompatBaseline.net463.txt +++ /dev/null @@ -1,5 +0,0 @@ -MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.PtrToStringUTF8(System.IntPtr)' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.PtrToStringUTF8(System.IntPtr, System.Int32)' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.StringToCoTaskMemUTF8(System.String)' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Runtime.InteropServices.Marshal.ZeroFreeCoTaskMemUTF8(System.IntPtr)' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Runtime.InteropServices.UnmanagedType System.Runtime.InteropServices.UnmanagedType.LPUTF8Str' does not exist in the implementation but it does exist in the contract. \ No newline at end of file diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds index e699ebf6c4ab..8fd85a2e3e47 100644 --- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds +++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.builds @@ -3,22 +3,10 @@ - - net463 - - - netcore50 - - - netcore50aot - - - net462 - diff --git a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj index b6499426670d..348da986d75f 100644 --- a/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj +++ b/src/System.Runtime.InteropServices/src/System.Runtime.InteropServices.csproj @@ -14,10 +14,6 @@ - - - - @@ -33,17 +29,9 @@ - + - - - - - - - - diff --git a/src/System.Runtime.InteropServices/src/redist/System.Runtime.InteropServices.depproj b/src/System.Runtime.InteropServices/src/redist/System.Runtime.InteropServices.depproj deleted file mode 100644 index b9aeea6b494b..000000000000 --- a/src/System.Runtime.InteropServices/src/redist/System.Runtime.InteropServices.depproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - netcore50 - - - - 4.1.0.0 - 4.0.20.0 - Library - win - - true - - - - - - \ No newline at end of file diff --git a/src/System.Runtime.InteropServices/src/redist/project.json b/src/System.Runtime.InteropServices/src/redist/project.json deleted file mode 100644 index 53cc111138ea..000000000000 --- a/src/System.Runtime.InteropServices/src/redist/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "System.Runtime.InteropServices": "4.1.0" - }, - "frameworks": { - "netcore50": {}, - "net462": {} - }, - "runtimes": { - "win": {}, - "win8": {}, - "win8-aot": {} - } -} diff --git a/src/System.Text.RegularExpressions/dir.props b/src/System.Text.RegularExpressions/dir.props index ec6b27deddb1..34b2edfd209d 100644 --- a/src/System.Text.RegularExpressions/dir.props +++ b/src/System.Text.RegularExpressions/dir.props @@ -1,7 +1,7 @@ - 4.2.0.0 + 4.1.1.0 diff --git a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj index 39dd35d071e0..0f05cfa1aac1 100644 --- a/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj +++ b/src/System.Text.RegularExpressions/pkg/System.Text.RegularExpressions.pkgproj @@ -2,14 +2,8 @@ - - net45;netcore45;wp8;wpa81 - - - net46;netcore50 - - net463;netcoreapp1.0;$(AllXamarinFrameworks) + netcoreapp1.1 diff --git a/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj b/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj deleted file mode 100644 index f1c59486edbe..000000000000 --- a/src/System.Text.RegularExpressions/ref/4.0.0/System.Text.RegularExpressions.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.0.0.0 - Library - netstandard1.0 - .NETStandard,Version=v1.0 - - - - - - \ No newline at end of file diff --git a/src/System.Text.RegularExpressions/ref/4.0.0/project.json b/src/System.Text.RegularExpressions/ref/4.0.0/project.json deleted file mode 100644 index 3e4f8df3665f..000000000000 --- a/src/System.Text.RegularExpressions/ref/4.0.0/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Text.RegularExpressions": "4.0.0" - }, - "frameworks": { - "netstandard1.0": { - "imports": [ - "dotnet5.1" - ] - } - } -} diff --git a/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj b/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj deleted file mode 100644 index f4a2240f0510..000000000000 --- a/src/System.Text.RegularExpressions/ref/4.0.10/System.Text.RegularExpressions.depproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - 4.0.10.0 - Library - netstandard1.3 - .NETStandard,Version=v1.3 - - - - - - \ No newline at end of file diff --git a/src/System.Text.RegularExpressions/ref/4.0.10/project.json b/src/System.Text.RegularExpressions/ref/4.0.10/project.json deleted file mode 100644 index 5e6c7972dcbf..000000000000 --- a/src/System.Text.RegularExpressions/ref/4.0.10/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "System.Text.RegularExpressions": "4.0.10" - }, - "frameworks": { - "netstandard1.3": { - "imports": [ - "dotnet5.4" - ] - } - } -} diff --git a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj index 876ca91696bd..60bf91af8a8a 100644 --- a/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj +++ b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj @@ -3,7 +3,7 @@ Library - netstandard1.6 + netcoreapp1.1 .NETStandard,Version=v1.6 diff --git a/src/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt b/src/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt deleted file mode 100644 index 48d436201f09..000000000000 --- a/src/System.Text.RegularExpressions/src/ApiCompatBaseline.net463.txt +++ /dev/null @@ -1,5 +0,0 @@ -MembersMustExist : Member 'System.Text.RegularExpressions.Regex.Caps.get()' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Text.RegularExpressions.Regex.Caps.set(System.Collections.IDictionary)' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Text.RegularExpressions.Regex.CapNames.get()' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Text.RegularExpressions.Regex.CapNames.set(System.Collections.IDictionary)' does not exist in the implementation but it does exist in the contract. -MembersMustExist : Member 'System.Text.RegularExpressions.Group.Name.get()' does not exist in the implementation but it does exist in the contract. \ No newline at end of file diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds index 4b31babf72be..c7dcad142419 100644 --- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds +++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds @@ -3,13 +3,6 @@ - - - net463 - - - netcore50 - diff --git a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj index c37f56746c6c..aaff24ced8f2 100644 --- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj @@ -4,17 +4,13 @@ {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD} System.Text.RegularExpressions - true - None - netstandard1.6 + netcoreapp1.1 .NETStandard,Version=v1.6 - - - + @@ -44,10 +40,6 @@ Common\System\IO\StringBuilderCache.cs - - - - diff --git a/src/System.Text.RegularExpressions/src/project.json b/src/System.Text.RegularExpressions/src/project.json index 730455c869e5..2192c138d2ad 100644 --- a/src/System.Text.RegularExpressions/src/project.json +++ b/src/System.Text.RegularExpressions/src/project.json @@ -16,11 +16,6 @@ "imports": [ "dotnet5.7" ] - }, - "net463": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.6": "1.0.1" - } } } } diff --git a/src/System.Text.RegularExpressions/src/redist/System.Text.RegularExpressions.depproj b/src/System.Text.RegularExpressions/src/redist/System.Text.RegularExpressions.depproj deleted file mode 100644 index 6e6e5c04ade5..000000000000 --- a/src/System.Text.RegularExpressions/src/redist/System.Text.RegularExpressions.depproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netcore50 - - - - 4.0.10.0 - Library - - - - - - \ No newline at end of file diff --git a/src/System.Text.RegularExpressions/src/redist/project.json b/src/System.Text.RegularExpressions/src/redist/project.json deleted file mode 100644 index b20f9ffe0958..000000000000 --- a/src/System.Text.RegularExpressions/src/redist/project.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Targets": "1.0.0", - "System.Text.RegularExpressions": "4.0.10" - }, - "frameworks": { - "netcore50": {} - }, - "runtimes": { - "win8": {} - } -} diff --git a/src/ref.builds b/src/ref.builds index eebac73aaae8..4bf366da8cd2 100644 --- a/src/ref.builds +++ b/src/ref.builds @@ -2,7 +2,7 @@ - + OSGroup;TargetGroup