Bump to SDK 8.0.200 and other updates

-- not fsharplint which runtime fails
SteveGilham · Feb 14, 2024 · 422c26a · 422c26a
1 parent f6113af
commit 422c26a
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 53 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-reportgenerator-globaltool": {
-      "version": "5.2.0",
+      "version": "5.2.1",
       "commands": [
         "reportgenerator"
       ]

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -32,7 +32,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.100'
+        dotnet-version: '8.0.200'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -63,7 +63,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.100'
+        dotnet-version: '8.0.200'
     - name: Tools
       run: dotnet tool restore
     - name: Setup

diff --git a/AltCover.Tests/XTests.fs b/AltCover.Tests/XTests.fs
@@ -873,7 +873,6 @@ module AltCoverXTests =
         [ "AltCover.Recorder.g.dll"
           "FSharp.Core.dll"
           "Newtonsoft.Json.dll"
-          "NuGet.Frameworks.dll"
           "Sample4.deps.json"
           "Sample4.dll"
           "Sample4.runtimeconfig.json"

diff --git a/AltCover.ValidateGendarmeEmulation/Tests.fs b/AltCover.ValidateGendarmeEmulation/Tests.fs
@@ -7,7 +7,7 @@ open AltCover
 open Mono.Cecil
 
 module Rocks =
-  [<TailCall>]
+  //[<TailCall>]
   let rec GetAllTypes (t: TypeDefinition) =
     t
     :: (List.collect

diff --git a/Build/setup.fs b/Build/setup.fs
@@ -102,7 +102,7 @@ module Setup =
     Target.description s
 
     let wrap f x =
-      printfn ">> %A <<" x
+      //printfn ">> %A <<" x
       f ()
 
     Target.create s (wrap f)

diff --git a/Demo/Echo/Echo/Echo.csproj b/Demo/Echo/Echo/Echo.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/Demo/Echo/Test/Test.csproj b/Demo/Echo/Test/Test.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AltCover" Version="6.1.708" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
+    <PackageReference Include="AltCover" Version="8.6.125" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.2.1" />
   </ItemGroup>
 
 </Project>
diff --git a/Demo/MultiTest/System1/System1.fsproj b/Demo/MultiTest/System1/System1.fsproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/Demo/MultiTest/System2/System2.fsproj b/Demo/MultiTest/System2/System2.fsproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/Demo/MultiTest/Test1/Test1.fsproj b/Demo/MultiTest/Test1/Test1.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,14 +11,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="altcover" Version="4.0.659" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="altcover" Version="8.6.125" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/Demo/MultiTest/Test2/Test2.fsproj b/Demo/MultiTest/Test2/Test2.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -11,14 +11,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="altcover" Version="4.0.659" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="altcover" Version="8.6.125" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.6.6" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/Demo/Service/Service/Service.fsproj b/Demo/Service/Service/Service.fsproj
@@ -28,11 +28,11 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="altcover" Version="8.0.816" />
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="altcover" Version="8.6.125" />
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,13 +4,13 @@
     <PackageVersion Include="AltCode.Fake.DotNet.Gendarme" Version="5.23.0.42" />
     <PackageVersion Include="AltCode.Dixon" Version="2022.12.6.11014" />
     <PackageVersion Include="altcode.gendarme" Version="2023.12.27.19054" />
-    <PackageVersion Include="altcover" Version="8.6.95" />
+    <PackageVersion Include="altcover" Version="8.6.125" />
     <PackageVersion Include="AltCover.Api" Version="8.6.95" />
     <PackageVersion Include="AltCover.Fake" Version="8.6.95" />
-    <PackageVersion Include="Avalonia" Version="11.0.6" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.0.6" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.6" />
-    <PackageVersion Include="Avalonia.Themes.Simple" Version="11.0.6" />
+    <PackageVersion Include="Avalonia" Version="11.0.9" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.9" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.9" />
+    <PackageVersion Include="Avalonia.Themes.Simple" Version="11.0.9" />
     <PackageVersion Include="BlackFox.CommandLine" Version="1.0.0" />
     <PackageVersion Include="BlackFox.VsWhere" Version="1.1.0" />
     <PackageVersion Include="Cake.Common" Condition="'$(TargetFramework)' == 'netstandard2.0'" Version="1.0.0" />
@@ -40,7 +40,7 @@
     <PackageVersion Include="Fake.Testing.ReportGenerator" Version="5.23.0" />
     <PackageVersion Include="Fake.Tools.git" Version="5.23.0" />
     <PackageVersion Include="FSharp.Compiler.Tools" Version="10.2.3" />
-    <PackageVersion Include="FSharp.Core" Version="8.0.100" />
+    <PackageVersion Include="FSharp.Core" Version="8.0.200" />
     <PackageVersion Include="FsUnit" Version="5.6.0" />
     <PackageVersion Include="FuChu" Version="1.1.0" />
     <PackageVersion Include="GtkSharp" Version="3.24.24.95" />
@@ -49,26 +49,26 @@
     <PackageVersion Include="MessageBox.Avalonia" Version="3.1.5.1" />
     <PackageVersion Include="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="2.1.1" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="16.0.461" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <!-- PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" / -->
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="16.0.0" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.5" />
     <PackageVersion Include="Mono.CSharp" Version="4.0.0.143" />
     <PackageVersion Include="Mono.Options" Version="6.12.0.148" />
-    <PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.2.1" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.2.1" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="NuGet.CommandLine" Version="6.8.0" />
+    <PackageVersion Include="NuGet.CommandLine" Version="6.9.1" />
     <PackageVersion Include="NUnit" Version="4.0.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <!-- This one w/just net20/net40 agents works as before on Linux for the AltCoverRunner test -->
     <PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' != 'Windows_NT'" Version="3.12.0" />
     <!-- This one w/extra netcore3.1 agent causes mono vs framework problems for some reason on the AltCoverRunner test -->
-    <PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' == 'Windows_NT'" Version="3.16.3" />
+    <PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' == 'Windows_NT'" Version="3.17.0" />
     <PackageVersion Include="OpenCover" Version="4.7.1221" />
     <PackageVersion Include="Pester" Version="5.5.0" />
     <PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />
@@ -79,14 +79,14 @@
     <PackageVersion Include="System.ValueTuple" Version="4.5.0" />
     <PackageVersion Include="Unquote" Version="7.0.0" />
     <PackageVersion Include="XmlDoc2CmdletDoc" Version="0.4.0-dotnetcore0001" />
-    <PackageVersion Include="xunit" Version="2.6.4" />
+    <PackageVersion Include="xunit" Version="2.6.6" />
     <PackageVersion Include="xunit.abstractions" Version="2.0.3" />
-    <PackageVersion Include="xunit.analyzers" Version="1.8.0" />
-    <PackageVersion Include="xunit.assert" Version="2.6.4" />
-    <PackageVersion Include="xunit.core" Version="2.6.4" />
-    <PackageVersion Include="xunit.extensibility.core" Version="2.6.4" />
-    <PackageVersion Include="xunit.extensibility.execution" Version="2.6.4" />
-    <PackageVersion Include="xunit.runner.console" Version="2.6.4" />
+    <PackageVersion Include="xunit.analyzers" Version="1.10.0" />
+    <PackageVersion Include="xunit.assert" Version="2.6.6" />
+    <PackageVersion Include="xunit.core" Version="2.6.6" />
+    <PackageVersion Include="xunit.extensibility.core" Version="2.6.6" />
+    <PackageVersion Include="xunit.extensibility.execution" Version="2.6.6" />
+    <PackageVersion Include="xunit.runner.console" Version="2.6.6" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
     <PackageVersion Include="YoloDev.Expecto.TestSdk" Version="0.14.3" />
   </ItemGroup>

diff --git a/RegressionTesting/issue156/Tests/Tests.csproj b/RegressionTesting/issue156/Tests/Tests.csproj
@@ -10,7 +10,10 @@
         <TestProjectType>UnitTest</TestProjectType>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="xunit.runner.console" />
+        <PackageReference Include="xunit.runner.console">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="MSTest.TestFramework" />
         <PackageReference Include="MSTest.TestAdapter" />
     </ItemGroup>

diff --git a/Samples/Sample15/Sample15/Sample15.fsproj b/Samples/Sample15/Sample15/Sample15.fsproj
@@ -29,7 +29,7 @@
   <Import Project="$(FSharpTargetsPath)" />
 
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="5.0.1">
+    <PackageReference Include="FSharp.Core" Version="8.0.200">
       <ExcludeAssets>contentfiles</ExcludeAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/Samples/Sample29/SimpleMix/SimpleMix.vcxproj b/Samples/Sample29/SimpleMix/SimpleMix.vcxproj
@@ -21,15 +21,15 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
     <CLRSupport>true</CLRSupport>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.200",
     "rollForward": "latestMinor"
   }
 }