From bf9ca0752e09ef2c1acca0a67c3168129cfd97ac Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Sat, 18 Nov 2023 19:24:23 -0500 Subject: [PATCH 1/3] Update README.md --- README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9b0ca063..d918f9b9 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Ever wanted to understand what your .NET portfolio looks like? Do you know what 5. Once a project file is found, it will stop scanning subdirectories (Note there is an [issue](https://github.com/samsmithnz/DotNetCensus/issues/88) to continue scanning) DotNet Census currently supports these .NET versions: -- .NET 5, 6, 7, 8, etc +- .NET 5, 6, 7, 8, 9, etc - .NET Core 1 to 3.1 (including older .NET Core 1 and 1.1 project.json formats) - .NET Framework (including .NET Framework 3.5 website formats with no project files) - .NET Standard 1 to 2.1 @@ -37,7 +37,7 @@ If we missed a version - please add an issue and we will fix it! ## To use -1. This tool requires the .NET 6 or .NET 7 SDK to be installed. +1. This tool requires the .NET 6 or .NET 8 SDK to be installed. 2. Then install: `dotnet tool install -g dotnet-census` 3. Then run the command in the directory you need to count versions: @@ -73,8 +73,9 @@ Framework FrameworkFamily Count Status .NET 6.0 .NET 3 supported .NET 6.0-android .NET 1 supported .NET 6.0-ios .NET 1 supported -.NET 7.0 .NET 1 supported -.NET 8.0 .NET 1 in preview +.NET 7.0 .NET 1 EOL: 14-May-2024 +.NET 8.0 .NET 1 supported +.NET 9.0 .NET 1 in preview .NET Core 1.0 .NET Core 1 deprecated .NET Core 1.1 .NET Core 1 deprecated .NET Core 2.0 .NET Core 1 deprecated @@ -116,8 +117,8 @@ Sample.MultipleTargets.ConsoleApp.csproj \samples\Sample.MultipleTargets.Cons Sample.Net5.ConsoleApp.csproj \samples\Sample.Net5.ConsoleApp\Sample.Net5.ConsoleApp.csproj net5.0 .NET 5.0 .NET csharp deprecated Sample.Net6.ConsoleApp.csproj \samples\Sample.Net6.ConsoleApp\Sample.Net6.ConsoleApp.csproj net6.0 .NET 6.0 .NET csharp supported Sample.Net7.ConsoleApp.csproj \samples\Sample.Net7.ConsoleApp\Sample.Net7.ConsoleApp.csproj net7.0 .NET 7.0 .NET csharp EOL: 14-May-2024 -Sample.Net7.ConsoleApp.csproj \samples\Sample.Net7.ConsoleApp\Sample.Net7.ConsoleApp.csproj net7.0 .NET 8.0 .NET csharp supported -Sample.Net8.ConsoleApp.csproj \samples\Sample.Net8.ConsoleApp\Sample.Net8.ConsoleApp.csproj net8.0 .NET 9.0 .NET csharp in preview +Sample.Net7.ConsoleApp.csproj \samples\Sample.Net7.ConsoleApp\Sample.Net7.ConsoleApp.csproj net8.0 .NET 8.0 .NET csharp supported +Sample.Net8.ConsoleApp.csproj \samples\Sample.Net8.ConsoleApp\Sample.Net8.ConsoleApp.csproj net9.0 .NET 9.0 .NET csharp in preview Sample.NetCore.ConsoleApp.csproj \samples\Sample.NetCore3.1.ConsoleApp\Sample.NetCore.ConsoleApp.csproj netcoreapp3.1 .NET Core 3.1 .NET Core csharp EOL: 13-Dec-2022 Sample.NetCore2.0.ConsoleApp.csproj \samples\Sample.NetCore2.0.ConsoleApp\Sample.NetCore2.0.ConsoleApp.csproj netcoreapp2.0 .NET Core 2.0 .NET Core csharp deprecated Sample.NetCore2.1.ConsoleApp.csproj \samples\Sample.NetCore2.1.ConsoleApp\Sample.NetCore2.1.ConsoleApp.csproj netcoreapp2.1 .NET Core 2.1 .NET Core csharp deprecated From 4d5c9b19f0e650667e3ec00d1ccc3b37ba699c43 Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Sat, 18 Nov 2023 19:32:04 -0500 Subject: [PATCH 2/3] Fix to unit test --- src/DotNetCensus.Tests/RepoDataAccessTests.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/DotNetCensus.Tests/RepoDataAccessTests.cs b/src/DotNetCensus.Tests/RepoDataAccessTests.cs index 70fb57be..1c72b594 100644 --- a/src/DotNetCensus.Tests/RepoDataAccessTests.cs +++ b/src/DotNetCensus.Tests/RepoDataAccessTests.cs @@ -95,11 +95,11 @@ public void FrameworkSummaryWithAzurePipelinesToGitHubActionsConverterRepoTest() string? file = null; if (directory != null || repo != null) { - string expected = @"| Framework | FrameworkFamily | Count | Status | -|-------------------|-----------------|-------|------------------| -| .NET 7.0 | .NET | 1 | EOL: 14-May-2024 | -| .NET Standard 2.0 | .NET Standard | 1 | supported | -| total frameworks | | 2 | | + string expected = @"| Framework | FrameworkFamily | Count | Status | +|-------------------|-----------------|-------|-----------| +| .NET 8.0 | .NET | 1 | supported | +| .NET Standard 2.0 | .NET Standard | 1 | supported | +| total frameworks | | 2 | | "; //Act From 5e4608b65f83ec7d1ad0b11222850a5ec702d647 Mon Sep 17 00:00:00 2001 From: Sam Smith Date: Sat, 18 Nov 2023 19:32:32 -0500 Subject: [PATCH 3/3] fixed unit test --- .../ConsoleAppOrganizationTests.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/DotNetCensus.Tests/ConsoleAppOrganizationTests.cs b/src/DotNetCensus.Tests/ConsoleAppOrganizationTests.cs index 954ccd18..a858cad3 100644 --- a/src/DotNetCensus.Tests/ConsoleAppOrganizationTests.cs +++ b/src/DotNetCensus.Tests/ConsoleAppOrganizationTests.cs @@ -20,12 +20,12 @@ public void RunConsoleAppOrganizationTest() "-d", Path.GetTempPath(), "-t" }; StringWriter sw = new(); - string expected = @"| Framework | FrameworkFamily | Count | Status | -|----------------------|-----------------|-------|------------------| -| .NET 7.0 | .NET | 8 | EOL: 14-May-2024 | -| .NET 7.0-windows | .NET | 2 | EOL: 14-May-2024 | -| .NET Framework 4.7.2 | .NET Framework | 1 | supported | -| total frameworks | | 11 | | + string expected = @"| Framework | FrameworkFamily | Count | Status | +|----------------------|-----------------|-------|-----------| +| .NET 8.0 | .NET | 8 | supported | +| .NET 8.0-windows | .NET | 2 | supported | +| .NET Framework 4.7.2 | .NET Framework | 1 | supported | +| total frameworks | | 11 | | ";