diff --git a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json index fb2c9833e014..e98abe2a21f5 100644 --- a/pkg/Microsoft.Private.PackageBaseline/packageIndex.json +++ b/pkg/Microsoft.Private.PackageBaseline/packageIndex.json @@ -1182,7 +1182,7 @@ "AssemblyVersionInPackageVersion": { "4.0.0.0": "4.0.0", "4.1.0.0": "4.1.0", - "4.1.1.0": "4.3.0", + "4.1.1.0": "4.3.0" } }, "System.Linq.Expressions": { @@ -1659,7 +1659,7 @@ "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.3.0" + "4.1.1.0": "4.3.0" } }, "System.Runtime.InteropServices.RuntimeInformation": { @@ -2047,7 +2047,7 @@ "4.0.0.0": "4.0.0", "4.0.10.0": "4.0.10", "4.1.0.0": "4.1.0", - "4.2.0.0": "4.3.0" + "4.1.1.0": "4.3.0" } }, "System.Threading": { diff --git a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj index 88042a484581..3d48280bba37 100644 --- a/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj +++ b/src/System.Linq.Expressions/tests/System.Linq.Expressions.Tests.csproj @@ -226,6 +226,8 @@ {aef718e9-d4fc-418f-a7ae-ed6b2c7b3787} System.Linq.Expressions + + \ No newline at end of file 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..b1282d32de15 100644 --- a/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj +++ b/src/System.Runtime.InteropServices/pkg/System.Runtime.InteropServices.pkgproj @@ -2,20 +2,8 @@ - - net45;netcore45 - - - net451;netcore451;wpa81 - - - net46;netcore50 - - - net462 - - net463;netcoreapp1.0;$(AllXamarinFrameworks) + netcoreapp1.1 net462 diff --git a/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj b/src/System.Runtime.InteropServices/ref/System.Runtime.InteropServices.csproj index 62d736496b2e..5bd873162706 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 - .NETStandard,Version=v1.6 + .NETCoreApp,Version=v1.1 {B17014F1-D902-417F-89B0-271204695831} diff --git a/src/System.Runtime.InteropServices/ref/project.json b/src/System.Runtime.InteropServices/ref/project.json index 227efb5c0e26..071591f7871d 100644 --- a/src/System.Runtime.InteropServices/ref/project.json +++ b/src/System.Runtime.InteropServices/ref/project.json @@ -6,7 +6,7 @@ "System.Runtime.Handles": "4.0.0" }, "frameworks": { - "netstandard1.6": { + "netcoreapp1.1": { "imports": [ "dotnet5.7" ] 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/System.Text.RegularExpressions.csproj b/src/System.Text.RegularExpressions/ref/System.Text.RegularExpressions.csproj index 09c39bb89746..8952ed407d11 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 - .NETStandard,Version=v1.6 + .NETCoreApp,Version=v1.1 diff --git a/src/System.Text.RegularExpressions/ref/project.json b/src/System.Text.RegularExpressions/ref/project.json index 3c3c433c747f..21af23ceb45a 100644 --- a/src/System.Text.RegularExpressions/ref/project.json +++ b/src/System.Text.RegularExpressions/ref/project.json @@ -3,7 +3,7 @@ "System.Runtime": "4.0.0" }, "frameworks": { - "netstandard1.6": { + "netcoreapp1.1": { "imports": [ "dotnet5.7" ] 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..56027ac40da2 100644 --- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds +++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.builds @@ -3,10 +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 9770c309df88..87438a6da017 100644 --- a/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj +++ b/src/System.Text.RegularExpressions/src/System.Text.RegularExpressions.csproj @@ -4,15 +4,11 @@ {BE28323E-327A-4E0F-B7F9-16AB7EAB59DD} System.Text.RegularExpressions - true - None .NETStandard,Version=v1.6 - - @@ -43,10 +39,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 07441d822dd8..c5ed4668ba3f 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/tests/System.Text.RegularExpressions.Tests.builds b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds index 5befc9b6490c..750003c1d0cc 100644 --- a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds +++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.builds @@ -3,6 +3,10 @@ + + netcoreapp1.1 + netcoreapp1.1 + net463 Windows_NT diff --git a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj index a08079eed340..fa0455cba150 100644 --- a/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj +++ b/src/System.Text.RegularExpressions/tests/System.Text.RegularExpressions.Tests.csproj @@ -9,7 +9,7 @@ Library Properties System.Text.RegularExpressions.Tests - .NETStandard,Version=v1.6 + .NETStandard,Version=v1.6 @@ -22,7 +22,6 @@ - @@ -34,6 +33,9 @@ + + + {be28323e-327a-4e0f-b7f9-16ab7eab59dd} diff --git a/src/System.Text.RegularExpressions/tests/project.json b/src/System.Text.RegularExpressions/tests/project.json index d8efe821894c..c7fd9c22ca9c 100644 --- a/src/System.Text.RegularExpressions/tests/project.json +++ b/src/System.Text.RegularExpressions/tests/project.json @@ -18,7 +18,8 @@ "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00731-01" }, "frameworks": { - "netstandard1.6": {} + "netstandard1.6": {}, + "netcoreapp1.1": {} }, "supports": { "coreFx.Test.netcoreapp1.0": {},