From 7a13cd74c40d643c823350e0f34b1ee864ac5398 Mon Sep 17 00:00:00 2001 From: Yazeed Obaid Date: Wed, 19 Jan 2022 13:42:26 +0200 Subject: [PATCH 1/3] update to net 6.0.101 release --- .github/workflows/build_and_test.yml | 2 +- .github/workflows/release.yml | 2 +- global.json | 2 +- .../before/global.json | 5 ----- .../before/global.json | 0 .../before/reference-assemblies.fsx | 0 .../before/global.json | 5 +++++ .../before/reference-assemblies.fsx | 0 .../Fake.DotNet.sdkAssemblyResolver.fs | 20 +++++++++---------- 9 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 integrationtests/core-reference-assemblies-net60-preview/before/global.json rename integrationtests/{core-reference-assemblies-net60 => core-reference-assemblies-net60100}/before/global.json (100%) rename integrationtests/{core-reference-assemblies-net60-preview => core-reference-assemblies-net60100}/before/reference-assemblies.fsx (100%) create mode 100644 integrationtests/core-reference-assemblies-net60101/before/global.json rename integrationtests/{core-reference-assemblies-net60 => core-reference-assemblies-net60101}/before/reference-assemblies.fsx (100%) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 2031da0d18a..8bc2569908d 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.100-preview.3.21202.5' + dotnet-version: '6.0.101' - uses: actions/cache@v2 with: path: ~/.nuget/packages diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7bd078b5ba8..418d256a2b0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: - dotnet-version: '6.0.100-preview.3.21202.5' + dotnet-version: '6.0.101' - uses: actions/cache@v2 with: path: ~/.nuget/packages diff --git a/global.json b/global.json index c46a53405f2..92502e94546 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk" : { - "version": "6.0.100-preview.3.21202.5" + "version": "6.0.101" } } diff --git a/integrationtests/core-reference-assemblies-net60-preview/before/global.json b/integrationtests/core-reference-assemblies-net60-preview/before/global.json deleted file mode 100644 index c46a53405f2..00000000000 --- a/integrationtests/core-reference-assemblies-net60-preview/before/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk" : { - "version": "6.0.100-preview.3.21202.5" - } -} diff --git a/integrationtests/core-reference-assemblies-net60/before/global.json b/integrationtests/core-reference-assemblies-net60100/before/global.json similarity index 100% rename from integrationtests/core-reference-assemblies-net60/before/global.json rename to integrationtests/core-reference-assemblies-net60100/before/global.json diff --git a/integrationtests/core-reference-assemblies-net60-preview/before/reference-assemblies.fsx b/integrationtests/core-reference-assemblies-net60100/before/reference-assemblies.fsx similarity index 100% rename from integrationtests/core-reference-assemblies-net60-preview/before/reference-assemblies.fsx rename to integrationtests/core-reference-assemblies-net60100/before/reference-assemblies.fsx diff --git a/integrationtests/core-reference-assemblies-net60101/before/global.json b/integrationtests/core-reference-assemblies-net60101/before/global.json new file mode 100644 index 00000000000..92502e94546 --- /dev/null +++ b/integrationtests/core-reference-assemblies-net60101/before/global.json @@ -0,0 +1,5 @@ +{ + "sdk" : { + "version": "6.0.101" + } +} diff --git a/integrationtests/core-reference-assemblies-net60/before/reference-assemblies.fsx b/integrationtests/core-reference-assemblies-net60101/before/reference-assemblies.fsx similarity index 100% rename from integrationtests/core-reference-assemblies-net60/before/reference-assemblies.fsx rename to integrationtests/core-reference-assemblies-net60101/before/reference-assemblies.fsx diff --git a/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs b/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs index ff0eaf92be0..0d3eae36f69 100644 --- a/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs +++ b/src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs @@ -31,7 +31,7 @@ let tests = (sprintf "stdout should contain '%s', but was: '%s'" expectedNetStandardPathPortion stdOut) |> Expect.isTrue (stdOut.Contains expectedNetStandardPathPortion) - testCase "Runner run script with 6.0.100-preview.3.21202.5 SDK version assemblies" <| fun _ -> + testCase "Runner run script with 6.0.100 SDK version assemblies" <| fun _ -> try use d = createTestDir() let installerDir = Path.Combine(d.Dir, "Temp Dir") @@ -45,22 +45,22 @@ let tests = { option.InstallerOptions o with CustomDownloadDir = Some installerDir } ForceInstall = true - WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60-preview" + WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60100" CustomInstallDir = Some preparedDir Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.100-preview.3.21202.5" }) + Version = DotNet.CliVersion.Version "6.0.100" }) |> ignore Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" preparedDir let result = handleAndFormat <| fun _ -> - fakeRunAndCheck Ctx.Verbose "reference-assemblies.fsx" "reference-assemblies.fsx" "core-reference-assemblies-net60-preview" + fakeRunAndCheck Ctx.Verbose "reference-assemblies.fsx" "reference-assemblies.fsx" "core-reference-assemblies-net60100" let stdOut = String.Join("\n", result.Messages).Trim() - let expectedNet6PathPortion = "packs""Microsoft.NETCore.App.Ref""6.0.0-preview.3.21201.4""ref""net6.0" + let expectedNet6PathPortion = "packs""Microsoft.NETCore.App.Ref""6.0.0""ref""net6.0" (sprintf "stdout should contain path like '%s', but was: '%s'" expectedNet6PathPortion stdOut) |> Expect.isTrue (stdOut.Contains expectedNet6PathPortion) @@ -68,7 +68,7 @@ let tests = // clean up after the test run Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" "" - testCase "Runner run script with 6.0.100 SDK version assemblies" <| fun _ -> + testCase "Runner run script with 6.0.101 SDK version assemblies" <| fun _ -> try use d = createTestDir() let installerDir = Path.Combine(d.Dir, "Temp Dir") @@ -82,22 +82,22 @@ let tests = { option.InstallerOptions o with CustomDownloadDir = Some installerDir } ForceInstall = true - WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60" + WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60101" CustomInstallDir = Some preparedDir Channel = DotNet.CliChannel.Version 6 0 - Version = DotNet.CliVersion.Version "6.0.100" }) + Version = DotNet.CliVersion.Version "6.0.101" }) |> ignore Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" preparedDir let result = handleAndFormat <| fun _ -> - fakeRunAndCheck Ctx.Verbose "reference-assemblies.fsx" "reference-assemblies.fsx" "core-reference-assemblies-net60" + fakeRunAndCheck Ctx.Verbose "reference-assemblies.fsx" "reference-assemblies.fsx" "core-reference-assemblies-net60101" let stdOut = String.Join("\n", result.Messages).Trim() - let expectedNet6PathPortion = "packs""Microsoft.NETCore.App.Ref""6.0.0""ref""net6.0" + let expectedNet6PathPortion = "packs""Microsoft.NETCore.App.Ref""6.0.1""ref""net6.0" (sprintf "stdout should contain path like '%s', but was: '%s'" expectedNet6PathPortion stdOut) |> Expect.isTrue (stdOut.Contains expectedNet6PathPortion) From caecad6d94654067d75e3fcf413a9b012fe7be2a Mon Sep 17 00:00:00 2001 From: Yazeed Obaid Date: Wed, 19 Jan 2022 15:09:29 +0200 Subject: [PATCH 2/3] fix template tests. dotnet new -u now returns error if template is not found. --- .../Fake.DotNet.Cli.IntegrationTests/TemplateTests.fs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/test/Fake.DotNet.Cli.IntegrationTests/TemplateTests.fs b/src/test/Fake.DotNet.Cli.IntegrationTests/TemplateTests.fs index 5ae8155fe79..982a16124c1 100644 --- a/src/test/Fake.DotNet.Cli.IntegrationTests/TemplateTests.fs +++ b/src/test/Fake.DotNet.Cli.IntegrationTests/TemplateTests.fs @@ -2,6 +2,7 @@ open Expecto open System +open System.Linq open System.IO open Fake.Core @@ -26,7 +27,14 @@ let inline redirect () = DotNet.Options.lift (fun opts -> { opts with RedirectOutput = true }) let uninstallTemplate () = - DotNet.exec (opts() >> redirect()) "new" (sprintf "-u %s" templatePackageName) + let result = DotNet.exec (opts() >> redirect()) "new" $"-u %s{templatePackageName}" + + // we will check if the install command has returned error and message is template is not found. + // if that is the case, then we will just redirect output as success and change process result to + // exit code of zero. + match result.Results.Any(fun (result:ConsoleMessage) -> result.Message.Equals $"The template package '{templatePackageName}' is not found.") with + | true -> ProcessResult.New 0 result.Results + | false -> result let installTemplateFrom pathToNupkg = DotNet.exec (opts() >> redirect()) "new" (sprintf "-i %s" pathToNupkg) From 434a84967691c786d78c5a5c48e9e8b4774f0988 Mon Sep 17 00:00:00 2001 From: Yazeed Obaid Date: Wed, 19 Jan 2022 16:42:59 +0200 Subject: [PATCH 3/3] increase timeout to 30 mins --- src/test/Fake.Core.UnitTests/Main.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/Fake.Core.UnitTests/Main.fs b/src/test/Fake.Core.UnitTests/Main.fs index e7f0f3e3ff2..6829ac336b6 100644 --- a/src/test/Fake.Core.UnitTests/Main.fs +++ b/src/test/Fake.Core.UnitTests/Main.fs @@ -9,7 +9,7 @@ let main argv = let writeResults = TestResults.writeNUnitSummary ("Fake_Core_UnitTests.TestResults.xml", "Fake.Core.UnitTests") let config = defaultConfig - |> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(20.)) + |> ExpectoHelpers.addTimeout (TimeSpan.FromMinutes(30.)) |> ExpectoHelpers.setFakePrinter |> ExpectoHelpers.appendSummaryHandler writeResults Expecto.Tests.runTestsInAssembly config argv