diff --git a/docs/design/coreclr/jit/viewing-jit-dumps.md b/docs/design/coreclr/jit/viewing-jit-dumps.md index 6a13d9859fd79..fd06f5f337981 100644 --- a/docs/design/coreclr/jit/viewing-jit-dumps.md +++ b/docs/design/coreclr/jit/viewing-jit-dumps.md @@ -20,7 +20,7 @@ The first thing to do is setup the .NET Core app we want to dump. Here are the s Exe - net5.0 + net6.0 win-x64 @@ -58,17 +58,17 @@ The first thing to do is setup the .NET Core app we want to dump. Here are the s } ``` -* After you've finished editing the code, run `dotnet restore` and `dotnet publish -c Release`. This should drop all of the binaries needed to run your app in `bin/Release/net5.0//publish`. +* After you've finished editing the code, run `dotnet restore` and `dotnet publish -c Release`. This should drop all of the binaries needed to run your app in `bin/Release///publish`. * Overwrite the CLR dlls with the ones you've built locally. If you're a fan of the command line, here are some shell commands for doing this: ```shell # Windows - robocopy /e \artifacts\bin\coreclr\windows..Release \bin\Release\net5.0\\publish > NUL - copy /y \artifacts\bin\coreclr\windows..Debug\clrjit.dll \bin\Release\net5.0\\publish > NUL + robocopy /e \artifacts\bin\coreclr\windows..Release \bin\Release\\\publish > NUL + copy /y \artifacts\bin\coreclr\windows..Debug\clrjit.dll \bin\Release\\\publish > NUL # Unix - cp -rT /artifacts/bin/coreclr/..Release /bin/Release/net5.0//publish - cp /artifacts/bin/coreclr/..Debug/libclrjit.so /bin/Release/net5.0//publish + cp -rT /artifacts/bin/coreclr/..Release /bin/Release///publish + cp /artifacts/bin/coreclr/..Debug/libclrjit.so /bin/Release///publish ``` * Set the configuration knobs you need (see below) and run your published app. The info you want should be dumped to stdout. diff --git a/docs/workflow/testing/coreclr/running-aspnet-benchmarks-with-crossgen2.md b/docs/workflow/testing/coreclr/running-aspnet-benchmarks-with-crossgen2.md index 5e8dd20ac8afa..fbedaf719dcc2 100644 --- a/docs/workflow/testing/coreclr/running-aspnet-benchmarks-with-crossgen2.md +++ b/docs/workflow/testing/coreclr/running-aspnet-benchmarks-with-crossgen2.md @@ -57,7 +57,7 @@ jobs: transport: Sockets scenario: plaintext channel: edge - framework: netcoreapp5.0 + framework: net6.0 arguments: "--nonInteractive true --scenarios {{scenario}} --server-urls {{protocol}}://[*]:{{serverPort}} --server {{server}} --kestrelTransport {{transport}} --protocol {{protocol}}" scenarios: diff --git a/docs/workflow/testing/host/testing.md b/docs/workflow/testing/host/testing.md index 513958910d185..35c7359c411a9 100644 --- a/docs/workflow/testing/host/testing.md +++ b/docs/workflow/testing/host/testing.md @@ -64,12 +64,12 @@ If all tests have not been previously run, make sure the [test context](#test-co Tests from a specific test project can be run using [`dotnet test`](https://docs.microsoft.com/dotnet/core/tools/dotnet-test) targeting the built test binary. For example: ``` -dotnet test artifacts/bin/HostActivation.Tests/Debug/net5.0/HostActivation.Tests.dll --filter category!=failing +dotnet test artifacts/bin/HostActivation.Tests/Debug/net6.0/HostActivation.Tests.dll --filter category!=failing ``` To filter to specific tests within the test library, use the [filter options](https://docs.microsoft.com/dotnet/core/tools/dotnet-test#filter-option-details) available for `dotnet test`. For example: ``` -dotnet test artifacts/bin/HostActivation.Tests/Debug/net5.0/HostActivation.Tests.dll --filter "DependencyResolution&category!=failing" +dotnet test artifacts/bin/HostActivation.Tests/Debug/net6.0/HostActivation.Tests.dll --filter "DependencyResolution&category!=failing" ``` The `category!=failing` is to respect the [filtering traits](../libraries/filtering-tests.md) used by the runtime repo. diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6e99723945183..cd9645ea8bb5a 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -2,7 +2,7 @@ # This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 # # What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry -# under for each Maestro managed private feed. Two additional credential +# under for each Maestro managed private feed. Two additional credential # entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. # # This script needs to be called in every job that will restore packages and which the base repo has @@ -37,7 +37,7 @@ Set-StrictMode -Version 2.0 # Add source entry to PackageSources function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") - + if ($packageSource -eq $null) { $packageSource = $doc.CreateElement("add") @@ -48,7 +48,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - + AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password } @@ -89,7 +89,7 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." - + ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 8af7d899db121..efdd93bb1efad 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -4,7 +4,7 @@ # This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 # # What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry -# under for each Maestro's managed private feed. Two additional credential +# under for each Maestro's managed private feed. Two additional credential # entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. # # This script needs to be called in every job that will restore packages and which the base repo has @@ -68,7 +68,7 @@ if [ "$?" != "0" ]; then sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile fi -# Ensure there is a ... section. +# Ensure there is a ... section. grep -i "" $ConfigFile if [ "$?" != "0" ]; then echo "Adding ... section." @@ -142,7 +142,7 @@ IFS=$PrevIFS for FeedName in ${PackageSources[@]} ; do # Check if there is no existing credential for this FeedName - grep -i "<$FeedName>" $ConfigFile + grep -i "<$FeedName>" $ConfigFile if [ "$?" != "0" ]; then echo "Adding credentials for $FeedName." diff --git a/src/coreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/PathUtilities.cs b/src/coreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/PathUtilities.cs index 5fb2090ac65e3..915da2a5bcc0a 100644 --- a/src/coreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/PathUtilities.cs +++ b/src/coreclr/tools/aot/Mono.Linker.Tests/TestCasesRunner/PathUtilities.cs @@ -13,10 +13,6 @@ public static class PathUtilities public const string TFMDirectoryName = "net7.0"; #elif NET6_0 public const string TFMDirectoryName = "net6.0"; -#elif NET5_0 - public const string TFMDirectoryName = "net5.0"; -#elif NETCOREAPP3_0 - public const string TFMDirectoryName = "netcoreapp3.0"; #else #error "Unknown TFM" #endif diff --git a/src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs b/src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs index fd890baf420fd..9a94eb16aa51a 100644 --- a/src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs +++ b/src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs @@ -58,7 +58,9 @@ public static int CompileNuget(BuildOptions options) string appFolder = Path.Combine(nugetOutputFolder, $"{package}.TestApp"); Directory.CreateDirectory(appFolder); - int exitCode = DotnetCli.New(appFolder, "console", nugetLog); + Version version = Environment.Version; + string targetFramework = $"net{version.Major}.{version.Minor}"; + int exitCode = DotnetCli.New(appFolder, $"console -f {targetFramework}", nugetLog); if (exitCode != 0) { nugetLog.WriteLine($"dotnet new console for {package} failed with exit code {exitCode}"); @@ -80,7 +82,8 @@ public static int CompileNuget(BuildOptions options) } // This is not a reliable way of building the publish folder - string publishFolder = Path.Combine(appFolder, @"artifacts\Debug\net5.0\publish"); + + string publishFolder = Path.Combine(appFolder, "artifacts", "Debug", targetFramework, "publish"); if (!Directory.Exists(publishFolder)) { nugetLog.WriteLine($"Could not find folder {publishFolder} containing the published app."); diff --git a/src/installer/managed/Microsoft.NET.HostModel/Bundle/Manifest.cs b/src/installer/managed/Microsoft.NET.HostModel/Bundle/Manifest.cs index c04a1cc761d24..06773dd28d3dc 100644 --- a/src/installer/managed/Microsoft.NET.HostModel/Bundle/Manifest.cs +++ b/src/installer/managed/Microsoft.NET.HostModel/Bundle/Manifest.cs @@ -51,7 +51,7 @@ namespace Microsoft.NET.HostModel.Bundle /// public class Manifest { - // NetcoreApp3CompatMode flag is set on a .net5 app, + // NetcoreApp3CompatMode flag is set on a .net5+ app, // which chooses to build single-file apps in .netcore3.x compat mode, // by constructing the bundler with BundleAllContent option. // This mode is expected to be deprecated in future versions of .NET. diff --git a/src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs b/src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs index b29a102bf6e59..5a1c0c4fd66a5 100644 --- a/src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs +++ b/src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs @@ -33,21 +33,21 @@ public TargetInfo(OSPlatform? os, Architecture? arch, Version targetFrameworkVer { OS = os ?? HostOS; Arch = arch ?? RuntimeInformation.OSArchitecture; - FrameworkVersion = targetFrameworkVersion ?? net60; + FrameworkVersion = targetFrameworkVersion ?? Environment.Version; Debug.Assert(IsLinux || IsOSX || IsWindows); - if (FrameworkVersion.CompareTo(net60) >= 0) + if (FrameworkVersion.Major >= 6) { BundleMajorVersion = 6u; DefaultOptions = BundleOptions.None; } - else if (FrameworkVersion.CompareTo(net50) >= 0) + else if (FrameworkVersion.Major == 5) { BundleMajorVersion = 2u; DefaultOptions = BundleOptions.None; } - else if (FrameworkVersion.Major == 3 && (FrameworkVersion.Minor == 0 || FrameworkVersion.Minor == 1)) + else if (FrameworkVersion.Major == 3) { BundleMajorVersion = 1u; DefaultOptions = BundleOptions.BundleAllContent; @@ -116,11 +116,7 @@ public override string ToString() public bool ShouldExclude(string relativePath) => (FrameworkVersion.Major != 3) && (relativePath.Equals(HostFxr) || relativePath.Equals(HostPolicy)); - private readonly Version net60 = new Version(6, 0); - private readonly Version net50 = new Version(5, 0); private string HostFxr => IsWindows ? "hostfxr.dll" : IsLinux ? "libhostfxr.so" : "libhostfxr.dylib"; private string HostPolicy => IsWindows ? "hostpolicy.dll" : IsLinux ? "libhostpolicy.so" : "libhostpolicy.dylib"; - - } } diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs index 52236a4cc4076..cf2af06577adf 100644 --- a/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs +++ b/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs @@ -23,17 +23,10 @@ public MultipleHives(SharedTestState sharedState) } [Theory] - // MLL where global hive has a better match - [InlineData("5.0.0", "net5.0", true, "5.1.2")] - [InlineData("5.0.0", "net5.0", null, "5.1.2")] // MLL is on by default before 7.0, so same as true - [InlineData("5.0.0", "net5.0", false, "5.2.0")] // No global hive allowed // MLL (where global hive has better match) with various TFMs - [InlineData("5.0.0", "netcoreapp3.0", true, "5.1.2")] - [InlineData("5.0.0", "netcoreapp3.0", null, "5.1.2")] - [InlineData("5.0.0", "netcoreapp3.0", false, "5.2.0")] [InlineData("5.0.0", "netcoreapp3.1", true, "5.1.2")] - [InlineData("5.0.0", "netcoreapp3.1", null, "5.1.2")] - [InlineData("5.0.0", "netcoreapp3.1", false, "5.2.0")] + [InlineData("5.0.0", "netcoreapp3.1", null, "5.1.2")] // MLL is on by default before 7.0, so same as true + [InlineData("5.0.0", "netcoreapp3.1", false, "5.2.0")] // No global hive allowed [InlineData("5.0.0", "net6.0", true, "5.1.2")] [InlineData("5.0.0", "net6.0", null, "5.1.2")] [InlineData("5.0.0", "net6.0", false, "5.2.0")] @@ -68,7 +61,7 @@ public void FrameworkHiveSelection_CurrentDirectoryIsIgnored() { RunTest(new TestSettings() .WithRuntimeConfigCustomizer(runtimeConfig => runtimeConfig - .WithTfm(Constants.Tfm.Net5) + .WithTfm(Constants.Tfm.Net6) .WithFramework(MicrosoftNETCoreApp, "5.0.0")) .WithWorkingDirectory(SharedState.DotNetCurrentHive.BinPath), multiLevelLookup: true) @@ -191,9 +184,9 @@ public void DotnetInfo(bool? multiLevelLookup) } [Theory] - [InlineData("net5.0", true, true)] - [InlineData("net5.0", null, true)] - [InlineData("net5.0", false, false)] + [InlineData("net6.0", true, true)] + [InlineData("net6.0", null, true)] + [InlineData("net6.0", false, false)] // MLL is disabled for 7.0+ [InlineData("net7.0", true, false)] [InlineData("net7.0", null, false)] diff --git a/src/installer/tests/TestUtils/Constants.cs b/src/installer/tests/TestUtils/Constants.cs index 82a80c55d58aa..78fe3e6ea118d 100644 --- a/src/installer/tests/TestUtils/Constants.cs +++ b/src/installer/tests/TestUtils/Constants.cs @@ -36,9 +36,6 @@ public static class RollForwardSetting public static class Tfm { public const string RuntimeConfigPropertyName = "tfm"; - public const string NetCoreApp30 = "netcoreapp3.0"; - public const string NetCoreApp31 = "netcoreapp3.1"; - public const string Net5 = "net5.0"; public const string Net6 = "net6.0"; public const string Net7 = "net7.0"; } diff --git a/src/libraries/Common/tests/StaticTestGenerator/README.md b/src/libraries/Common/tests/StaticTestGenerator/README.md index 141f3602edfbb..74a72ec971ad4 100644 --- a/src/libraries/Common/tests/StaticTestGenerator/README.md +++ b/src/libraries/Common/tests/StaticTestGenerator/README.md @@ -22,16 +22,16 @@ From within the utility directory, run the utility with the arguments: For example: ``` -dotnet run d:\output "d:\repos\runtime\artifacts\bin\testhost\net5.0-windows-Debug-x64\shared\Microsoft.NETCore.App\5.0.0" "d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-windows-Debug\System.Runtime.Tests.dll" +dotnet run d:\output "d:\repos\runtime\artifacts\bin\testhost\net6.0-windows-Debug-x64\shared\Microsoft.NETCore.App\5.0.0" "d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net6.0-windows-Debug\System.Runtime.Tests.dll" ``` This will run the tool and result in output written to the console like: ``` -3/27/2019 10:55:37 PM | Test assembly path : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-windows-Debug\System.Runtime.Tests.dll -3/27/2019 10:55:37 PM | Helper assemblies path: d:\repos\runtime\artifacts\bin\testhost\net5.0-windows-Debug-x64\shared\Microsoft.NETCore.App\3.0.0\ +3/27/2019 10:55:37 PM | Test assembly path : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net6.0-windows-Debug\System.Runtime.Tests.dll +3/27/2019 10:55:37 PM | Helper assemblies path: d:\repos\runtime\artifacts\bin\testhost\net6.0-windows-Debug-x64\shared\Microsoft.NETCore.App\3.0.0\ 3/27/2019 10:55:37 PM | Output path : d:\output\System.Runtime.Tests\ -3/27/2019 10:55:37 PM | Xunit arguments : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-windows-Debug\System.Runtime.Tests.dll -notrait category=nonnetcoreapptests -notrait category=nonwindowstests -notrait category=IgnoreForCI -notrait category=failing -notrait category=OuterLoop +3/27/2019 10:55:37 PM | Xunit arguments : d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net6.0-windows-Debug\System.Runtime.Tests.dll -notrait category=nonnetcoreapptests -notrait category=nonwindowstests -notrait category=IgnoreForCI -notrait category=failing -notrait category=OuterLoop 3/27/2019 10:55:37 PM | -3/27/2019 10:55:37 PM | Loaded System.Runtime.Tests from d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net5.0-windows-Debug\System.Runtime.Tests.dll +3/27/2019 10:55:37 PM | Loaded System.Runtime.Tests from d:\repos\runtime\artifacts\bin\System.Runtime.Tests\net6.0-windows-Debug\System.Runtime.Tests.dll 3/27/2019 10:55:37 PM | Found 5322 test methods. 3/27/2019 10:55:38 PM | Found 3469 InlineDatas / 949 MethodDatas across 5322 test methods. 3/27/2019 10:55:38 PM | diff --git a/src/libraries/System.Runtime.InteropServices/tests/Common/TestUtils.cs b/src/libraries/System.Runtime.InteropServices/tests/Common/TestUtils.cs index b7a8e382b55b1..4d7f94678e69a 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/Common/TestUtils.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/Common/TestUtils.cs @@ -45,10 +45,6 @@ public enum TestTargetFramework /// Net, /// - /// .NET version 5.0. - /// - Net5, - /// /// .NET version 6.0. /// Net6, @@ -212,7 +208,6 @@ private static async Task> GetReferenceAssembl TestTargetFramework.Framework => ReferenceAssemblies.NetFramework.Net48.Default, TestTargetFramework.Standard => ReferenceAssemblies.NetStandard.NetStandard21, TestTargetFramework.Core => ReferenceAssemblies.NetCore.NetCoreApp31, - TestTargetFramework.Net5 => ReferenceAssemblies.Net.Net50, TestTargetFramework.Net6 => ReferenceAssemblies.Net.Net60, _ => ReferenceAssemblies.Default }; diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AdditionalAttributesOnStub.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AdditionalAttributesOnStub.cs index dea5fca91f130..2e3604b07a6e9 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AdditionalAttributesOnStub.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/AdditionalAttributesOnStub.cs @@ -134,7 +134,6 @@ public static IEnumerable GetDownlevelTargetFrameworks() { yield return new object[] { TestTargetFramework.Net, true }; yield return new object[] { TestTargetFramework.Net6, true }; - yield return new object[] { TestTargetFramework.Net5, true }; yield return new object[] { TestTargetFramework.Core, false }; yield return new object[] { TestTargetFramework.Standard, false }; yield return new object[] { TestTargetFramework.Framework, false }; diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs index 0b5c612c97257..ca2e733ea69f9 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs @@ -456,7 +456,7 @@ public static IEnumerable CodeSnippetsToValidateFallbackForwarder() // Confirm that all unsupported target frameworks can be generated. { string code = CodeSnippets.BasicParametersAndModifiers(CodeSnippets.LibraryImportAttributeDeclaration); - yield return new object[] { ID(), code, TestTargetFramework.Net5, false }; + yield return new object[] { ID(), code, TestTargetFramework.Net6, false }; yield return new object[] { ID(), code, TestTargetFramework.Core, false }; yield return new object[] { ID(), code, TestTargetFramework.Standard, false }; yield return new object[] { ID(), code, TestTargetFramework.Framework, false }; @@ -465,7 +465,7 @@ public static IEnumerable CodeSnippetsToValidateFallbackForwarder() // Confirm that all unsupported target frameworks fall back to a forwarder. { string code = CodeSnippets.BasicParametersAndModifiers(CodeSnippets.LibraryImportAttributeDeclaration); - yield return new object[] { ID(), code, TestTargetFramework.Net5, true }; + yield return new object[] { ID(), code, TestTargetFramework.Net6, true }; yield return new object[] { ID(), code, TestTargetFramework.Core, true }; yield return new object[] { ID(), code, TestTargetFramework.Standard, true }; yield return new object[] { ID(), code, TestTargetFramework.Framework, true }; @@ -474,7 +474,7 @@ public static IEnumerable CodeSnippetsToValidateFallbackForwarder() // Confirm that all unsupported target frameworks fall back to a forwarder. { string code = CodeSnippets.BasicParametersAndModifiersWithStringMarshalling(StringMarshalling.Utf16, CodeSnippets.LibraryImportAttributeDeclaration); - yield return new object[] { ID(), code, TestTargetFramework.Net5, true }; + yield return new object[] { ID(), code, TestTargetFramework.Net6, true }; yield return new object[] { ID(), code, TestTargetFramework.Core, true }; yield return new object[] { ID(), code, TestTargetFramework.Standard, true }; yield return new object[] { ID(), code, TestTargetFramework.Framework, true }; @@ -483,7 +483,7 @@ public static IEnumerable CodeSnippetsToValidateFallbackForwarder() // Confirm that if support is missing for any type (like arrays), we fall back to a forwarder even if other types are supported. { string code = CodeSnippets.BasicReturnAndParameterByValue("System.Runtime.InteropServices.SafeHandle", "int[]", CodeSnippets.LibraryImportAttributeDeclaration); - yield return new object[] { ID(), code, TestTargetFramework.Net5, true }; + yield return new object[] { ID(), code, TestTargetFramework.Net6, true }; yield return new object[] { ID(), code, TestTargetFramework.Core, true }; yield return new object[] { ID(), code, TestTargetFramework.Standard, true }; yield return new object[] { ID(), code, TestTargetFramework.Framework, true }; diff --git a/src/libraries/System.Text.Encoding.CodePages/src/Data/Tools/EncodingDataGenerator.csproj b/src/libraries/System.Text.Encoding.CodePages/src/Data/Tools/EncodingDataGenerator.csproj index 2082704286ba4..06ad79da63cc5 100644 --- a/src/libraries/System.Text.Encoding.CodePages/src/Data/Tools/EncodingDataGenerator.csproj +++ b/src/libraries/System.Text.Encoding.CodePages/src/Data/Tools/EncodingDataGenerator.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + $(NetCoreAppCurrent) diff --git a/src/workloads/workloads.csproj b/src/workloads/workloads.csproj index 77e0d389ccb13..fb4b12881d67a 100644 --- a/src/workloads/workloads.csproj +++ b/src/workloads/workloads.csproj @@ -1,4 +1,4 @@ - +