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..532b746ab660af 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -68,5 +68,7 @@ true true + + false 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 diff --git a/global.json b/global.json index 22680d16887670..0eda4f2eab99ae 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "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", "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.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", 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..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) @@ -13,4 +15,4 @@ - \ No newline at end of file + 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 @@ - diff --git a/src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets b/src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets new file mode 100644 index 00000000000000..b54cf42617011d --- /dev/null +++ b/src/libraries/pkg/test/frameworkSettings/netcore50/settings.targets @@ -0,0 +1,5 @@ + + + 10.0.0 + + \ No newline at end of file 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 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 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 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\ 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/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)