From 84fd491678eee7d797688ff97c3d066d537a687b Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Sep 2020 22:21:41 +0200 Subject: [PATCH 01/26] Update SDK min and target version to >= Preview8 Update the SDK min version to Preview 8 final and update the target version to RC.1 latest. --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 22680d16887670..6e623703dcdb7e 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "5.0.100-preview.8.20362.3", + "version": "5.0.100-preview.8.20417.9", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "5.0.100-preview.8.20362.3" + "dotnet": "5.0.100-rc.1.20454.5" }, "native-tools": { "cmake": "3.14.5", From c6049ac1636104b8b90501ee5c8aa4f30f0585ef Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Sep 2020 22:48:01 +0200 Subject: [PATCH 02/26] fsproj restore workaround --- .../CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj index 94a84ccfa46132..db6de78936f815 100644 --- a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj +++ b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj @@ -2,6 +2,8 @@ $(NetCoreAppCurrent) + + $(NetCoreAppCurrent) From 975d6e2d7ab019cb4e7c2fad20baf72ed91441ac Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Sep 2020 23:02:43 +0200 Subject: [PATCH 03/26] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 6e623703dcdb7e..04b9cb9ad39293 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20431.4", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20453.7, "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.4", From 3ab02c77bcf200e9c32ffdcd43bf0ee93b55af01 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Sep 2020 23:03:00 +0200 Subject: [PATCH 04/26] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 04b9cb9ad39293..5c2eaa98180a11 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20453.7, + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20453.7", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.4", From a275e0f0d26c0491c4639d57d7daaaa48fce1ab3 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Mon, 7 Sep 2020 23:03:25 +0200 Subject: [PATCH 05/26] Update Version.Details.xml --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8df8eda81c1579..da165c7e2c5d3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -46,7 +46,7 @@ https://github.com/dotnet/arcade 6baa6d3c20effeee3631eb33e9e08bcf698a799c - + https://github.com/dotnet/arcade 6baa6d3c20effeee3631eb33e9e08bcf698a799c From 4db55687f5198016d03763e2f0e15fc5e65d239d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Sep 2020 08:12:57 +0200 Subject: [PATCH 06/26] Use RC1 final --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 5c2eaa98180a11..ae60cbdbcc14b6 100644 --- a/global.json +++ b/global.json @@ -5,7 +5,7 @@ "rollForward": "major" }, "tools": { - "dotnet": "5.0.100-rc.1.20454.5" + "dotnet": "5.0.0-rc.1.20451.14" }, "native-tools": { "cmake": "3.14.5", From 33f132ee4ed4354906d49f41402a9431f5228373 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Sep 2020 09:41:07 +0200 Subject: [PATCH 07/26] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index ae60cbdbcc14b6..4855e48d51d989 100644 --- a/global.json +++ b/global.json @@ -5,7 +5,7 @@ "rollForward": "major" }, "tools": { - "dotnet": "5.0.0-rc.1.20451.14" + "dotnet": "5.0.100-rc.1.20453.7" }, "native-tools": { "cmake": "3.14.5", From a9263e5820240d805b9e1b9f61095d1e30e79051 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Sep 2020 09:41:19 +0200 Subject: [PATCH 08/26] Update System.Formats.Cbor.Tests.DataModel.fsproj --- .../CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj index db6de78936f815..d48acc969671b2 100644 --- a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj +++ b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj @@ -2,8 +2,6 @@ $(NetCoreAppCurrent) - - $(NetCoreAppCurrent) @@ -15,4 +13,4 @@ - \ No newline at end of file + From ebad5f894aaf751020613ce9f70d525ec0ce2e61 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Sep 2020 09:41:31 +0200 Subject: [PATCH 09/26] Update System.Formats.Cbor.Tests.DataModel.fsproj From c474c4ee806c8592191cce7f0beda8287b5bfd19 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Sep 2020 10:00:35 +0200 Subject: [PATCH 10/26] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 4855e48d51d989..ae60cbdbcc14b6 100644 --- a/global.json +++ b/global.json @@ -5,7 +5,7 @@ "rollForward": "major" }, "tools": { - "dotnet": "5.0.100-rc.1.20453.7" + "dotnet": "5.0.0-rc.1.20451.14" }, "native-tools": { "cmake": "3.14.5", From c4debb6909613858b212a1a292c85265413aad76 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Sep 2020 10:22:39 +0200 Subject: [PATCH 11/26] Update global.json --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index ae60cbdbcc14b6..5c2eaa98180a11 100644 --- a/global.json +++ b/global.json @@ -5,7 +5,7 @@ "rollForward": "major" }, "tools": { - "dotnet": "5.0.0-rc.1.20451.14" + "dotnet": "5.0.100-rc.1.20454.5" }, "native-tools": { "cmake": "3.14.5", From 47a794fe13a3ee40c7628df0a8c69a4a739f9106 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 8 Sep 2020 10:53:06 +0200 Subject: [PATCH 12/26] Update System.Formats.Cbor.Tests.DataModel.fsproj --- .../CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj index d48acc969671b2..d534e0901a84ed 100644 --- a/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj +++ b/src/libraries/System.Formats.Cbor/tests/CborDocument/System.Formats.Cbor.Tests.DataModel.fsproj @@ -2,6 +2,8 @@ $(NetCoreAppCurrent) + + $(NetCoreAppCurrent) From 3522470c3cfa6f221117c5210dcfae35fa30279e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 11:07:24 +0200 Subject: [PATCH 13/26] Update TargetFramework.Sdk --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 5c2eaa98180a11..0eda4f2eab99ae 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20453.7", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20459.1", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4", "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20452.6", "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20431.4", From 231146b470bcbf3236e8b664c5c0bd156ee1b2d0 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 13:56:59 +0200 Subject: [PATCH 14/26] Remove duplicate ProjectReference --- .../src/System.Utf8String.Experimental.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj index a39ac2bc6a8c83..8b72b9161c5571 100644 --- a/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj +++ b/src/libraries/System.Utf8String.Experimental/src/System.Utf8String.Experimental.csproj @@ -122,7 +122,6 @@ - From b313c2ff2430c7c448b3b40f0fd99debeac96389 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 13:57:25 +0200 Subject: [PATCH 15/26] Remove unnecessary CoreLib project build in src.proj --- src/libraries/src.proj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/libraries/src.proj b/src/libraries/src.proj index 956513dc724b81..254d2383fa3557 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -9,8 +9,7 @@ Exclude="@(ProjectExclusions)" /> - From 4bf222903370993034a36ec32fb2a04fbe03caf7 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 13:57:43 +0200 Subject: [PATCH 16/26] Move EOL check to an installer test aware location --- Directory.Build.props | 3 --- eng/Configurations.props | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 8db16f4343034e..e4d1872cb981c6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -110,9 +110,6 @@ Properties $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) - - - false diff --git a/eng/Configurations.props b/eng/Configurations.props index 3d123f81972aef..80d9992f8bcb2b 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -68,5 +68,7 @@ true true + + false From 907254ee1b2f369bf085c095e8e1aa736dc38f8e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 13:59:41 +0200 Subject: [PATCH 17/26] Disable EOL compat check for packaging testing --- eng/Configurations.props | 2 +- src/libraries/pkg/test/props/Directory.Build.props | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/Configurations.props b/eng/Configurations.props index 80d9992f8bcb2b..532b746ab660af 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -68,7 +68,7 @@ true true - + false diff --git a/src/libraries/pkg/test/props/Directory.Build.props b/src/libraries/pkg/test/props/Directory.Build.props index 537832e4ac1b1c..71582b21b95a87 100644 --- a/src/libraries/pkg/test/props/Directory.Build.props +++ b/src/libraries/pkg/test/props/Directory.Build.props @@ -2,5 +2,7 @@ false true + + false From b86b2f031e7c99ed91f54639504769b44e7b5705 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 14:30:50 +0200 Subject: [PATCH 18/26] Revert "Remove unnecessary CoreLib project build in src.proj" This reverts commit b313c2ff2430c7c448b3b40f0fd99debeac96389. --- src/libraries/src.proj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libraries/src.proj b/src/libraries/src.proj index 254d2383fa3557..956513dc724b81 100644 --- a/src/libraries/src.proj +++ b/src/libraries/src.proj @@ -9,7 +9,8 @@ Exclude="@(ProjectExclusions)" /> - From 1f77b3a7455945216106f57a6cd3de91a3d74ae8 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 15:25:57 +0200 Subject: [PATCH 19/26] Update tfm in fsproj --- src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj b/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj index 0a9d97a4ebc215..eb084ad00ccad4 100644 --- a/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj +++ b/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj @@ -7,7 +7,7 @@ True True True - netcoreapp3.1 + $(NetCoreAppCurrent) From 322b8f716a1795d273864febb56f37fd26b2c87e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 16:24:01 +0200 Subject: [PATCH 20/26] EOL packaging --- src/libraries/pkg/test/project.csproj.template | 2 ++ src/libraries/pkg/test/props/Directory.Build.props | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template index d78e15378e061e..dec755e6dbb9aa 100644 --- a/src/libraries/pkg/test/project.csproj.template +++ b/src/libraries/pkg/test/project.csproj.template @@ -5,6 +5,8 @@ {RIDs} {PackageId} {PackageVersion} + + false $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support diff --git a/src/libraries/pkg/test/props/Directory.Build.props b/src/libraries/pkg/test/props/Directory.Build.props index 71582b21b95a87..537832e4ac1b1c 100644 --- a/src/libraries/pkg/test/props/Directory.Build.props +++ b/src/libraries/pkg/test/props/Directory.Build.props @@ -2,7 +2,5 @@ false true - - false From 1fce71eb1ce2292a2c0ffda4fbe458d7bc00fcc9 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 20:08:49 +0200 Subject: [PATCH 21/26] Set TargetPlatformMinVersion for netcore5.0 --- .../pkg/test/frameworkSettings/netcore5.0/settings.targets | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 src/libraries/pkg/test/frameworkSettings/netcore5.0/settings.targets diff --git a/src/libraries/pkg/test/frameworkSettings/netcore5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcore5.0/settings.targets new file mode 100644 index 00000000000000..b54cf42617011d --- /dev/null +++ b/src/libraries/pkg/test/frameworkSettings/netcore5.0/settings.targets @@ -0,0 +1,5 @@ + + + 10.0.0 + + \ No newline at end of file From 5b289badc10c245d99c89f887b02ffb48d5f57b6 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 20:12:20 +0200 Subject: [PATCH 22/26] Fix tfm for netcore50 --- .../frameworkSettings/{netcore5.0 => netcore50}/settings.targets | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/libraries/pkg/test/frameworkSettings/{netcore5.0 => netcore50}/settings.targets (100%) diff --git a/src/libraries/pkg/test/frameworkSettings/netcore5.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets similarity index 100% rename from src/libraries/pkg/test/frameworkSettings/netcore5.0/settings.targets rename to src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets From 7b2b88e86d8db4c95122c48f9455d40c57007839 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 21:57:28 +0200 Subject: [PATCH 23/26] Add portable infered props --- .../portable-net45+win8+wp8+wpa81/settings.targets | 7 +++++++ .../portable-net45+win8+wpa81/settings.targets | 7 +++++++ .../frameworkSettings/portable-net45+win8/settings.targets | 7 +++++++ 3 files changed, 21 insertions(+) create mode 100644 src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets create mode 100644 src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets create mode 100644 src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets diff --git a/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets new file mode 100644 index 00000000000000..72095adf9916ef --- /dev/null +++ b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wp8+wpa81/settings.targets @@ -0,0 +1,7 @@ + + + .NETPortable + v4.5 + Profile259 + + \ No newline at end of file diff --git a/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets new file mode 100644 index 00000000000000..77255b7800253a --- /dev/null +++ b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8+wpa81/settings.targets @@ -0,0 +1,7 @@ + + + .NETPortable + v4.5 + Profile111 + + \ No newline at end of file diff --git a/src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets new file mode 100644 index 00000000000000..e488ebf9aa53af --- /dev/null +++ b/src/libraries/pkg/test/frameworkSettings/portable-net45+win8/settings.targets @@ -0,0 +1,7 @@ + + + .NETPortable + v4.5 + Profile7 + + \ No newline at end of file From 730925be38993bea32f9245d0dfc72e02bd4b012 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 23:39:31 +0200 Subject: [PATCH 24/26] Add two more portable props --- .../portable45-net45+win8/settings.targets | 7 +++++++ .../portable46-net451+win81/settings.targets | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100644 src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets create mode 100644 src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets diff --git a/src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets new file mode 100644 index 00000000000000..e488ebf9aa53af --- /dev/null +++ b/src/libraries/pkg/test/frameworkSettings/portable45-net45+win8/settings.targets @@ -0,0 +1,7 @@ + + + .NETPortable + v4.5 + Profile7 + + \ No newline at end of file diff --git a/src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets b/src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets new file mode 100644 index 00000000000000..463ffc65f149fa --- /dev/null +++ b/src/libraries/pkg/test/frameworkSettings/portable46-net451+win81/settings.targets @@ -0,0 +1,7 @@ + + + .NETPortable + v4.6 + Profile44 + + \ No newline at end of file From a9a429263b7abbd569fb5fe5c4e8228e717a1e39 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 9 Sep 2020 23:48:47 +0200 Subject: [PATCH 25/26] Fix frameworksettings and packagesettings lookup --- src/libraries/pkg/test/packageTest.targets | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/libraries/pkg/test/packageTest.targets b/src/libraries/pkg/test/packageTest.targets index 4aa0b3ee83d30e..53f608f825105e 100644 --- a/src/libraries/pkg/test/packageTest.targets +++ b/src/libraries/pkg/test/packageTest.targets @@ -3,6 +3,8 @@ <_targetFrameworkVersionIndex>$(TargetFramework.IndexOfAny(".-0123456789")) <_targetFrameworkIdentifier Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(TargetFramework.SubString(0, $(_targetFrameworkVersionIndex))) + + <_targetFrameworkIdentifier Condition="'$(_targetFrameworkIdentifier)' == 'net' and !$(TargetFramework.StartsWith('net4'))">netcoreapp $(MSBuildThisFileDirectory)tools\ From 27079df50717816b4ffc506a51009836ee95852e Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 10 Sep 2020 09:10:07 +0200 Subject: [PATCH 26/26] Fix package settings for Utf8String --- .../netcoreapp/DisableVerifyClosure.targets | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets diff --git a/src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets b/src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets new file mode 100644 index 00000000000000..a5776c43914482 --- /dev/null +++ b/src/libraries/pkg/test/packageSettings/System.Utf8String.Experimental/netcoreapp/DisableVerifyClosure.targets @@ -0,0 +1,7 @@ + + + + false + + \ No newline at end of file