From 9efd95a7705a6f605b3fb5a1ab9c8b6193803616 Mon Sep 17 00:00:00 2001 From: Richard Webb Date: Tue, 24 Dec 2024 12:00:02 +0000 Subject: [PATCH] Try using the .NET 8 SDK for the resolver tests --- global.json | 2 +- .../before/global.json | 2 +- .../before/global.json | 2 +- .../before/global.json | 2 +- .../Fake.DotNet.sdkAssemblyResolver.fs | 28 +++++++++---------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/global.json b/global.json index 5fc2f2d11d0..34c69f8efec 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk" : { - "version": "8.0.304", + "version": "8.0.401", "rollForward": "latestMinor" } } diff --git a/integrationtests/core-reference-assemblies-net60100/before/global.json b/integrationtests/core-reference-assemblies-net60100/before/global.json index 92f29ffd58f..9cf9791788d 100644 --- a/integrationtests/core-reference-assemblies-net60100/before/global.json +++ b/integrationtests/core-reference-assemblies-net60100/before/global.json @@ -1,5 +1,5 @@ { "sdk" : { - "version": "6.0.300" + "version": "8.0.400" } } diff --git a/integrationtests/core-reference-assemblies-net60101-rollforward/before/global.json b/integrationtests/core-reference-assemblies-net60101-rollforward/before/global.json index 92f29ffd58f..9cf9791788d 100644 --- a/integrationtests/core-reference-assemblies-net60101-rollforward/before/global.json +++ b/integrationtests/core-reference-assemblies-net60101-rollforward/before/global.json @@ -1,5 +1,5 @@ { "sdk" : { - "version": "6.0.300" + "version": "8.0.400" } } diff --git a/integrationtests/core-reference-assemblies-net60101/before/global.json b/integrationtests/core-reference-assemblies-net60101/before/global.json index a12323712d9..4dd033c6760 100644 --- a/integrationtests/core-reference-assemblies-net60101/before/global.json +++ b/integrationtests/core-reference-assemblies-net60101/before/global.json @@ -1,5 +1,5 @@ { "sdk" : { - "version": "6.0.301" + "version": "8.0.401" } } diff --git a/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs b/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs index 3af3c64a789..c299a76e1e9 100644 --- a/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs +++ b/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs @@ -13,7 +13,7 @@ open Fake.Runtime let tests = testList "Fake.DotNet.sdkAssemblyResolverTests" - [ testCase "Runner run script with 6.0.300 SDK version assemblies" + [ testCase "Runner run script with 8.0.400 SDK version assemblies" <| fun _ -> try use d = createTestDir () @@ -29,8 +29,8 @@ let tests = ForceInstall = true WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60100" CustomInstallDir = Some preparedDir - Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.300" }) + Channel = DotNet.CliChannel.Version 8 0 + Version = DotNet.CliVersion.Version "8.0.400" }) |> ignore Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" preparedDir @@ -47,7 +47,7 @@ let tests = let stdOut = String.Join("\n", result.Messages).Trim() let expectedNet6PathPortion = - "packs" "Microsoft.NETCore.App.Ref" "6.0.5" "ref" "net6.0" + "packs" "Microsoft.NETCore.App.Ref" "8.0.8" "ref" "net8.0" (sprintf "stdout should contain path like '%s', but was: '%s'" expectedNet6PathPortion stdOut) |> Expect.isTrue (stdOut.Contains expectedNet6PathPortion) @@ -55,7 +55,7 @@ let tests = // clean up after the test run Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" "" - testCase "Runner run script with 6.0.301 SDK version assemblies" + testCase "Runner run script with 8.0.401 SDK version assemblies" <| fun _ -> try use d = createTestDir () @@ -71,8 +71,8 @@ let tests = ForceInstall = true WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60101" CustomInstallDir = Some preparedDir - Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.301" }) + Channel = DotNet.CliChannel.Version 8 0 + Version = DotNet.CliVersion.Version "8.0.401" }) |> ignore Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" preparedDir @@ -89,7 +89,7 @@ let tests = let stdOut = String.Join("\n", result.Messages).Trim() let expectedNet6PathPortion = - "packs" "Microsoft.NETCore.App.Ref" "6.0.6" "ref" "net6.0" + "packs" "Microsoft.NETCore.App.Ref" "8.0.8" "ref" "net8.0" (sprintf "stdout should contain path like '%s', but was: '%s'" expectedNet6PathPortion stdOut) |> Expect.isTrue (stdOut.Contains expectedNet6PathPortion) @@ -112,8 +112,8 @@ let tests = ForceInstall = true WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60101-rollforward" CustomInstallDir = Some preparedDir - Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.301" }) + Channel = DotNet.CliChannel.Version 8 0 + Version = DotNet.CliVersion.Version "8.0.401" }) |> ignore let result = @@ -127,7 +127,7 @@ let tests = Expect.isTrue result.OK "The build did not succeed" - testCase "Runner run script with 6.0.300 SDK version assemblies and resolve runtime version from cached file" + testCase "Runner run script with 8.0.400 SDK version assemblies and resolve runtime version from cached file" <| fun _ -> try use d = createTestDir () @@ -143,8 +143,8 @@ let tests = ForceInstall = true WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60100" CustomInstallDir = Some preparedDir - Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.300" }) + Channel = DotNet.CliChannel.Version 8 0 + Version = DotNet.CliVersion.Version "8.0.400" }) |> ignore Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" preparedDir @@ -164,7 +164,7 @@ let tests = printfn "%s" stdOut let expectedNet6PathPortion = - "packs" "Microsoft.NETCore.App.Ref" "6.0.5" "ref" "net6.0" + "packs" "Microsoft.NETCore.App.Ref" "8.0.8" "ref" "net8.0" let expectedCacheFileResolutionMessage = "Trying to resolve runtime version from cache.."