diff --git a/Directory.Build.targets b/Directory.Build.targets index e4c7e1d21a574..9d18986a3f870 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -22,4 +22,27 @@ $(MajorVersion).$(MinorVersion) + + + + + + diff --git a/eng/Configurations.props b/eng/Configurations.props index 532b746ab660a..352e32f6cab0d 100644 --- a/eng/Configurations.props +++ b/eng/Configurations.props @@ -21,10 +21,15 @@ TODO: Update to $(MajorVersion).$(MinorVersion) when all sub-repos import Arcade at the beginning (SkipImportArcadeSdkFromRoot=false). --> - 5.0 + 6.0 + 5.0 + 5.0 .NETCoreApp $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppCurrentVersion) net$(NetCoreAppCurrentVersion) + net$(AspNetCoreAppCurrentVersion) + net$(NetCoreAppToolCurrentVersion) + $(NetCoreAppCurrentIdentifier),Version=v$(NetCoreAppToolCurrentVersion) $(NetCoreAppCurrent) Microsoft.NETCore.App diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 468d83ad25399..e9c92b7a74184 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -38,9 +38,9 @@ https://github.com/dotnet/arcade 61cde6e8fb9d5c9790867b279deb41783a780cd8 - + https://github.com/dotnet/arcade - 61cde6e8fb9d5c9790867b279deb41783a780cd8 + b6d0e8c2a27c94adc20bd97cf248d6522d20bf08 https://github.com/dotnet/arcade @@ -158,9 +158,9 @@ https://github.com/dotnet/llvm-project 67ada402f1f9e16199e876a1cab1649debe28eab - + https://github.com/dotnet/runtime - 0375524a91a47ca4db3ee1be548f74bab7e26e76 + 38017c3935de95d0335bac04f4901ddfc2718656 https://github.com/dotnet/runtime @@ -182,9 +182,9 @@ https://github.com/dotnet/runtime bdfbf0cf85878673a80d7822cc11bde5c9fda30c - + https://github.com/dotnet/runtime - 0375524a91a47ca4db3ee1be548f74bab7e26e76 + 38017c3935de95d0335bac04f4901ddfc2718656 https://github.com/mono/linker diff --git a/eng/Versions.props b/eng/Versions.props index 7fb3fa583dde6..6796239bcef1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 5.0.0-beta.20474.4 5.0.0-beta.20474.4 2.5.1-beta.20474.4 - 5.0.0-beta.20474.4 + 5.0.0-beta.20501.10 5.0.0-beta.20474.4 5.0.0-beta.20474.4 - 5.0.0-preview.4.20202.18 + 5.0.0-rc.1.20451.14 6.0.0-alpha.1.20501.4 6.0.0-alpha.1.20501.4 3.1.0 @@ -93,7 +93,7 @@ 4.7.0 4.7.0 4.7.0 - 5.0.0-preview.4.20202.18 + 5.0.0-rc.1.20451.14 4.3.0 4.5.4 4.5.0 diff --git a/eng/build.ps1 b/eng/build.ps1 index 6f030f298f767..3897475e47b88 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -68,8 +68,8 @@ function Get-Help() { Write-Host "Libraries settings:" Write-Host " -allconfigurations Build packages for all build configurations." Write-Host " -coverage Collect code coverage when testing." - Write-Host " -framework (-f) Build framework: net5.0 or net48." - Write-Host " [Default: net5.0]" + Write-Host " -framework (-f) Build framework: net6.0 or net48." + Write-Host " [Default: net6.0]" Write-Host " -testnobuild Skip building tests when invoking -test." Write-Host " -testscope Scope tests, allowed values: innerloop, outerloop, all." Write-Host "" diff --git a/eng/build.sh b/eng/build.sh index 1179f8efd27a1..03dd722b8a633 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -62,8 +62,8 @@ usage() echo "Libraries settings:" echo " --allconfigurations Build packages for all build configurations." echo " --coverage Collect code coverage when testing." - echo " --framework (-f) Build framework: net5.0 or net48." - echo " [Default: net5.0]" + echo " --framework (-f) Build framework: net6.0 or net48." + echo " [Default: net6.0]" echo " --testnobuild Skip building tests when invoking -test." echo " --testscope Test scope, allowed values: innerloop, outerloop, all." echo "" diff --git a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile index b0bf080d8ff3d..08adb4359e05c 100644 --- a/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.linux.Dockerfile @@ -14,7 +14,7 @@ RUN ./src/coreclr/build.sh -release -skiptests -clang9 && \ FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=/repo/artifacts/bin/testhost -ARG TFM=net5.0 +ARG TFM=net6.0 ARG OS=Linux ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile index 6e860466a1b4d..584c1e838e668 100644 --- a/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile +++ b/eng/docker/libraries-sdk-aspnetcore.windows.Dockerfile @@ -4,7 +4,7 @@ ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:5.0-nanoserver-1809 FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=".\\artifacts\\bin\\testhost" -ARG TFM=net5.0 +ARG TFM=net6.0 ARG OS=Windows_NT ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile index 4f1cb5185a35b..1d704ecbc42b3 100644 --- a/eng/docker/libraries-sdk.linux.Dockerfile +++ b/eng/docker/libraries-sdk.linux.Dockerfile @@ -13,7 +13,7 @@ RUN ./build.sh -ci -subset clr+libs -runtimeconfiguration release -c $CONFIGURAT FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=/repo/artifacts/bin/testhost -ARG TFM=net5.0 +ARG TFM=net6.0 ARG OS=Linux ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/docker/libraries-sdk.windows.Dockerfile b/eng/docker/libraries-sdk.windows.Dockerfile index e88f52d7ce7e3..adbf17302fefa 100644 --- a/eng/docker/libraries-sdk.windows.Dockerfile +++ b/eng/docker/libraries-sdk.windows.Dockerfile @@ -4,7 +4,7 @@ ARG SDK_BASE_IMAGE=mcr.microsoft.com/dotnet/nightly/sdk:5.0-nanoserver-1809 FROM $SDK_BASE_IMAGE as target ARG TESTHOST_LOCATION=".\\artifacts\\bin\\testhost" -ARG TFM=net5.0 +ARG TFM=net6.0 ARG OS=Windows_NT ARG ARCH=x64 ARG CONFIGURATION=Release diff --git a/eng/pipelines/coreclr/templates/perf-job.yml b/eng/pipelines/coreclr/templates/perf-job.yml index 3b887d459d80e..b6101f39dc193 100644 --- a/eng/pipelines/coreclr/templates/perf-job.yml +++ b/eng/pipelines/coreclr/templates/perf-job.yml @@ -5,7 +5,7 @@ parameters: osSubgroup: '' container: '' runtimeVariant: '' - framework: net5.0 # Specify the appropriate framework when running release branches (ie netcoreapp3.0 for release/3.0) + framework: net6.0 # Specify the appropriate framework when running release branches (ie netcoreapp3.0 for release/3.0) liveLibrariesBuildConfig: '' variables: {} runtimeType: 'coreclr' diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 2ae778e893939..3da0d03360919 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -4,7 +4,7 @@ parameters: archType: '' osSubgroup: '' crossrootfsDir: '' - framework: 'net5.0' + framework: 'net6.0' isOfficialAllConfigurations: false isSourceBuild: false liveRuntimeBuildConfig: '' diff --git a/eng/pipelines/libraries/build-job.yml b/eng/pipelines/libraries/build-job.yml index fc704bfd15c1c..820247b1cc213 100644 --- a/eng/pipelines/libraries/build-job.yml +++ b/eng/pipelines/libraries/build-job.yml @@ -5,7 +5,7 @@ parameters: archType: '' targetRid: '' crossrootfsDir: '' - framework: 'net5.0' + framework: 'net6.0' isOfficialBuild: false isOfficialAllConfigurations: false runtimeVariant: '' diff --git a/eng/pipelines/libraries/run-test-job.yml b/eng/pipelines/libraries/run-test-job.yml index 91754250c4a5d..866be5076c784 100644 --- a/eng/pipelines/libraries/run-test-job.yml +++ b/eng/pipelines/libraries/run-test-job.yml @@ -4,7 +4,7 @@ parameters: osSubgroup: '' archType: '' targetRid: '' - framework: 'net5.0' + framework: 'net6.0' isOfficialBuild: false liveRuntimeBuildConfig: '' runtimeFlavor: 'coreclr' diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets index a9dfda8012d9f..3318b0f4010f6 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.targets +++ b/eng/testing/linker/SupportFiles/Directory.Build.targets @@ -33,4 +33,23 @@ + + + + + + diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template index 0446be76b0721..d335783fc44fc 100644 --- a/eng/testing/linker/project.csproj.template +++ b/eng/testing/linker/project.csproj.template @@ -6,6 +6,7 @@ {RuntimeIdentifier} {RuntimePackDir} {TargetingPackDir} + {NetCoreAppMaximumVersion} IL2026 diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets index 6d89002d9e0c6..4a9152fbd5f97 100644 --- a/eng/testing/linker/trimmingTests.targets +++ b/eng/testing/linker/trimmingTests.targets @@ -74,6 +74,7 @@ ILCompiler.TypeSystem.ReadyToRun.Tests - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) Debug;Release;Checked true diff --git a/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj b/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj index 16e3b92d0b203..356c2b0eee5f7 100644 --- a/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj +++ b/src/coreclr/src/tools/aot/crossgen2/crossgen2.csproj @@ -3,7 +3,7 @@ crossgen2 true Exe - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) 8002,NU1701 x64;x86;arm64;arm AnyCPU diff --git a/src/coreclr/src/tools/dotnet-pgo/dotnet-pgo.csproj b/src/coreclr/src/tools/dotnet-pgo/dotnet-pgo.csproj index 7c4fecff51c96..8dcb83dc3ec2a 100644 --- a/src/coreclr/src/tools/dotnet-pgo/dotnet-pgo.csproj +++ b/src/coreclr/src/tools/dotnet-pgo/dotnet-pgo.csproj @@ -3,7 +3,7 @@ dotnet-pgo Exe - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) true 8.0 $(RuntimeBinDir)/dotnet-pgo diff --git a/src/coreclr/src/tools/r2rdump/R2RDump.csproj b/src/coreclr/src/tools/r2rdump/R2RDump.csproj index c717f47230d07..0b575b257ff2a 100644 --- a/src/coreclr/src/tools/r2rdump/R2RDump.csproj +++ b/src/coreclr/src/tools/r2rdump/R2RDump.csproj @@ -7,7 +7,7 @@ AnyCPU Open true - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) false 8002,NU1701 win-x64;win-x86 diff --git a/src/coreclr/src/tools/r2rtest/R2RTest.csproj b/src/coreclr/src/tools/r2rtest/R2RTest.csproj index 1d907189690bc..a0900133f05c4 100644 --- a/src/coreclr/src/tools/r2rtest/R2RTest.csproj +++ b/src/coreclr/src/tools/r2rtest/R2RTest.csproj @@ -3,7 +3,7 @@ R2RTest true Exe - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) 8002,NU1701 AnyCPU $(RuntimeBinDir)\R2RTest diff --git a/src/coreclr/src/tools/runincontext/runincontext.csproj b/src/coreclr/src/tools/runincontext/runincontext.csproj index 0b91c402f8c60..14a0a2cf31087 100644 --- a/src/coreclr/src/tools/runincontext/runincontext.csproj +++ b/src/coreclr/src/tools/runincontext/runincontext.csproj @@ -1,7 +1,7 @@ Exe - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) $(MicrosoftNETCoreAppVersion) false BuildOnly diff --git a/src/installer/tests/Assets/TestProjects/HammerServiceApp/Location/Location.csproj b/src/installer/tests/Assets/TestProjects/HammerServiceApp/Location/Location.csproj index f208d303c9811..77439bfe0c2fe 100644 --- a/src/installer/tests/Assets/TestProjects/HammerServiceApp/Location/Location.csproj +++ b/src/installer/tests/Assets/TestProjects/HammerServiceApp/Location/Location.csproj @@ -1,7 +1,7 @@ - net5.0 + $(NetCoreAppCurrent) diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.targets b/src/installer/tests/Assets/TestUtils/TestProjects.targets index 32180ba2f700d..c2f8656852158 100644 --- a/src/installer/tests/Assets/TestUtils/TestProjects.targets +++ b/src/installer/tests/Assets/TestUtils/TestProjects.targets @@ -3,5 +3,27 @@ This file is imported by the test projects from the artifacts dir or the src/tests dir. It provides basic info needed for restore and build with the vanilla SDK. --> + + $(NetCoreAppCurrentVersion) + + + + + + + diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh index fb8b183403eb5..1a8245535e153 100755 --- a/src/libraries/Native/build-native.sh +++ b/src/libraries/Native/build-native.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -usage_list=("-outconfig: Configuration, typically a quadruplet such as 'net5.0-Linux-Release-x64', used to name output directory.") +usage_list=("-outconfig: Configuration, typically a quadruplet such as 'net6.0-Linux-Release-x64', used to name output directory.") usage_list+=("-staticLibLink: Optional argument to statically link any native library.") __scriptpath="$(cd "$(dirname "$0")"; pwd -P)" diff --git a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj index 37e96e45e2257..54b524e874c05 100644 --- a/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/ref/System.Net.Http.Json.csproj @@ -1,6 +1,7 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 + true enable @@ -18,4 +19,9 @@ + + + + + diff --git a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj index b12e579bbe4b8..1033fd0d89595 100644 --- a/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj +++ b/src/libraries/System.Net.Http.Json/src/System.Net.Http.Json.csproj @@ -1,6 +1,7 @@ - $(NetCoreAppCurrent);netstandard2.0;net461 + $(NetCoreAppCurrent);net5.0;netstandard2.0;net461 + true enable @@ -10,7 +11,7 @@ - + @@ -21,7 +22,7 @@ - + diff --git a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj index f8b4eb6709a2d..c6435ddeec7df 100644 --- a/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/ref/System.Security.Permissions.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent);netstandard2.0;net461;netcoreapp3.0 + net5.0;netstandard2.0;net461;netcoreapp3.0 @@ -14,7 +14,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj index d51a2ae77f46d..7fdbf99cc2dbb 100644 --- a/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj +++ b/src/libraries/System.Security.Permissions/src/System.Security.Permissions.csproj @@ -1,7 +1,8 @@ true - $(NetCoreAppCurrent);netcoreapp3.0;netstandard2.0;net461 + $(NetCoreAppCurrent);net5.0;netcoreapp3.0;netstandard2.0;net461 + true @@ -182,7 +183,7 @@ - + @@ -207,7 +208,7 @@ - + diff --git a/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets b/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets new file mode 100644 index 0000000000000..963688564b767 --- /dev/null +++ b/src/libraries/pkg/test/frameworkSettings/net6.0/settings.targets @@ -0,0 +1,18 @@ + + + $(MicrosoftNETCoreAppVersion) + + + + + + \ No newline at end of file diff --git a/src/libraries/pkg/test/project.csproj.template b/src/libraries/pkg/test/project.csproj.template index dec755e6dbb9a..0eaabeb356c3c 100644 --- a/src/libraries/pkg/test/project.csproj.template +++ b/src/libraries/pkg/test/project.csproj.template @@ -7,10 +7,11 @@ {PackageVersion} false + 99.0 $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.props))\support - + diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj index bfb6304de49b9..4a7910878f503 100644 --- a/src/libraries/shims/ApiCompat.proj +++ b/src/libraries/shims/ApiCompat.proj @@ -5,9 +5,9 @@ $(NetCoreAppCurrent) false - netcoreapp3.1 + net5.0 microsoft.netcore.app.ref - 3.1.0 + 5.0.0-rc.1.20451.14 @@ -111,7 +111,7 @@ <_previousNetCoreAppBaselineParam Condition="'$(UpdatePreviousNetCoreAppBaseline)' == 'true'">> "$(_previousNetCoreAppBaselineFile)" - + ' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Runtime.InteropServices.WindowsRuntime.IActivationFactory' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Runtime.InteropServices.WindowsRuntime.InterfaceImplementedInVersionAttribute' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Runtime.InteropServices.WindowsRuntime.ReadOnlyArrayAttribute' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Runtime.InteropServices.WindowsRuntime.ReturnValueNameAttribute' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Runtime.InteropServices.WindowsRuntime.WindowsRuntimeMarshal' does not exist in the implementation but it does exist in the contract. -TypesMustExist : Type 'System.Runtime.InteropServices.WindowsRuntime.WriteOnlyArrayAttribute' does not exist in the implementation but it does exist in the contract. -Compat issues with assembly System.Text.Json: -CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Text.Json.Serialization.JsonConverterAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Struct, AllowMultiple=false)]' in the implementation. -CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Text.Json.Serialization.JsonExtensionDataAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Property, AllowMultiple=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple=false)]' in the implementation. -CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Text.Json.Serialization.JsonIgnoreAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Property, AllowMultiple=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple=false)]' in the implementation. -CannotChangeAttribute : Attribute 'System.AttributeUsageAttribute' on 'System.Text.Json.Serialization.JsonPropertyNameAttribute' changed from '[AttributeUsageAttribute(AttributeTargets.Property, AllowMultiple=false)]' in the contract to '[AttributeUsageAttribute(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple=false)]' in the implementation. -Total Issues: 172 +CannotChangeAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' on 'System.Diagnostics.Process.MaxWorkingSet.set(System.IntPtr)' changed from '[SupportedOSPlatformAttribute("windows")]' in the contract to '[SupportedOSPlatformAttribute("freebsd")]' in the implementation. +CannotChangeAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' on 'System.Diagnostics.Process.MinWorkingSet.set(System.IntPtr)' changed from '[SupportedOSPlatformAttribute("windows")]' in the contract to '[SupportedOSPlatformAttribute("freebsd")]' in the implementation. +CannotChangeAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' on 'System.Diagnostics.Process.MaxWorkingSet.set(System.IntPtr)' changed from '[SupportedOSPlatformAttribute("windows")]' in the contract to '[SupportedOSPlatformAttribute("freebsd")]' in the implementation. +CannotChangeAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' on 'System.Diagnostics.Process.MinWorkingSet.set(System.IntPtr)' changed from '[SupportedOSPlatformAttribute("windows")]' in the contract to '[SupportedOSPlatformAttribute("freebsd")]' in the implementation. +CannotChangeAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' on 'System.Diagnostics.Process.MaxWorkingSet.set(System.IntPtr)' changed from '[SupportedOSPlatformAttribute("windows")]' in the contract to '[SupportedOSPlatformAttribute("freebsd")]' in the implementation. +CannotChangeAttribute : Attribute 'System.Runtime.Versioning.SupportedOSPlatformAttribute' on 'System.Diagnostics.Process.MinWorkingSet.set(System.IntPtr)' changed from '[SupportedOSPlatformAttribute("windows")]' in the contract to '[SupportedOSPlatformAttribute("freebsd")]' in the implementation. +Compat issues with assembly System.Net.Http: +MembersMustExist : Member 'public System.Net.Connections.ConnectionFactory System.Net.Http.SocketsHttpHandler.ConnectionFactory.get()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public void System.Net.Http.SocketsHttpHandler.ConnectionFactory.set(System.Net.Connections.ConnectionFactory)' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public System.Func> System.Net.Http.SocketsHttpHandler.PlaintextFilter.get()' does not exist in the implementation but it does exist in the contract. +MembersMustExist : Member 'public void System.Net.Http.SocketsHttpHandler.PlaintextFilter.set(System.Func>)' does not exist in the implementation but it does exist in the contract. +Compat issues with assembly System.Net.Primitives: +TypesMustExist : Type 'System.Net.NetworkError' does not exist in the implementation but it does exist in the contract. +TypesMustExist : Type 'System.Net.NetworkException' does not exist in the implementation but it does exist in the contract. +Total Issues: 12 \ No newline at end of file diff --git a/src/mono/wasm/Makefile b/src/mono/wasm/Makefile index 12f1962920fd9..10a8890a05c6f 100644 --- a/src/mono/wasm/Makefile +++ b/src/mono/wasm/Makefile @@ -13,7 +13,7 @@ BINDIR?=$(TOP)/artifacts/bin OBJDIR?=$(TOP)/artifacts/obj PINVOKE_TABLE?=$(TOP)/artifacts/obj/wasm/pinvoke-table.h MONO_BIN_DIR?=$(BINDIR)/mono/Browser.wasm.$(CONFIG) -NATIVE_BIN_DIR?=$(BINDIR)/native/net5.0-Browser-$(CONFIG)-wasm +NATIVE_BIN_DIR?=$(BINDIR)/native/net6.0-Browser-$(CONFIG)-wasm ICU_LIBDIR?= SYSTEM_NATIVE_LIBDIR?=$(TOP)/src/libraries/Native/Unix/System.Native ENABLE_ES6?=false diff --git a/src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj b/src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj index 5f8b53f269ddd..66d0b287f7655 100644 --- a/src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj +++ b/src/mono/wasm/debugger/BrowserDebugHost/BrowserDebugHost.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent) + $(AspNetCoreAppCurrent) true $(NoWarn),CA2007 diff --git a/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj b/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj index 1ca220bc558f6..0c3b96764ccee 100644 --- a/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj +++ b/src/mono/wasm/debugger/BrowserDebugProxy/BrowserDebugProxy.csproj @@ -1,7 +1,7 @@  - $(NetCoreAppCurrent) + $(AspNetCoreAppCurrent) $(NoWarn),CA2007 diff --git a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj index cded4a2b78a26..1845a3ff9f68b 100644 --- a/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj +++ b/src/mono/wasm/debugger/DebuggerTestSuite/DebuggerTestSuite.csproj @@ -1,7 +1,7 @@ - $(NetCoreAppCurrent) + $(AspNetCoreAppCurrent) true false diff --git a/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj b/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj index 6f44146218fa7..a11794c5bc893 100644 --- a/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj +++ b/src/mono/wasm/debugger/tests/debugger-test/debugger-test.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(AspNetCoreAppCurrent) wasm Browser $(ArtifactsBinDir)microsoft.netcore.app.runtime.browser-wasm\Release\runtimes\browser-wasm\ diff --git a/src/mono/wasm/debugger/tests/lazy-debugger-test-embedded/lazy-debugger-test-embedded.csproj b/src/mono/wasm/debugger/tests/lazy-debugger-test-embedded/lazy-debugger-test-embedded.csproj index 82695018ed25a..4d1fd21a5f531 100644 --- a/src/mono/wasm/debugger/tests/lazy-debugger-test-embedded/lazy-debugger-test-embedded.csproj +++ b/src/mono/wasm/debugger/tests/lazy-debugger-test-embedded/lazy-debugger-test-embedded.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(AspNetCoreAppCurrent) wasm Browser $(ArtifactsBinDir)microsoft.netcore.app.runtime.browser-wasm\Release\runtimes\browser-wasm\ diff --git a/src/mono/wasm/debugger/tests/lazy-debugger-test/lazy-debugger-test.csproj b/src/mono/wasm/debugger/tests/lazy-debugger-test/lazy-debugger-test.csproj index 74b2cdfb686d2..e1d365b85b3c9 100644 --- a/src/mono/wasm/debugger/tests/lazy-debugger-test/lazy-debugger-test.csproj +++ b/src/mono/wasm/debugger/tests/lazy-debugger-test/lazy-debugger-test.csproj @@ -1,6 +1,6 @@ - $(NetCoreAppCurrent) + $(AspNetCoreAppCurrent) wasm Browser $(ArtifactsBinDir)microsoft.netcore.app.runtime.browser-wasm\Release\runtimes\browser-wasm\ diff --git a/src/tests/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/src/tests/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj index d2a9fa4a2ce0f..bcf8a159d45b1 100644 --- a/src/tests/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj +++ b/src/tests/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj @@ -5,7 +5,7 @@ BuildOnly true false - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) diff --git a/src/tests/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj b/src/tests/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj index f5206a8e72706..457206e7b404c 100644 --- a/src/tests/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj +++ b/src/tests/Common/Coreclr.TestWrapper/Coreclr.TestWrapper.csproj @@ -2,8 +2,8 @@ true - $(NetCoreAppCurrentTargetFrameworkMoniker) - $(NetCoreAppCurrent) + $(NetCoreAppCurrentToolTargetFrameworkMoniker) + $(NetCoreAppToolCurrent) false diff --git a/src/tests/Common/dir.sdkbuild.props b/src/tests/Common/dir.sdkbuild.props index 483b2c91772ce..0dad8ebf363bb 100644 --- a/src/tests/Common/dir.sdkbuild.props +++ b/src/tests/Common/dir.sdkbuild.props @@ -6,7 +6,7 @@ and old-style projects should go in dir.common.props. --> - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) false false AnyCPU diff --git a/src/tests/Common/external/external.csproj b/src/tests/Common/external/external.csproj index b27853bfbf4a7..e889fb69383f4 100644 --- a/src/tests/Common/external/external.csproj +++ b/src/tests/Common/external/external.csproj @@ -12,9 +12,7 @@ This RID value doesn't really matter, since the assets we are copying are not RID specific, so defaulting to Windows here --> $(TargetingPackPath) - $(NetCoreAppCurrent) - $(NetCoreAppCurrentTargetFrameworkMoniker) - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) win7-x86;win7-x64 netcoreapp2.1 SharedLibrary diff --git a/src/tests/Common/scripts/run-corefx-tests.py b/src/tests/Common/scripts/run-corefx-tests.py deleted file mode 100644 index 886bbc513ab1b..0000000000000 --- a/src/tests/Common/scripts/run-corefx-tests.py +++ /dev/null @@ -1,443 +0,0 @@ -#!/usr/bin/env python -# -# Licensed to the .NET Foundation under one or more agreements. -# The .NET Foundation licenses this file to you under the MIT license. -# -########################################################################## -########################################################################## -# -# Module: run-corefx-tests.py -# -# Notes: -# -# Script to clone the CoreFx repo, build, and run its tests. -# -########################################################################## -########################################################################## - -import argparse -import distutils.dir_util -import os -import re -import shutil -import subprocess -import sys - - -########################################################################## -# Globals -########################################################################## - -testing = False - -Corefx_url = 'https://github.com/dotnet/corefx.git' - -# This should be factored out of build.sh -Unix_name_map = { - 'Linux': 'Linux', - 'Darwin': 'OSX', - 'FreeBSD': 'FreeBSD', - 'OpenBSD': 'OpenBSD', - 'NetBSD': 'NetBSD', - 'SunOS': 'SunOS' -} - -Is_windows = (os.name == 'nt') - -########################################################################## -# Delete protocol -########################################################################## - -def del_rw(action, name, exc): - os.chmod(name, 0o651) - os.remove(name) - -########################################################################## -# Argument Parser -########################################################################## - -description = 'Tool to facilitate running CoreFx tests from the CoreCLR repo' - -parser = argparse.ArgumentParser(description=description) - -parser.add_argument('-arch', dest='arch', default='x64') -parser.add_argument('-ci_arch', dest='ci_arch', default=None) -parser.add_argument('-build_type', dest='build_type', default='Debug') -parser.add_argument('-clr_root', dest='clr_root', default=None) -parser.add_argument('-fx_root', dest='fx_root', default=None) -parser.add_argument('-fx_branch', dest='fx_branch', default='master') -parser.add_argument('-fx_commit', dest='fx_commit', default=None) -parser.add_argument('-env_script', dest='env_script', default=None) -parser.add_argument('-exclusion_rsp_file', dest='exclusion_rsp_file', default=None) -parser.add_argument('-no_run_tests', dest='no_run_tests', action="store_true", default=False) - - -########################################################################## -# Helper Functions -########################################################################## - -def validate_args(args): - """ Validate all of the arguments parsed. - Args: - args (argparser.ArgumentParser): Args parsed by the argument parser. - Returns: - (arch, ci_arch, build_type, clr_root, fx_root, fx_branch, fx_commit, env_script, exclusion_rsp_file, no_run_tests) - (str, str, str, str, str, str, str, str, str) - Notes: - If the arguments are valid then return them all in a tuple. If not, raise - an exception stating x argument is incorrect. - """ - - arch = args.arch - ci_arch = args.ci_arch - build_type = args.build_type - clr_root = args.clr_root - fx_root = args.fx_root - fx_branch = args.fx_branch - fx_commit = args.fx_commit - env_script = args.env_script - exclusion_rsp_file = args.exclusion_rsp_file - no_run_tests = args.no_run_tests - - def validate_arg(arg, check): - """ Validate an individual arg - Args: - arg (str|bool): argument to be validated - check (lambda: x-> bool): test that returns either True or False - : based on whether the check passes. - - Returns: - is_valid (bool): Is the argument valid? - """ - - helper = lambda item: item is not None and check(item) - - if not helper(arg): - raise Exception('Argument: %s is not valid.' % (arg)) - - valid_archs = ['x86', 'x64', 'arm', 'arm64'] - valid_build_types = ['Debug', 'Checked', 'Release'] - - arch = next((a for a in valid_archs if a.lower() == arch.lower()), arch) - build_type = next((b for b in valid_build_types if b.lower() == build_type.lower()), build_type) - - validate_arg(arch, lambda item: item in valid_archs) - validate_arg(build_type, lambda item: item in valid_build_types) - validate_arg(fx_branch, lambda item: True) - - if fx_commit is None: - fx_commit = 'HEAD' - - if clr_root is None: - clr_root = nth_dirname(os.path.abspath(sys.argv[0]), 3) - else: - clr_root = os.path.normpath(clr_root) - validate_arg(clr_root, lambda item: os.path.isdir(clr_root)) - - if fx_root is None: - fx_root = os.path.join(clr_root, '_', 'fx') - else: - fx_root = os.path.normpath(fx_root) - - if env_script is not None: - validate_arg(env_script, lambda item: os.path.isfile(env_script)) - env_script = os.path.abspath(env_script) - - if exclusion_rsp_file is not None: - validate_arg(exclusion_rsp_file, lambda item: os.path.isfile(exclusion_rsp_file)) - exclusion_rsp_file = os.path.abspath(exclusion_rsp_file) - - args = (arch, ci_arch, build_type, clr_root, fx_root, fx_branch, fx_commit, env_script, exclusion_rsp_file, no_run_tests) - - log('Configuration:') - log(' arch: %s' % arch) - log(' ci_arch: %s' % ci_arch) - log(' build_type: %s' % build_type) - log(' clr_root: %s' % clr_root) - log(' fx_root: %s' % fx_root) - log(' fx_branch: %s' % fx_branch) - log(' fx_commit: %s' % fx_commit) - log(' env_script: %s' % env_script) - log(' exclusion_rsp_file: %s' % exclusion_rsp_file) - log(' no_run_tests: %s' % no_run_tests) - - return args - -def nth_dirname(path, n): - """ Find the Nth parent directory of the given path - Args: - path (str): path name containing at least N components - n (int): num of basenames to remove - Returns: - outpath (str): path with the last n components removed - Notes: - If n is 0, path is returned unmodified - """ - - assert n >= 0 - - for i in range(0, n): - path = os.path.dirname(path) - - return path - -def log(message): - """ Print logging information - Args: - message (str): message to be printed - """ - - print('[%s]: %s' % (sys.argv[0], message)) - -def copy_files(source_dir, target_dir): - """ Copy any files in the source_dir to the target_dir. - The copy is not recursive. - The directories must already exist. - Args: - source_dir (str): source directory path - target_dir (str): target directory path - Returns: - Nothing - """ - - global testing - assert os.path.isdir(source_dir) - assert testing or os.path.isdir(target_dir) - - for source_filename in os.listdir(source_dir): - source_pathname = os.path.join(source_dir, source_filename) - if os.path.isfile(source_pathname): - target_pathname = os.path.join(target_dir, source_filename) - log('Copy: %s => %s' % (source_pathname, target_pathname)) - if not testing: - shutil.copy2(source_pathname, target_pathname) - -########################################################################## -# Main -########################################################################## - -def main(args): - global Corefx_url - global Unix_name_map - global testing - - if testing: - log("Running with testing = True") - - arch, ci_arch, build_type, clr_root, fx_root, fx_branch, fx_commit, env_script, exclusion_rsp_file, no_run_tests = validate_args( - args) - - clr_os = 'Windows_NT' if Is_windows else Unix_name_map[os.uname()[0]] - - core_root = os.path.join(clr_root, - 'bin', - 'Product', - '%s.%s.%s' % (clr_os, arch, build_type)) - - # corefx creates both files that are read-only and files that include non-ascii - # characters. Using onerror=del_rw allows us to delete all of the read-only files. - # To delete the files with non-ascii characters, when rmtree fails due to those - # files, we then will call rd on Windows. - - if not testing and os.path.exists(fx_root): - if Is_windows: - while True: - res = subprocess.check_output(['tasklist']) - if not 'VBCSCompiler.exe' in res: - break - os.chdir(fx_root) - os.system('git clean -fxd') - os.chdir(clr_root) - shutil.rmtree(fx_root, onerror=del_rw) - - # Clone the corefx branch - - command = 'git clone -b %s --single-branch %s %s' % ( - fx_branch, Corefx_url, fx_root) - log(command) - if testing: - if not os.path.exists(fx_root): - os.makedirs(fx_root) - returncode = 0 - else: - returncode = os.system(command) - - # Change directory to the corefx root - - cwd = os.getcwd() - log('[cd] ' + fx_root) - os.chdir(fx_root) - - # Checkout the appropriate corefx commit - - command = "git checkout %s" % fx_commit - log(command) - returncode = 0 if testing else os.system(command) - if returncode != 0: - sys.exit(1) - - # Print the currently checked out commit hash. Mostly useful if you just checked - # out HEAD, which is the default. - - command = "git rev-parse HEAD" - log(command) - returncode = 0 if testing else os.system(command) - if returncode != 0: - sys.exit(1) - - # On Unix, coreFx build.sh requires HOME to be set, and it isn't by default - # under our CI system, so set it now. - - if not Is_windows: - fx_home = os.path.join(fx_root, 'tempHome') - if not os.path.exists(fx_home): - os.makedirs(fx_home) - os.putenv('HOME', fx_home) - log('HOME=' + fx_home) - - # Gather up some arguments to pass to the different build scripts. - - common_config_args = '-configuration Release -framework net5.0 -os %s -arch %s' % (clr_os, arch) - build_args = '-build -restore' - build_test_args = '-buildtests /p:ArchiveTests=true' - - if not no_run_tests: - build_test_args += ' -test' - - - if not Is_windows and arch == 'arm' : - # We need to force clang5.0; we are building in a docker container that doesn't have - # clang3.9, which is currently the default used by the native build. - common_config_args += ' /p:BuildNativeCompiler=--clang5.0' - - if not Is_windows and (arch == 'arm' or arch == 'arm64'): - # It is needed under docker where LC_ALL is not configured. - common_config_args += ' --warnAsError false' - - build_command = 'build.cmd' if Is_windows else './build.sh' - - command = ' '.join((build_command, common_config_args, build_args)) - log(command) - returncode = 0 if testing else os.system(command) - if returncode != 0: - log('Error: exit code %s' % returncode) - sys.exit(1) - - # Override the built corefx runtime (which it picked up by copying from packages determined - # by its dependencies.props file). Note that we always build Release corefx. - # We must copy all files, not just the files that already exist in the corefx runtime - # directory. This is required so we copy over all altjit compilers. - # - # We find the latest numbered directory in the 'Microsoft.NETCore.App' directory. This - # is expected to be the current product version, e.g., 3.0.0. - # - # TODO: it might be cleaner to encapsulate the knowledge of how to do this in the - # corefx msbuild files somewhere. - - netcore_app_path = os.path.join(fx_root, - 'artifacts', - 'bin', - 'testhost', - 'net5.0-%s-%s-%s' % (clr_os, 'Release', arch), - 'shared', - 'Microsoft.NETCore.App') - - if not testing and not os.path.isdir(netcore_app_path): - log("Error: path not found or is not a directory: %s" % netcore_app_path) - sys.exit(1) - - fx_runtime = None - - if testing: - fx_runtime = os.path.join(netcore_app_path, '9.9.9') - else: - # Figure out what the latest product version is, and use that. - netcore_app_version_dirs = os.listdir(netcore_app_path) - - if netcore_app_version_dirs is None: - log("Error: no version directories in %s" % netcore_app_path) - sys.exit(1) - - netcore_app_version_dirs.sort(reverse=True) - for netcore_app_version_dir in netcore_app_version_dirs: - netcore_app_version_path = os.path.join(netcore_app_path, netcore_app_version_dir) - if os.path.isdir(netcore_app_version_path): - fx_runtime = netcore_app_version_path - break - - if fx_runtime is None: - log("Error: couldn't find fx runtime directory in %s" % netcore_app_path) - sys.exit(1) - - log('Updating CoreCLR: %s => %s' % (core_root, fx_runtime)) - copy_files(core_root, fx_runtime) - - # Build the test command line. - - # If we're doing altjit testing, then don't run any tests that don't work with altjit. - if ci_arch is not None and (ci_arch == 'x86_arm_altjit' or ci_arch == 'x64_arm64_altjit'): - # The property value we need to specify for the WithoutCategories property is a semicolon - # separated list of two values, so the two values must be enclosed in double quotes, namely: - # - # /p:WithoutCategories="IgnoreForCI;XsltcExeRequired" - # - # Without the quotes, msbuild interprets the semicolon as separating two name/value pairs, - # which is incorrect (and causes an error). - # - # If we pass this on the command-line, it requires an extraordinary number of backslashes - # to prevent special Python, dotnet CLI, CMD, and other command-line processing, as the command - # filters through batch files, the RUN tool, dotnet CLI, and finally gets to msbuild. To avoid - # this, and make it simpler and hopefully more resilient to scripting changes, we create an - # msbuild response file with the required text and pass the response file on to msbuild. - - without_categories_filename = os.path.join(fx_root, 'msbuild_commands.rsp') - without_categories_string = '/p:WithoutCategories="IgnoreForCI;XsltcExeRequired"' - with open(without_categories_filename, "w") as without_categories_file: - without_categories_file.write(without_categories_string) - without_categories = " @%s" % without_categories_filename - - log('Response file %s contents:' % without_categories_filename) - log('%s' % without_categories_string) - log('[end response file contents]') - else: - without_categories = ' /p:WithoutCategories=IgnoreForCI' - - command = ' '.join(( - build_command, - common_config_args, - build_test_args, - without_categories - )) - - if env_script is not None: - command += (' /p:PreExecutionTestScript=%s' % env_script) - - if not Is_windows: - command += ' /p:TestWithLocalNativeLibraries=true' - - if not Is_windows and (arch == 'arm' or arch == 'arm64'): - # It is needed under docker where LC_ALL is not configured. - command += ' --warnAsError false' - - if exclusion_rsp_file is not None: - command += (' /p:TestRspFile=%s' % exclusion_rsp_file) - - # Run the corefx test build and run the tests themselves. - - log(command) - returncode = 0 if testing else os.system(command) - if returncode != 0: - log('Error: exit code %s' % returncode) - sys.exit(1) - - sys.exit(0) - - -########################################################################## -# setup for Main -########################################################################## - -if __name__ == '__main__': - Args = parser.parse_args(sys.argv[1:]) - - main(Args) diff --git a/src/tests/Common/test_dependencies/test_dependencies.csproj b/src/tests/Common/test_dependencies/test_dependencies.csproj index 270218bcfdd32..f807dd4889432 100644 --- a/src/tests/Common/test_dependencies/test_dependencies.csproj +++ b/src/tests/Common/test_dependencies/test_dependencies.csproj @@ -2,7 +2,7 @@ BuildOnly false - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) true true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) diff --git a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj index eecb12f1462c8..ab7b191f39c39 100644 --- a/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj +++ b/src/tests/Common/test_dependencies_fs/test_dependencies.fsproj @@ -2,7 +2,7 @@ BuildOnly false - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent) true true win-arm;win-arm64;win-x64;win-x86;$(TargetRid) diff --git a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj index 3e05000395a04..9d1c5ca51dcca 100644 --- a/src/tests/Common/wasm-test-runner/WasmTestRunner.proj +++ b/src/tests/Common/wasm-test-runner/WasmTestRunner.proj @@ -7,6 +7,7 @@ $(NetCoreAppCurrent) $(MSBuildThisFileDirectory)\obj\$(Configuration)\wasm $(TestBinDir)/WasmApp/ + 99.0 - $(NetCoreAppCurrentTargetFrameworkMoniker) - $(NetCoreAppCurrent) + $(NetCoreAppCurrentToolTargetFrameworkMoniker) + $(NetCoreAppToolCurrent) diff --git a/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj b/src/tests/JIT/Directed/tailcall/mutual_recursion.fsproj index eb084ad00ccad..27be898bddbee 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 - $(NetCoreAppCurrent) + $(NetCoreAppToolCurrent)