Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update the .NET SDK in the CI builds to 6.0.301, take 2 #2794

Merged
merged 1 commit into from
Jul 31, 2024
Merged

Update the .NET SDK in the CI builds to 6.0.301, take 2 #2794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_and_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk" : {
"version": "6.0.101",
"version": "6.0.301",
"rollForward": "latestMinor"
}
}
2 changes: 1 addition & 1 deletion integrationtests/core-reference-assemblies-net60100/before/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk" : {
"version": "6.0.100"
"version": "6.0.300"
}
}
2 changes: 1 addition & 1 deletion integrationtests/core-reference-assemblies-net60101-rollforward/before/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk" : {
"version": "6.0.100"
"version": "6.0.300"
}
}
2 changes: 1 addition & 1 deletion integrationtests/core-reference-assemblies-net60101/before/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk" : {
"version": "6.0.101"
"version": "6.0.301"
}
}
20 changes: 10 additions & 10 deletions src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ()
Expand All @@ -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
Expand All @@ -47,15 +47,15 @@ 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)
finally
// 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 ()
Expand All @@ -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
Expand All @@ -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)
Expand All @@ -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 =
Expand All @@ -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 ()
Expand All @@ -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
Expand All @@ -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.."
Expand Down
Loading