.NET SDK 6.0.301

fsprojects · Jul 31, 2024 · b585605 · b585605
1 parent 9bb7822
commit b585605
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,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 ()
@@ -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.."