diff --git a/Directory.Build.props b/Directory.Build.props index 444ef99ca550..871fa886df8e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,7 +8,7 @@ True true false - netcoreapp5.0 + net5.0 $(SdkTargetFramework) - 5.0.0-preview.5.20253.7 - 5.0.0-preview.5.20253.7 + 5.0.0-preview.5.20260.5 + 5.0.0-preview.5.20260.5 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 5.0.0-preview.5.20253.7 - 5.0.0-preview.5.20253.7 - 5.0.0-preview.5.20253.7 + 5.0.0-preview.5.20260.5 + 5.0.0-preview.5.20260.5 + 5.0.0-preview.5.20260.5 $(MicrosoftExtensionsDependencyModelPackageVersion) @@ -62,10 +62,10 @@ - 5.0.0-preview.5.20253.7 - 5.0.0-preview.5.20253.7 - 5.0.0-preview.5.20253.7 - 5.0.0-preview.5.20253.7 + 5.0.0-preview.5.20260.5 + 5.0.0-preview.5.20260.5 + 5.0.0-preview.5.20260.5 + 5.0.0-preview.5.20260.5 diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 1763a1a97b0e..705a034bdcf6 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/eng/common/performance/performance-setup.ps1 @@ -3,7 +3,7 @@ Param( [string] $CoreRootDirectory, [string] $BaselineCoreRootDirectory, [string] $Architecture="x64", - [string] $Framework="netcoreapp5.0", + [string] $Framework="net5.0", [string] $CompilationMode="Tiered", [string] $Repository=$env:BUILD_REPOSITORY_NAME, [string] $Branch=$env:BUILD_SOURCEBRANCH, @@ -111,4 +111,4 @@ Write-PipelineSetVariable -Name 'Queue' -Value "$Queue" -IsMultiJobVariable $fal Write-PipelineSetVariable -Name 'HelixSourcePrefix' -Value "$HelixSourcePrefix" -IsMultiJobVariable $false Write-PipelineSetVariable -Name '_BuildConfig' -Value "$Architecture.$Kind.$Framework" -IsMultiJobVariable $false -exit 0 \ No newline at end of file +exit 0 diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index b9eecf94bd01..34eed8b672f1 100755 --- a/eng/common/performance/performance-setup.sh +++ b/eng/common/performance/performance-setup.sh @@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY core_root_directory= baseline_core_root_directory= architecture=x64 -framework=netcoreapp5.0 +framework=net5.0 compilation_mode=tiered repository=$BUILD_REPOSITORY_NAME branch=$BUILD_SOURCEBRANCH diff --git a/global.json b/global.json index 77a4c66502d7..549794ac5cb4 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "5.0.100-preview.2.20152.7", + "dotnet": "5.0.100-preview.5.20261.8", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreAppRuntimePackageVersion)" diff --git a/src/Assets/TestProjects/CppCliLibWithWpfFrameworkReference/Project1.vcxproj b/src/Assets/TestProjects/CppCliLibWithWpfFrameworkReference/Project1.vcxproj index eab055a2a2d7..98dde830ac77 100644 --- a/src/Assets/TestProjects/CppCliLibWithWpfFrameworkReference/Project1.vcxproj +++ b/src/Assets/TestProjects/CppCliLibWithWpfFrameworkReference/Project1.vcxproj @@ -24,7 +24,7 @@ NetCoreCProj Project1 10.0 - netcoreapp5.0 + net5.0 @@ -125,4 +125,4 @@ - \ No newline at end of file + diff --git a/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj b/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj index 6c7903384d93..f3188fef49ef 100644 --- a/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj +++ b/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj @@ -37,7 +37,7 @@ 16.0 {CF5DA8D7-1FDF-4E8F-AFE6-450BE16E906A} - netcoreapp5.0 + net5.0 ManagedCProj true NETCoreCppCliTest @@ -297,4 +297,4 @@ - \ No newline at end of file + diff --git a/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestB/NETCoreCppCliTestB.vcxproj b/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestB/NETCoreCppCliTestB.vcxproj index 90c49b2afb9f..aa190b563562 100644 --- a/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestB/NETCoreCppCliTestB.vcxproj +++ b/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestB/NETCoreCppCliTestB.vcxproj @@ -37,7 +37,7 @@ 16.0 {C8D22D0F-0C2D-4B4A-BF28-14A2D001102B} - netcoreapp5.0 + net5.0 ManagedCProj true NETCoreCppCliTest @@ -297,4 +297,4 @@ - \ No newline at end of file + diff --git a/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestC/NETCoreCppCliTestC.vcxproj b/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestC/NETCoreCppCliTestC.vcxproj index b80cf6a553f7..a75aa05a15a0 100644 --- a/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestC/NETCoreCppCliTestC.vcxproj +++ b/src/Assets/TestProjects/NetCoreCppCliLibWithTransitiveDeps/NETCoreCppCliTestC/NETCoreCppCliTestC.vcxproj @@ -37,7 +37,7 @@ 16.0 {73B24404-97DE-467A-8251-6542819BCEB4} - netcoreapp5.0 + net5.0 ManagedCProj true NETCoreCppCliTest @@ -292,4 +292,4 @@ - \ No newline at end of file + diff --git a/src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj b/src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj index df590203e18b..bd4e5fc71311 100644 --- a/src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj +++ b/src/Assets/TestProjects/NetCoreCsharpAppReferenceCppCliLib/NETCoreCppCliTest/NETCoreCppCliTest.vcxproj @@ -13,7 +13,7 @@ 16.0 {CF5DA8D7-1FDF-4E8F-AFE6-450BE16E906A} - netcoreapp5.0 + net5.0 ManagedCProj NETCoreCppCliTest 10.0 @@ -76,4 +76,4 @@ - \ No newline at end of file + diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs b/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs index abc92b07aa49..a5020155b60f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs @@ -177,7 +177,7 @@ private bool ValidateCrossgen2Support() return false; } - // Crossgen2 only supports the following host->target compilation scenarios in netcoreapp5.0: + // Crossgen2 only supports the following host->target compilation scenarios in net5.0: // win-x64 -> win-x64 // linux-x64 -> linux-x64 // linux-musl-x64 -> linux-musl-x64 diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProject.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProject.cs index a4db0aaedee7..afd8974950e7 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProject.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildACppCliProject.cs @@ -40,7 +40,7 @@ public void It_builds_and_runs() var exe = Path.Combine( //find the platform directory new DirectoryInfo(Path.Combine(testAsset.TestRoot, "CSConsoleApp", "bin")).GetDirectories().Single().FullName, "Debug", - "netcoreapp5.0", + "net5.0", "CSConsoleApp.exe"); var runCommand = new RunExeCommand(Log, exe); diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs index dd429d64ac0f..6796bc159fa9 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenWeWantToRequireWindowsForDesktopApps.cs @@ -103,7 +103,7 @@ public void It_does_not_download_desktop_targeting_packs_on_unix() var testProject = new TestProject() { Name = ProjectName, - TargetFrameworks = "netcoreapp5.0", + TargetFrameworks = "net5.0", IsSdkProject = true, IsExe = true, }; diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishANetCoreAppForTelemetry.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishANetCoreAppForTelemetry.cs index ef2e45be64f5..8158fddb9e06 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishANetCoreAppForTelemetry.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishANetCoreAppForTelemetry.cs @@ -20,7 +20,7 @@ public GivenThatWeWantToPublishANetCoreAppForTelemetry(ITestOutputHelper log) : } [CoreMSBuildOnlyTheory] - [InlineData("netcoreapp5.0")] + [InlineData("net5.0")] public void It_collects_empty_Trimmer_SingleFile_ReadyToRun_publishing_properties(string targetFramework) { Type loggerType = typeof(LogTelemetryToStdOutForTest); @@ -37,7 +37,7 @@ public void It_collects_empty_Trimmer_SingleFile_ReadyToRun_publishing_propertie } [CoreMSBuildOnlyTheory] - [InlineData("netcoreapp5.0")] + [InlineData("net5.0")] public void It_collects_Trimmer_SingleFile_ReadyToRun_publishing_properties(string targetFramework) { Type loggerType = typeof(LogTelemetryToStdOutForTest); @@ -61,7 +61,7 @@ public void It_collects_Trimmer_SingleFile_ReadyToRun_publishing_properties(stri } [CoreMSBuildOnlyTheory] - [InlineData("netcoreapp5.0")] + [InlineData("net5.0")] public void It_collects_crossgen2_publishing_properties(string targetFramework) { // Crossgen2 only supported for Linux/Windows x64 scenarios for now diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs index a09baeb3db68..9cbcd684317f 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs @@ -195,7 +195,7 @@ public void It_can_publish_readytorun_for_selfcontained_library_projects(string } [Theory] - [InlineData("netcoreapp5.0")] + [InlineData("net5.0")] public void It_can_publish_readytorun_using_crossgen2(string targetFramework) { // Crossgen2 only supported for Linux/Windows x64 scenarios for now @@ -206,7 +206,7 @@ public void It_can_publish_readytorun_using_crossgen2(string targetFramework) } [Theory] - [InlineData("netcoreapp5.0")] + [InlineData("net5.0")] public void It_only_supports_selfcontained_when_using_crossgen2(string targetFramework) { // Crossgen2 only supported for Linux/Windows x64 scenarios for now diff --git a/src/Tests/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs b/src/Tests/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs index e27bfea922b5..13f75186ca9b 100644 --- a/src/Tests/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs +++ b/src/Tests/dotnet-restore.Tests/GivenThatIWantToRestoreApp.cs @@ -68,15 +68,23 @@ public void ItRestoresLibToSpecificDirectory(bool useStaticGraphEvaluation) .Should() .Pass(); - string[] args = new[] { "--packages", dir }; + + var logpath = Path.Combine(TestContext.GetRepoRoot(), "artifacts", "log", $"ItRestoresLibToSpecificDirectory-{useStaticGraphEvaluation}.binlog"); + string[] args = new[] {"-v", "diag", $"-bl:{logpath}", "--packages", dir}; args = HandleStaticGraphEvaluation(useStaticGraphEvaluation, args); - new DotnetRestoreCommand(Log) - .WithWorkingDirectory(rootPath) - .Execute(args) + Cli.Utils.CommandResult commandResult = new DotnetRestoreCommand(Log) + .WithWorkingDirectory(rootPath) + .Execute(args); + commandResult .Should() .Pass() .And.NotHaveStdErr(); + if (!Directory.Exists(fullPath)) + { + Log.WriteLine(commandResult.StdOut); + } + Directory.Exists(fullPath).Should().BeTrue(); Directory.EnumerateFiles(fullPath, "*.dll", SearchOption.AllDirectories).Count().Should().BeGreaterThan(0); }