Skip to content

Commit b585605

Browse files
Numpsyxperiandri
authored andcommitted
.NET SDK 6.0.301
1 parent 9bb7822 commit b585605

File tree

7 files changed

+16
-16
lines changed

7 files changed

+16
-16
lines changed

.github/workflows/build_and_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET 6
1616
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: '6.0.101'
18+
dotnet-version: '6.0.301'
1919
- name: Restore dotnet tools
2020
run: dotnet tool restore
2121
- name: remove current fake runner tool

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
- name: Setup .NET 6
2020
uses: actions/setup-dotnet@v4
2121
with:
22-
dotnet-version: '6.0.101'
22+
dotnet-version: '6.0.301'
2323
- name: Restore dotnet tools
2424
run: dotnet tool restore
2525
- name: remove current fake runner tool

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk" : {
3-
"version": "6.0.101",
3+
"version": "6.0.301",
44
"rollForward": "latestMinor"
55
}
66
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk" : {
3-
"version": "6.0.100"
3+
"version": "6.0.300"
44
}
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk" : {
3-
"version": "6.0.100"
3+
"version": "6.0.300"
44
}
55
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk" : {
3-
"version": "6.0.101"
3+
"version": "6.0.301"
44
}
55
}

src/test/Fake.Core.IntegrationTests/Fake.DotNet.sdkAssemblyResolver.fs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ open Fake.Runtime
1313
let tests =
1414
testList
1515
"Fake.DotNet.sdkAssemblyResolverTests"
16-
[ testCase "Runner run script with 6.0.100 SDK version assemblies"
16+
[ testCase "Runner run script with 6.0.300 SDK version assemblies"
1717
<| fun _ ->
1818
try
1919
use d = createTestDir ()
@@ -30,7 +30,7 @@ let tests =
3030
WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60100"
3131
CustomInstallDir = Some preparedDir
3232
Channel = DotNet.CliChannel.Version 6 0
33-
Version = DotNet.CliVersion.Version "6.0.100" })
33+
Version = DotNet.CliVersion.Version "6.0.300" })
3434
|> ignore
3535

3636
Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" preparedDir
@@ -47,15 +47,15 @@ let tests =
4747
let stdOut = String.Join("\n", result.Messages).Trim()
4848

4949
let expectedNet6PathPortion =
50-
"packs" </> "Microsoft.NETCore.App.Ref" </> "6.0.0" </> "ref" </> "net6.0"
50+
"packs" </> "Microsoft.NETCore.App.Ref" </> "6.0.5" </> "ref" </> "net6.0"
5151

5252
(sprintf "stdout should contain path like '%s', but was: '%s'" expectedNet6PathPortion stdOut)
5353
|> Expect.isTrue (stdOut.Contains expectedNet6PathPortion)
5454
finally
5555
// clean up after the test run
5656
Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" ""
5757

58-
testCase "Runner run script with 6.0.101 SDK version assemblies"
58+
testCase "Runner run script with 6.0.301 SDK version assemblies"
5959
<| fun _ ->
6060
try
6161
use d = createTestDir ()
@@ -72,7 +72,7 @@ let tests =
7272
WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60101"
7373
CustomInstallDir = Some preparedDir
7474
Channel = DotNet.CliChannel.Version 6 0
75-
Version = DotNet.CliVersion.Version "6.0.101" })
75+
Version = DotNet.CliVersion.Version "6.0.301" })
7676
|> ignore
7777

7878
Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" preparedDir
@@ -89,7 +89,7 @@ let tests =
8989
let stdOut = String.Join("\n", result.Messages).Trim()
9090

9191
let expectedNet6PathPortion =
92-
"packs" </> "Microsoft.NETCore.App.Ref" </> "6.0.1" </> "ref" </> "net6.0"
92+
"packs" </> "Microsoft.NETCore.App.Ref" </> "6.0.6" </> "ref" </> "net6.0"
9393

9494
(sprintf "stdout should contain path like '%s', but was: '%s'" expectedNet6PathPortion stdOut)
9595
|> Expect.isTrue (stdOut.Contains expectedNet6PathPortion)
@@ -113,7 +113,7 @@ let tests =
113113
WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60101-rollforward"
114114
CustomInstallDir = Some preparedDir
115115
Channel = DotNet.CliChannel.Version 6 0
116-
Version = DotNet.CliVersion.Version "6.0.101" })
116+
Version = DotNet.CliVersion.Version "6.0.301" })
117117
|> ignore
118118

119119
let result =
@@ -127,7 +127,7 @@ let tests =
127127

128128
Expect.isTrue result.OK "The build did not succeed"
129129

130-
testCase "Runner run script with 6.0.100 SDK version assemblies and resolve runtime version from cached file"
130+
testCase "Runner run script with 6.0.300 SDK version assemblies and resolve runtime version from cached file"
131131
<| fun _ ->
132132
try
133133
use d = createTestDir ()
@@ -144,7 +144,7 @@ let tests =
144144
WorkingDirectory = scenarioTempPath "core-reference-assemblies-net60100"
145145
CustomInstallDir = Some preparedDir
146146
Channel = DotNet.CliChannel.Version 6 0
147-
Version = DotNet.CliVersion.Version "6.0.100" })
147+
Version = DotNet.CliVersion.Version "6.0.300" })
148148
|> ignore
149149

150150
Environment.setEnvironVar "FAKE_SDK_RESOLVER_CUSTOM_DOTNET_PATH" preparedDir
@@ -164,7 +164,7 @@ let tests =
164164
printfn "%s" stdOut
165165

166166
let expectedNet6PathPortion =
167-
"packs" </> "Microsoft.NETCore.App.Ref" </> "6.0.0" </> "ref" </> "net6.0"
167+
"packs" </> "Microsoft.NETCore.App.Ref" </> "6.0.5" </> "ref" </> "net6.0"
168168

169169
let expectedCacheFileResolutionMessage =
170170
"Trying to resolve runtime version from cache.."

0 commit comments

Comments
 (0)