SDK Updates - Avalonia forced to net5.0

SteveGilham · Mar 8, 2023 · 8000b62 · 8000b62
1 parent 9885873
commit 8000b62
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 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.1.17",
+      "version": "5.1.18",
       "commands": [
         "reportgenerator"
       ]

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -20,7 +20,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.200'
+        dotnet-version: '7.0.201'
     - name: Tools
       run: dotnet tool restore
     - name: Setup
@@ -51,7 +51,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '7.0.200'
+        dotnet-version: '7.0.201'
     - name: Tools
       run: dotnet tool restore
     - name: Setup

diff --git a/AltCover.Avalonia/AltCover.Avalonia.fsproj b/AltCover.Avalonia/AltCover.Avalonia.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>AltCover.Visualizer</RootNamespace>
     <AssemblyName>AltCover.Visualizer</AssemblyName>
     <PackAsTool>True</PackAsTool>

diff --git a/AltCover.Avalonia/AltCover.Avalonia11.fsproj b/AltCover.Avalonia/AltCover.Avalonia11.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>AltCover.Visualizer</RootNamespace>
     <AssemblyName>AltCover.Visualizer</AssemblyName>
     <PackAsTool>True</PackAsTool>

diff --git a/AltCover.FontSupport/AltCover.FontSupport.csproj b/AltCover.FontSupport/AltCover.FontSupport.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fake.Core.Process" Condition="'$(TargetFramework)' != 'net472'" VersionOverride="5.23.1" />
+    <PackageReference Include="Fake.Core.Process" Condition="'$(TargetFramework)' != 'net472'" VersionOverride="6.0.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/Build/targets.fs b/Build/targets.fs
@@ -1096,9 +1096,9 @@ module Targets =
            "_Binaries/AltCover.Visualizer/Debug+AnyCPU/net472/AltCover.Visualizer.exe" ])
         ("./Build/common-rules.xml",
          [ "_Binaries/AltCover/Debug+AnyCPU/netcoreapp2.1/AltCover.dll" // global tool builds
-           "_Binaries/AltCover.Avalonia/Debug+AnyCPU/netcoreapp2.1/AltCover.Visualizer.dll" ])
+           "_Binaries/AltCover.Avalonia/Debug+AnyCPU/net5.0/AltCover.Visualizer.dll" ])
         ("./Build/common-rules.xml",
-         [ "_Binaries/AltCover.Avalonia11/Debug+AnyCPU/netcoreapp2.1/AltCover.Visualizer.dll" ])
+         [ "_Binaries/AltCover.Avalonia11/Debug+AnyCPU/net5.0/AltCover.Visualizer.dll" ])
         ("./Build/csharp-rules.xml",
          [ "_Binaries/AltCover.DataCollector/Debug+AnyCPU/netstandard2.0/AltCover.DataCollector.dll"
            "_Binaries/AltCover.Monitor/Debug+AnyCPU/netstandard2.0/AltCover.Local.Monitor.dll"
@@ -1321,9 +1321,9 @@ module Targets =
          minimalRules)
         //          (dixon, // new platform
         //           Option.get refdir,
-        //           [ // new platform "_Binaries/AltCover.Avalonia/Debug+AnyCPU/netcoreapp2.1/AltCover.Visualizer.dll" // Avalonia
+        //           [ // new platform "_Binaries/AltCover.Avalonia/Debug+AnyCPU/net5.0/AltCover.Visualizer.dll" // Avalonia
         //             //  GetReaderForFile returned an unexpected HResult: 0x80004005. // same at net472 if built thus
-        //             "_Binaries/AltCover.Avalonia/Debug+AnyCPU/netstandard2.0/AltCover.Visualizer.dll" ], [], defaultRules)
+        //             "_Binaries/AltCover.Avalonia/Debug+AnyCPU/net5.0/AltCover.Visualizer.dll" ], [], defaultRules)
         (dixon,
          Option.get refdir,
          [ "_Binaries/AltCover.Cake/Debug+AnyCPU/netstandard2.0/AltCover.Cake.dll" ],
@@ -4284,7 +4284,7 @@ module Targets =
                     DistributedLoggers = None
                     DisableInternalBinLog = true
                     Properties = options.MSBuildParams.Properties }
-              Framework = Some "netcoreapp2.1" })
+              Framework = Some "net5.0" })
         (Path.getFullName "./AltCover.Avalonia/AltCover.Avalonia.fsproj")
 
       // dotnet tooling mods

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -44,15 +44,15 @@
     <PackageVersion Include="FsUnit" Version="5.2.0" />
     <PackageVersion Include="FuChu" Version="1.1.0" />
     <PackageVersion Include="GtkSharp" Version="3.24.24.38" />
-    <PackageVersion Include="Handlebars.Net" Version="2.1.3" />
-    <PackageVersion Include="Markdig" Version="0.30.4" />
+    <PackageVersion Include="Handlebars.Net" Version="2.1.4" />
+    <PackageVersion Include="Markdig" Version="0.31.0" />
     <PackageVersion Include="MessageBox.Avalonia" Version="2.1.0" />
     <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.4.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.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.4.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="16.0.0" />
     <PackageVersion Include="Mono.Cecil" Version="0.11.4" />
@@ -61,14 +61,14 @@
     <PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
     <PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.5.119" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="NuGet.CommandLine" Version="6.4.0" />
     <PackageVersion Include="NUnit" Version="3.13.3" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.4.2" />
     <!-- 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.2" />
+    <PackageVersion Include="NUnit.ConsoleRunner" Condition="'$(OS)' == 'Windows_NT'" Version="3.16.3" />
     <PackageVersion Include="OpenCover" Version="4.7.1221" />
     <PackageVersion Include="Pester" Version="5.4.0" />
     <PackageVersion Include="PowerShellStandard.Library" Version="5.1.1" />

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