From 751f48628813c5348c46f8d5da63a682cf130887 Mon Sep 17 00:00:00 2001 From: Niko <809210+NikoMix@users.noreply.github.com> Date: Sun, 8 Sep 2024 13:39:25 +0200 Subject: [PATCH] Updated to .Net 8 --- Statiq.Web.sln | 54 +++++++++++++++++-- .../Statiq.Web.Examples.csproj | 7 +-- src/Statiq.Web.Aws/Statiq.Web.Aws.csproj | 9 +++- src/Statiq.Web.Azure/Statiq.Web.Azure.csproj | 9 +++- .../Statiq.Web.GitHub.csproj | 10 ++-- .../Statiq.Web.Hosting.csproj | 3 +- .../Statiq.Web.Netlify.csproj | 11 ++-- .../Statiq.Web.Templates.csproj | 7 +-- src/Statiq.Web/Statiq.Web.csproj | 17 +++--- .../Statiq.Web.Hosting.Tests.csproj | 12 +++-- .../Statiq.Web.Tests/Statiq.Web.Tests.csproj | 10 ++-- 11 files changed, 105 insertions(+), 44 deletions(-) diff --git a/Statiq.Web.sln b/Statiq.Web.sln index 8a5791868..24d4bcea0 100644 --- a/Statiq.Web.sln +++ b/Statiq.Web.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29709.97 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.35122.118 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Statiq.Web", "src\Statiq.Web\Statiq.Web.csproj", "{9AD88CBA-5E7F-4082-AC1A-5D0DD2FEE46B}" EndProject @@ -27,7 +26,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Statiq.Web.Templates", "src EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{34DEAA8E-925D-4894-8050-37F16AE3718E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Statiq.Web.Examples", "examples\Statiq.Web.Examples\Statiq.Web.Examples.csproj", "{E018A43C-D969-4FFD-A171-A7C4C96CEE40}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Statiq.Web.Examples", "examples\Statiq.Web.Examples\Statiq.Web.Examples.csproj", "{E018A43C-D969-4FFD-A171-A7C4C96CEE40}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{BFA13976-FBC4-49C7-BBBD-C773863EED26}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Buildalyzer.Workspaces", "..\Buildalyzer\src\Buildalyzer.Workspaces\Buildalyzer.Workspaces.csproj", "{C1439BB2-C554-4337-9D25-6AD69B9F2506}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Buildalyzer", "..\Buildalyzer\src\Buildalyzer\Buildalyzer.csproj", "{1A00711E-23AA-46FE-BD67-C20BBD43FEC7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Buildalyzer.Logger", "..\Buildalyzer\src\Buildalyzer.Logger\Buildalyzer.Logger.csproj", "{49A9FFC9-5F10-4039-96A4-80B76A1735C3}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -159,6 +166,42 @@ Global {E018A43C-D969-4FFD-A171-A7C4C96CEE40}.Release|x64.Build.0 = Release|Any CPU {E018A43C-D969-4FFD-A171-A7C4C96CEE40}.Release|x86.ActiveCfg = Release|Any CPU {E018A43C-D969-4FFD-A171-A7C4C96CEE40}.Release|x86.Build.0 = Release|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Debug|x64.ActiveCfg = Debug|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Debug|x64.Build.0 = Debug|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Debug|x86.ActiveCfg = Debug|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Debug|x86.Build.0 = Debug|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Release|Any CPU.Build.0 = Release|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Release|x64.ActiveCfg = Release|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Release|x64.Build.0 = Release|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Release|x86.ActiveCfg = Release|Any CPU + {C1439BB2-C554-4337-9D25-6AD69B9F2506}.Release|x86.Build.0 = Release|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Debug|x64.ActiveCfg = Debug|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Debug|x64.Build.0 = Debug|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Debug|x86.ActiveCfg = Debug|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Debug|x86.Build.0 = Debug|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Release|Any CPU.Build.0 = Release|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Release|x64.ActiveCfg = Release|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Release|x64.Build.0 = Release|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Release|x86.ActiveCfg = Release|Any CPU + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7}.Release|x86.Build.0 = Release|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Debug|x64.ActiveCfg = Debug|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Debug|x64.Build.0 = Debug|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Debug|x86.ActiveCfg = Debug|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Debug|x86.Build.0 = Debug|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Release|Any CPU.Build.0 = Release|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Release|x64.ActiveCfg = Release|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Release|x64.Build.0 = Release|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Release|x86.ActiveCfg = Release|Any CPU + {49A9FFC9-5F10-4039-96A4-80B76A1735C3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -174,6 +217,9 @@ Global {9CE227F6-A4FF-44CC-98CC-DB8C087CF4C3} = {E58D9954-583A-493C-B607-4AD2C4AED9A5} {EB5E8E9B-8480-4E5D-B7D1-DAAC7C348D7C} = {E58D9954-583A-493C-B607-4AD2C4AED9A5} {E018A43C-D969-4FFD-A171-A7C4C96CEE40} = {34DEAA8E-925D-4894-8050-37F16AE3718E} + {C1439BB2-C554-4337-9D25-6AD69B9F2506} = {BFA13976-FBC4-49C7-BBBD-C773863EED26} + {1A00711E-23AA-46FE-BD67-C20BBD43FEC7} = {BFA13976-FBC4-49C7-BBBD-C773863EED26} + {49A9FFC9-5F10-4039-96A4-80B76A1735C3} = {BFA13976-FBC4-49C7-BBBD-C773863EED26} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {EFD0E489-F8EE-4626-91C8-92A8F7092907} diff --git a/examples/Statiq.Web.Examples/Statiq.Web.Examples.csproj b/examples/Statiq.Web.Examples/Statiq.Web.Examples.csproj index f1d241f36..a466d2d4f 100644 --- a/examples/Statiq.Web.Examples/Statiq.Web.Examples.csproj +++ b/examples/Statiq.Web.Examples/Statiq.Web.Examples.csproj @@ -1,19 +1,16 @@ - Exe - netcoreapp3.1 + net8.0 $(MSBuildProjectDirectory) - - + - \ No newline at end of file diff --git a/src/Statiq.Web.Aws/Statiq.Web.Aws.csproj b/src/Statiq.Web.Aws/Statiq.Web.Aws.csproj index cb7ee20fb..f7672f0a8 100644 --- a/src/Statiq.Web.Aws/Statiq.Web.Aws.csproj +++ b/src/Statiq.Web.Aws/Statiq.Web.Aws.csproj @@ -2,11 +2,17 @@ Statiq is a configurable static content generation framework. This library provides support for interacting with AWS. Statiq Static StaticContent StaticSite Blog BlogEngine AmazonWebServices AWS + net8.0 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 - @@ -19,5 +25,4 @@ - \ No newline at end of file diff --git a/src/Statiq.Web.Azure/Statiq.Web.Azure.csproj b/src/Statiq.Web.Azure/Statiq.Web.Azure.csproj index ac486ab8c..778f36491 100644 --- a/src/Statiq.Web.Azure/Statiq.Web.Azure.csproj +++ b/src/Statiq.Web.Azure/Statiq.Web.Azure.csproj @@ -2,12 +2,18 @@ Statiq is a configurable static content generation framework. This library provides support for interacting with Azure. Statiq Static StaticContent StaticSite Blog BlogEngine Azure AppService + net8.0 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 - @@ -20,5 +26,4 @@ - \ No newline at end of file diff --git a/src/Statiq.Web.GitHub/Statiq.Web.GitHub.csproj b/src/Statiq.Web.GitHub/Statiq.Web.GitHub.csproj index 29adbb38c..03a85b2f2 100644 --- a/src/Statiq.Web.GitHub/Statiq.Web.GitHub.csproj +++ b/src/Statiq.Web.GitHub/Statiq.Web.GitHub.csproj @@ -2,8 +2,14 @@ GitHub modules for Statiq including GitHub Pages deployment support. Statiq Static StaticContent StaticSite Blog BlogEngine GitHub GitHubPages + net8.0 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 - @@ -16,10 +22,8 @@ - - \ No newline at end of file diff --git a/src/Statiq.Web.Hosting/Statiq.Web.Hosting.csproj b/src/Statiq.Web.Hosting/Statiq.Web.Hosting.csproj index 7b972be9c..0a0cd3d3b 100644 --- a/src/Statiq.Web.Hosting/Statiq.Web.Hosting.csproj +++ b/src/Statiq.Web.Hosting/Statiq.Web.Hosting.csproj @@ -3,6 +3,7 @@ Statiq is a configurable static content generation framework. This library contains a server for use with static sites. Statiq Static StaticContent StaticSite Blog BlogEngine Hosting WebHost true + net8.0 @@ -23,7 +24,6 @@ <_Parameter1>DynamicProxyGenAssembly2 - @@ -36,5 +36,4 @@ - \ No newline at end of file diff --git a/src/Statiq.Web.Netlify/Statiq.Web.Netlify.csproj b/src/Statiq.Web.Netlify/Statiq.Web.Netlify.csproj index 92f8b4294..51b4c63da 100644 --- a/src/Statiq.Web.Netlify/Statiq.Web.Netlify.csproj +++ b/src/Statiq.Web.Netlify/Statiq.Web.Netlify.csproj @@ -1,14 +1,18 @@  - Statiq is a configurable static content generation framework. This library provides support for interacting with Netlify. Statiq Static StaticContent StaticSite Blog BlogEngine Netlify + net8.0 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 - - @@ -21,5 +25,4 @@ - \ No newline at end of file diff --git a/src/Statiq.Web.Templates/Statiq.Web.Templates.csproj b/src/Statiq.Web.Templates/Statiq.Web.Templates.csproj index b506e92d3..e9a1d9929 100644 --- a/src/Statiq.Web.Templates/Statiq.Web.Templates.csproj +++ b/src/Statiq.Web.Templates/Statiq.Web.Templates.csproj @@ -1,5 +1,4 @@ - Template Statiq.Web.Templates @@ -7,20 +6,18 @@ Dave Glick Templates to use when creating a Statiq Web application, Statiq Web is a flexible static site generator. dotnet-new;templates;Statiq;Static;StaticContent;StaticSite;Blog;BlogEngine - true false false true content + net8.0 - - - + \ No newline at end of file diff --git a/src/Statiq.Web/Statiq.Web.csproj b/src/Statiq.Web/Statiq.Web.csproj index e9930a12b..45d37fd4c 100644 --- a/src/Statiq.Web/Statiq.Web.csproj +++ b/src/Statiq.Web/Statiq.Web.csproj @@ -1,27 +1,27 @@  - Statiq Web is a flexible static site generator. Statiq Static StaticContent StaticSite Blog BlogEngine + net8.0 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062;CA1021;CA1710 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062;CA1021;CA1710 - - - - - - + - @@ -56,5 +56,4 @@ - \ No newline at end of file diff --git a/tests/Statiq.Web.Hosting.Tests/Statiq.Web.Hosting.Tests.csproj b/tests/Statiq.Web.Hosting.Tests/Statiq.Web.Hosting.Tests.csproj index da55d4e89..0b93feb51 100644 --- a/tests/Statiq.Web.Hosting.Tests/Statiq.Web.Hosting.Tests.csproj +++ b/tests/Statiq.Web.Hosting.Tests/Statiq.Web.Hosting.Tests.csproj @@ -1,6 +1,13 @@  true + net8.0 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 + + + NU1901;NU1902;NU1903;NU1904;CA1724;CA1062 @@ -15,7 +22,8 @@ - + + @@ -23,7 +31,6 @@ - @@ -37,5 +44,4 @@ - \ No newline at end of file diff --git a/tests/Statiq.Web.Tests/Statiq.Web.Tests.csproj b/tests/Statiq.Web.Tests/Statiq.Web.Tests.csproj index 65e983b55..207a6b88f 100644 --- a/tests/Statiq.Web.Tests/Statiq.Web.Tests.csproj +++ b/tests/Statiq.Web.Tests/Statiq.Web.Tests.csproj @@ -1,11 +1,10 @@ - + - + - @@ -19,9 +18,10 @@ - Is_Windows - + + net8.0 + \ No newline at end of file