From da6e65ad7520111e35d34d8eb3dd57ee7feca354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ton=C4=87i=20Vatavuk?= Date: Thu, 6 Jul 2023 15:01:50 +0200 Subject: [PATCH] v4.4.0 upgrade dependency System.Text.Json v7.0.2, upgrade to new csproj file --- .../Razor-Blade.net DocFx Generator.csproj | 3 +- Razor.Blade/Razor.Blade.csproj | 18 ++++-- Source-Code-Generator/App.config | 6 +- .../Source-Code-Generator.csproj | 43 ++++---------- ToSic.Razor.Dnn/Properties/AssemblyInfo.cs | 4 +- ToSic.Razor.Dnn/Razor.Blade.Dnn.csproj | 58 +++++++++---------- ToSic.Razor.Dnn/ToSic_Razor_Blade_Dnn.dnn | 2 +- ToSic.Razor.Dnn/packages.config | 8 --- docs/manifest.json | 16 ++--- 9 files changed, 70 insertions(+), 88 deletions(-) delete mode 100644 ToSic.Razor.Dnn/packages.config diff --git a/DocFx Generator/Razor-Blade.net DocFx Generator.csproj b/DocFx Generator/Razor-Blade.net DocFx Generator.csproj index c82379d0..9d2685b2 100644 --- a/DocFx Generator/Razor-Blade.net DocFx Generator.csproj +++ b/DocFx Generator/Razor-Blade.net DocFx Generator.csproj @@ -9,11 +9,12 @@ Properties DocFx_Generator DocFx Generator - v4.5.1 + v4.7.2 512 true + true diff --git a/Razor.Blade/Razor.Blade.csproj b/Razor.Blade/Razor.Blade.csproj index 836cea73..f94a37ae 100644 --- a/Razor.Blade/Razor.Blade.csproj +++ b/Razor.Blade/Razor.Blade.csproj @@ -3,7 +3,7 @@ netstandard2.0;net472;net6.0;net7.0 ToSic.Razor - 04.03.00 + 04.04.00 ToSic.Razor ToSic.Razor ToSic.Razor @@ -18,6 +18,7 @@ 3.1.16 + runtime @@ -25,6 +26,17 @@ 3.1.16 + runtime + + + + + + 2.1.1 + runtime + + + runtime @@ -35,10 +47,6 @@ - - 2.1.1 - - diff --git a/Source-Code-Generator/App.config b/Source-Code-Generator/App.config index 9c05822f..ecdcf8a5 100644 --- a/Source-Code-Generator/App.config +++ b/Source-Code-Generator/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/Source-Code-Generator/Source-Code-Generator.csproj b/Source-Code-Generator/Source-Code-Generator.csproj index 0c271a01..ce61b17d 100644 --- a/Source-Code-Generator/Source-Code-Generator.csproj +++ b/Source-Code-Generator/Source-Code-Generator.csproj @@ -1,5 +1,4 @@ - - + Debug @@ -8,10 +7,20 @@ Exe SourceCodeGenerator Source-Code-Generator - v4.5.1 + net472 + v4.7.2 512 true true + + false + false + false + false + false + false + false + AnyCPU @@ -44,34 +53,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ToSic.Razor.Dnn/Properties/AssemblyInfo.cs b/ToSic.Razor.Dnn/Properties/AssemblyInfo.cs index 674a4d32..df3ab295 100644 --- a/ToSic.Razor.Dnn/Properties/AssemblyInfo.cs +++ b/ToSic.Razor.Dnn/Properties/AssemblyInfo.cs @@ -30,5 +30,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("04.03.00.00")] -[assembly: AssemblyFileVersion("04.03.00.00")] +[assembly: AssemblyVersion("04.04.00.00")] +[assembly: AssemblyFileVersion("04.04.00.00")] diff --git a/ToSic.Razor.Dnn/Razor.Blade.Dnn.csproj b/ToSic.Razor.Dnn/Razor.Blade.Dnn.csproj index 83b4bd47..ef30de43 100644 --- a/ToSic.Razor.Dnn/Razor.Blade.Dnn.csproj +++ b/ToSic.Razor.Dnn/Razor.Blade.Dnn.csproj @@ -1,11 +1,8 @@ - - + Debug AnyCPU - - 2.0 {BB44314B-1342-4119-AE76-E33529826EC6} {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} @@ -13,6 +10,7 @@ Properties ToSic.Razor ToSic.Razor.Dnn + net472 v4.7.2 true @@ -25,8 +23,14 @@ true - - + false + false + false + false + false + false + false + true @@ -45,34 +49,31 @@ prompt 4 + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + runtime + + + runtime + + + runtime + + + runtime + + - - ..\packages\DotNetNuke.Core.9.6.1\lib\net45\DotNetNuke.dll - - - ..\packages\DotNetNuke.DependencyInjection.9.6.1\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll - - - ..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - - - - - - - - - @@ -82,9 +83,6 @@ - - - diff --git a/ToSic.Razor.Dnn/ToSic_Razor_Blade_Dnn.dnn b/ToSic.Razor.Dnn/ToSic_Razor_Blade_Dnn.dnn index 488b7085..a7b41750 100644 --- a/ToSic.Razor.Dnn/ToSic_Razor_Blade_Dnn.dnn +++ b/ToSic.Razor.Dnn/ToSic_Razor_Blade_Dnn.dnn @@ -1,6 +1,6 @@ - + 2sic RazorBlade 2sic RazorBlade icon.png diff --git a/ToSic.Razor.Dnn/packages.config b/ToSic.Razor.Dnn/packages.config deleted file mode 100644 index 33ecb9ff..00000000 --- a/ToSic.Razor.Dnn/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/docs/manifest.json b/docs/manifest.json index 741a4434..891f67f3 100644 --- a/docs/manifest.json +++ b/docs/manifest.json @@ -1,6 +1,6 @@ { "homepages": [], - "source_base_path": "C:/Projects/razor-blades/DocFx Generator", + "source_base_path": "A:/razor-blade/DocFx Generator", "xrefmap": "xrefmap.yml", "files": [ { @@ -1776,23 +1776,25 @@ "incremental_info": [ { "status": { - "can_incremental": true, + "can_incremental": false, + "details": "Disable incremental build by force rebuild option.", "incrementalPhase": "build", "total_file_count": 0, - "skipped_file_count": 0 + "skipped_file_count": 0, + "full_build_reason_code": "ForceRebuild" }, "processors": { "ConceptualDocumentProcessor": { - "can_incremental": true, + "can_incremental": false, "incrementalPhase": "build", "total_file_count": 7, - "skipped_file_count": 7 + "skipped_file_count": 0 }, "ManagedReferenceDocumentProcessor": { - "can_incremental": true, + "can_incremental": false, "incrementalPhase": "build", "total_file_count": 137, - "skipped_file_count": 16 + "skipped_file_count": 0 }, "ResourceDocumentProcessor": { "can_incremental": false,