From 22d261006d6f767016ef44fc0919d259ebef3659 Mon Sep 17 00:00:00 2001 From: Richard Webb Date: Sun, 16 Jun 2024 15:00:36 +0100 Subject: [PATCH] .NET SDK 6.0.301 --- .github/workflows/build_and_test.yml | 2 +- .github/workflows/release.yml | 2 +- global.json | 2 +- .../before/global.json | 2 +- .../before/global.json | 2 +- .../before/global.json | 2 +- .../Fake.DotNet.sdkAssemblyResolver.fs | 20 +++++++++---------- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 54c736cb7a5..18ecc251444 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -15,7 +15,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.0.101' + dotnet-version: '6.0.301' - name: Restore dotnet tools run: dotnet tool restore - name: remove current fake runner tool diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e37538785fb..f22283c42e2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.0.101' + dotnet-version: '6.0.301' - name: Restore dotnet tools run: dotnet tool restore - name: remove current fake runner tool diff --git a/global.json b/global.json index 3537d75fcbc..e15053d3ed9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk" : { - "version": "6.0.101", + "version": "6.0.301", "rollForward": "latestMinor" } } diff --git a/integrationtests/core-reference-assemblies-net60100/before/global.json b/integrationtests/core-reference-assemblies-net60100/before/global.json index 5ab3721913d..92f29ffd58f 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.100" + "version": "6.0.300" } } diff --git a/integrationtests/core-reference-assemblies-net60101-rollforward/before/global.json b/integrationtests/core-reference-assemblies-net60101-rollforward/before/global.json index 5ab3721913d..92f29ffd58f 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.100" + "version": "6.0.300" } } diff --git a/integrationtests/core-reference-assemblies-net60101/before/global.json b/integrationtests/core-reference-assemblies-net60101/before/global.json index 92502e94546..a12323712d9 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.101" + "version": "6.0.301" } } diff --git a/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs b/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs index c98fc7f0002..3af3c64a789 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.100 SDK version assemblies" + [ testCase "Runner run script with 6.0.300 SDK version assemblies" <| fun _ -> try use d = createTestDir () @@ -30,7 +30,7 @@ let tests = WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60100" CustomInstallDir = Some preparedDir Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.100" }) + Version = DotNet.CliVersion.Version "6.0.300" }) |> 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.0" "ref" "net6.0" + "packs" "Microsoft.NETCore.App.Ref" "6.0.5" "ref" "net6.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.101 SDK version assemblies" + testCase "Runner run script with 6.0.301 SDK version assemblies" <| fun _ -> try use d = createTestDir () @@ -72,7 +72,7 @@ let tests = WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60101" CustomInstallDir = Some preparedDir Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.101" }) + Version = DotNet.CliVersion.Version "6.0.301" }) |> 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.1" "ref" "net6.0" + "packs" "Microsoft.NETCore.App.Ref" "6.0.6" "ref" "net6.0" (sprintf "stdout should contain path like '%s', but was: '%s'" expectedNet6PathPortion stdOut) |> Expect.isTrue (stdOut.Contains expectedNet6PathPortion) @@ -113,7 +113,7 @@ let tests = WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60101-rollforward" CustomInstallDir = Some preparedDir Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.101" }) + Version = DotNet.CliVersion.Version "6.0.301" }) |> 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.100 SDK version assemblies and resolve runtime version from cached file" + testCase "Runner run script with 6.0.300 SDK version assemblies and resolve runtime version from cached file" <| fun _ -> try use d = createTestDir () @@ -144,7 +144,7 @@ let tests = WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60100" CustomInstallDir = Some preparedDir Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.100" }) + Version = DotNet.CliVersion.Version "6.0.300" }) |> 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.0" "ref" "net6.0" + "packs" "Microsoft.NETCore.App.Ref" "6.0.5" "ref" "net6.0" let expectedCacheFileResolutionMessage = "Trying to resolve runtime version from cache.."