Update the TFMs (#146)

* initial move to net9.0 * Deal with NuGet vulnerabilities * fix build errors * fix unit tests
jaredpar · Jul 25, 2024 · 5ccbd34 · 5ccbd34
1 parent 9d78014
commit 5ccbd34
Show file tree

Hide file tree

Showing 13 changed files with 54 additions and 46 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,8 +1,6 @@
-FROM mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm
+FROM mcr.microsoft.com/devcontainers/dotnet:8.0
 
-RUN wget https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \
-    sudo dpkg -i packages-microsoft-prod.deb && \
-    rm packages-microsoft-prod.deb
-
-RUN sudo apt-get update && \
-    sudo apt-get install -y dotnet-sdk-7.0
+RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh && \
+    chmod +x dotnet-install.sh && \
+    ./dotnet-install.sh --channel 9.0 --version latest --quality preview --install-dir /usr/share/dotnet && \
+    rm dotnet-install.sh
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -48,8 +48,8 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: |
-          7.0.x
           8.0.x
+          9.0.x
 
     - name: Restore dependencies
       run: dotnet restore
@@ -58,23 +58,23 @@ jobs:
 
     - name: Test Linux
       run: >
-        dotnet test --no-build --framework net7.0 
+        dotnet test --no-build --framework net8.0 
         --logger "console;verbosity=detailed"
         --logger "trx;LogFileName=${{ env.TEST_RESULTS_PATH }}/TestResults-Linux.trx"
         -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:CoverletOutput=${{ env.TEST_COVERAGE_PATH }}/coverage.linux.xml
       if: matrix.os == 'ubuntu-latest'
 
     - name: Test Windows .NET Core
       run: >
-        dotnet test --no-build --framework net7.0
+        dotnet test --no-build --framework net8.0
         --logger "console;verbosity=detailed"
         --logger "trx;LogFileName=${{ env.TEST_RESULTS_PATH}}/TestResults-Windows-Core.trx"
         -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:CoverletOutput=${{ env.TEST_COVERAGE_PATH }}/coverage.windows.core.xml
       if: matrix.os == 'windows-latest'
 
     - name: Test Windows .NET Framework
       run: >
-        dotnet test --no-build --framework net7.0
+        dotnet test --no-build --framework net8.0
         --logger "console;verbosity=detailed"
         --logger "trx;LogFileName=${{ env.TEST_RESULTS_PATH}}/TestResults-Windows-Framework.trx"
         -p:CollectCoverage=true -p:CoverletOutputFormat=cobertura -p:CoverletOutput=${{ env.TEST_COVERAGE_PATH }}/coverage.windows.framework.xml

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/artifacts/bin/Basic.CompilerLog/debug_net7.0/Basic.CompilerLog.dll",
+            "program": "${workspaceFolder}/artifacts/bin/Basic.CompilerLog/debug_net8.0/Basic.CompilerLog.dll",
             "args": ["print", ".\\msbuild.binlog" ],
             "cwd": "e:\\temp\\console",
             // "cwd": "${workspaceFolder}/src/Basic.CompilerLog",

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,26 +1,29 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <_RoslynVersion>4.10.0</_RoslynVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Basic.Reference.Assemblies.Net60" Version="1.6.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.5" />
     <PackageVersion Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.5" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
     <PackageVersion Include="MessagePack" Version="2.5.129" />
-    <PackageVersion Include="Microsoft.CodeAnalysis" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="4.9.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis" Version="$(_RoslynVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(_RoslynVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(_RoslynVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(_RoslynVersion)" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic.Features" Version="$(_RoslynVersion)" />
     <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="7.0.13" />
-    <PackageVersion Include="Microsoft.NET.Test.SDK" Version="17.1.0" />
+    <PackageVersion Include="Microsoft.IO.Redist" Version="6.0.1" />
+    <PackageVersion Include="Microsoft.NET.Test.SDK" Version="17.10.0" />
     <PackageVersion Include="Mono.Options" Version="6.12.0.148" />
-    <PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.235" />
+    <PackageVersion Include="MSBuild.StructuredLogger" Version="2.2.243" />
     <PackageVersion Include="System.Buffers" Version="4.5.1" />
     <PackageVersion Include="System.IO.Compression" Version="4.3.0" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
   </ItemGroup>
 </Project>
diff --git a/src/Basic.CompilerLog.UnitTests/Basic.CompilerLog.UnitTests.csproj b/src/Basic.CompilerLog.UnitTests/Basic.CompilerLog.UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0;net472</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <NoWarn>CS0436</NoWarn>
@@ -15,7 +15,7 @@
     <Compile Include="..\Shared\PathUtil.cs" Link="PathUtil.cs" />
     <Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
     <ProjectReference Include="..\Basic.CompilerLog.Util\Basic.CompilerLog.Util.csproj" />
-    <ProjectReference Include="..\Basic.CompilerLog\Basic.CompilerLog.csproj" Condition="'$(TargetFramework)' == 'net7.0'" />
+    <ProjectReference Include="..\Basic.CompilerLog\Basic.CompilerLog.csproj" Condition="'$(TargetFramework)' == 'net8.0'" />
     <PackageReference Include="Basic.Reference.Assemblies.Net60" />
     <PackageReference Include="coverlet.msbuild" >
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -24,7 +24,9 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" />
     <PackageReference Include="System.Buffers" />
+    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == 'net472'" />
     <PackageReference Include="xunit" />
     <PackageReference Include="xunit.runner.visualstudio" >
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Basic.CompilerLog.UnitTests/CompilerLogFixture.cs b/src/Basic.CompilerLog.UnitTests/CompilerLogFixture.cs
@@ -111,7 +111,7 @@ public CompilerLogFixture(IMessageSink messageSink)
                 <Project Sdk="Microsoft.NET.Sdk">
                   <PropertyGroup>
                     <OutputType>Exe</OutputType>
-                    <TargetFramework>net7.0</TargetFramework>
+                    <TargetFramework>net8.0</TargetFramework>
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                   </PropertyGroup>
@@ -140,7 +140,7 @@ partial class Util {
             var projectFileContent = """
                 <Project Sdk="Microsoft.NET.Sdk">
                   <PropertyGroup>
-                    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+                    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                   </PropertyGroup>
@@ -165,7 +165,7 @@ partial class Util {
             var projectFileContent = """
                 <Project Sdk="Microsoft.NET.Sdk">
                   <PropertyGroup>
-                    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+                    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <ProduceOnlyReferenceAssembly>true</ProduceOnlyReferenceAssembly>
@@ -207,7 +207,7 @@ End Module
                     <PropertyGroup>
                         <OutputType>Exe</OutputType>
                         <RootNamespace>vbconsole</RootNamespace>
-                        <TargetFramework>net7.0</TargetFramework>
+                        <TargetFramework>net8.0</TargetFramework>
                         <EmbedAllSources>true</EmbedAllSources>
                     </PropertyGroup>
                 </Project>
@@ -223,7 +223,7 @@ End Module
                 <Project Sdk="Microsoft.NET.Sdk">
                   <PropertyGroup>
                     <OutputType>Exe</OutputType>
-                    <TargetFramework>net7.0</TargetFramework>
+                    <TargetFramework>net8.0</TargetFramework>
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                     <EmbedAllSources>true</EmbedAllSources>
@@ -322,7 +322,7 @@ This is an awesome resource
 
         ClassLib = WithBuild("classlib.complog", void (string scratchPath) =>
         {
-            RunDotnetCommand($"new classlib --name classlib --output . --framework net7.0", scratchPath);
+            RunDotnetCommand($"new classlib --name classlib --output . --framework net8.0", scratchPath);
             var program = """
                 using System;
                 using System.Text.RegularExpressions;
@@ -359,7 +359,7 @@ Lazy<LogData> WithBuild(string name, Action<string> action, bool expectDiagnosti
                     var scratchPath = Path.Combine(ScratchDirecectory, Guid.NewGuid().ToString("N"));
                     Directory.CreateDirectory(scratchPath);
                     messageSink.OnDiagnosticMessage($"Starting {name} in {scratchPath}");
-                    RunDotnetCommand("new globaljson --sdk-version 7.0.400", scratchPath);
+                    RunDotnetCommand("new globaljson --sdk-version 8.0.300", scratchPath);
                     action(scratchPath);
                     var binlogFilePath = Path.Combine(scratchPath, "msbuild.binlog");
                     Assert.True(File.Exists(binlogFilePath));

diff --git a/src/Basic.CompilerLog.UnitTests/CompilerLogReaderTests.cs b/src/Basic.CompilerLog.UnitTests/CompilerLogReaderTests.cs
@@ -277,7 +277,7 @@ public void ProjectSingleTarget()
         using var reader = CompilerLogReader.Create(Fixture.ClassLib.Value.CompilerLogPath);
         var list = reader.ReadAllCompilationData();
         Assert.Single(list);
-        Assert.NotNull(list.Single(x => x.CompilerCall.TargetFramework == "net7.0"));
+        Assert.NotNull(list.Single(x => x.CompilerCall.TargetFramework == "net8.0"));
     }
 
     [Fact]
@@ -287,7 +287,7 @@ public void ProjectMultiTarget()
         var list = reader.ReadAllCompilationData();
         Assert.Equal(2, list.Count);
         Assert.NotNull(list.Single(x => x.CompilerCall.TargetFramework == "net6.0"));
-        Assert.NotNull(list.Single(x => x.CompilerCall.TargetFramework == "net7.0"));
+        Assert.NotNull(list.Single(x => x.CompilerCall.TargetFramework == "net8.0"));
     }
 
     [Fact]
@@ -346,7 +346,7 @@ public void NoneHostNativePdb()
               <PropertyGroup>
                 <OutputType>Exe</OutputType>
                 <DebugType>Full</DebugType>
-                <TargetFramework>net7.0</TargetFramework>
+                <TargetFramework>net8.0</TargetFramework>
                 <ImplicitUsings>enable</ImplicitUsings>
                 <Nullable>enable</Nullable>
               </PropertyGroup>

diff --git a/src/Basic.CompilerLog.UnitTests/ProgramTests.cs b/src/Basic.CompilerLog.UnitTests/ProgramTests.cs
@@ -354,7 +354,7 @@ public void ResponseMultiTarget()
         var exitCode = RunCompLog($"rsp {Fixture.ClassLibMultiProjectPath}");
         Assert.Equal(Constants.ExitSuccess, exitCode);
         Assert.True(File.Exists(Path.Combine(RootDirectory, @".complog", "rsp", "classlibmulti-net6.0", "build.rsp")));
-        Assert.True(File.Exists(Path.Combine(RootDirectory, @".complog", "rsp", "classlibmulti-net7.0", "build.rsp")));
+        Assert.True(File.Exists(Path.Combine(RootDirectory, @".complog", "rsp", "classlibmulti-net8.0", "build.rsp")));
     }
 
     [Fact]
@@ -410,7 +410,7 @@ public void ResponseInlineMultiTarget()
         Assert.Equal(Constants.ExitSuccess, exitCode);
         Assert.Contains("Generating response files inline", output);
         Assert.True(File.Exists(Path.Combine(dir, "build-net6.0.rsp")));
-        Assert.True(File.Exists(Path.Combine(dir, "build-net7.0.rsp")));
+        Assert.True(File.Exists(Path.Combine(dir, "build-net8.0.rsp")));
     }
 
     [Fact]
@@ -694,17 +694,17 @@ public void PrintAll()
     {
         var (exitCode, output) = RunCompLogEx($"print {Fixture.SolutionBinaryLogPath}");
         Assert.Equal(Constants.ExitSuccess, exitCode);
-        Assert.Contains("console.csproj (net7.0)", output);
-        Assert.Contains("classlib.csproj (net7.0)", output);
+        Assert.Contains("console.csproj (net8.0)", output);
+        Assert.Contains("classlib.csproj (net8.0)", output);
     }
 
     [Fact]
     public void PrintOne()
     {
         var (exitCode, output) = RunCompLogEx($"print {Fixture.SolutionBinaryLogPath} -p classlib.csproj");
         Assert.Equal(Constants.ExitSuccess, exitCode);
-        Assert.DoesNotContain("console.csproj (net7.0)", output);
-        Assert.Contains("classlib.csproj (net7.0)", output);
+        Assert.DoesNotContain("console.csproj (net8.0)", output);
+        Assert.Contains("classlib.csproj (net8.0)", output);
     }
 
     [Fact]
@@ -778,9 +778,9 @@ public void PrintKinds()
     [Fact]
     public void PrintFrameworks()
     {
-        var (exitCode, output) = RunCompLogEx($"print --include {Fixture.ClassLibMultiProjectPath} --framework net7.0");
+        var (exitCode, output) = RunCompLogEx($"print --include {Fixture.ClassLibMultiProjectPath} --framework net8.0");
         Assert.Equal(Constants.ExitSuccess, exitCode);
-        Assert.Contains("(net7.0)", output);
+        Assert.Contains("(net8.0)", output);
     }
 
     [Fact]

diff --git a/src/Basic.CompilerLog.UnitTests/SolutionFixture.cs b/src/Basic.CompilerLog.UnitTests/SolutionFixture.cs
@@ -62,7 +62,7 @@ public SolutionFixture(IMessageSink messageSink)
         var binlogDir = Path.Combine(StorageDirectory, "binlogs");
         Directory.CreateDirectory(binlogDir);
 
-        RunDotnetCommand("new globaljson --sdk-version 7.0.400", StorageDirectory);
+        RunDotnetCommand("new globaljson --sdk-version 8.0.300", StorageDirectory);
         RunDotnetCommand("dotnet new sln -n Solution", StorageDirectory);
 
         var builder = ImmutableArray.CreateBuilder<string>();
@@ -98,7 +98,7 @@ partial class Util {
             var projectFileContent = """
                 <Project Sdk="Microsoft.NET.Sdk">
                   <PropertyGroup>
-                    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+                    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
                     <ImplicitUsings>enable</ImplicitUsings>
                     <Nullable>enable</Nullable>
                   </PropertyGroup>

diff --git a/src/Basic.CompilerLog.Util/Basic.CompilerLog.Util.csproj b/src/Basic.CompilerLog.Util/Basic.CompilerLog.Util.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net472;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net472;netstandard2.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DebugType>embedded</DebugType>
@@ -22,6 +22,7 @@
     <PackageReference Include="Microsoft.Extensions.ObjectPool" />
     <PackageReference Include="MSBuild.StructuredLogger" />
     <PackageReference Include="System.IO.Compression" Condition="'$(TargetFramework)' == 'net472'" />
+    <PackageReference Include="Microsoft.IO.Redist" Condition="'$(TargetFramework)' == 'net472'" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Basic.CompilerLog.Util/Extensions.cs b/src/Basic.CompilerLog.Util/Extensions.cs
@@ -55,13 +55,15 @@ internal static string ReadLineOrThrow(this TextReader reader)
         throw new InvalidOperationException();
     }
 
+#if !NET
     internal static void AddRange<T>(this List<T> list, ReadOnlySpan<T> span)
     {
         foreach (var item in span)
         {
             list.Add(item);
         }
     }
+#endif
 
     /// <summary>
     /// Creates a <see cref="MemoryStream"/> that is a simple wrapper around the array. The intent

diff --git a/src/Basic.CompilerLog/Basic.CompilerLog.csproj b/src/Basic.CompilerLog/Basic.CompilerLog.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
@@ -33,6 +33,7 @@
     <Content Include="..\..\LICENSE" PackagePath="\" />
     <PackageReference Include="Mono.Options" />
     <ProjectReference Include="..\Basic.CompilerLog.Util\Basic.CompilerLog.Util.csproj" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Scratch/Scratch.csproj b/src/Scratch/Scratch.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -21,6 +21,7 @@
     <PackageReference Include="Basic.Reference.Assemblies.Net60" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Features" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic.Features" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
 </Project>