diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index fd08cbd8..d10ec4cb 100644 --- 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 index 80591981..34d93fc9 100644 --- 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 index 20e2280b..2404c2d9 100644 --- a/AltCover.Avalonia/AltCover.Avalonia.fsproj +++ b/AltCover.Avalonia/AltCover.Avalonia.fsproj @@ -2,7 +2,7 @@ WinExe - netcoreapp2.1 + net5.0 AltCover.Visualizer AltCover.Visualizer True diff --git a/AltCover.Avalonia/AltCover.Avalonia11.fsproj b/AltCover.Avalonia/AltCover.Avalonia11.fsproj index 5d9b0387..f2b88a2d 100644 --- a/AltCover.Avalonia/AltCover.Avalonia11.fsproj +++ b/AltCover.Avalonia/AltCover.Avalonia11.fsproj @@ -2,7 +2,7 @@ WinExe - netcoreapp2.1 + net5.0 AltCover.Visualizer AltCover.Visualizer True diff --git a/AltCover.FontSupport/AltCover.FontSupport.csproj b/AltCover.FontSupport/AltCover.FontSupport.csproj index d08a44cb..a543703b 100644 --- a/AltCover.FontSupport/AltCover.FontSupport.csproj +++ b/AltCover.FontSupport/AltCover.FontSupport.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/Build/targets.fs b/Build/targets.fs index 63d3c3e0..96994a60 100644 --- 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 index 39a70bf4..2200ba4a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -44,15 +44,15 @@ - - + + - + - + @@ -61,14 +61,14 @@ - + - + - + diff --git a/global.json b/global.json index 4225b981..c2893eb7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "7.0.200", + "version": "7.0.201", "rollForward": "latestMinor" } } \ No newline at end of file