Merge pull request #3445 from 2sic/develop

v18
2sic · Jul 12, 2024 · 48a84f7 · 48a84f7
2 parents 6a06fe2 + c301304
commit 48a84f7
Show file tree

Hide file tree

Showing 337 changed files with 12,063 additions and 7,681 deletions.
diff --git a/Src/2sxc Multi-Target Oqt510.sln.DotSettings b/Src/2sxc Multi-Target Oqt510.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Oqtane/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/Src/Build/ToSic.Sxc.BuildTasks/ToSic.Sxc.BuildTasks.csproj b/Src/Build/ToSic.Sxc.BuildTasks/ToSic.Sxc.BuildTasks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net7.0</TargetFrameworks>
+    <TargetFrameworks>net472;net8.0</TargetFrameworks>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
   </PropertyGroup>
 
@@ -11,12 +11,12 @@
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
-    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.7.2" />
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.10.4" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="7.0.2" />
+    <PackageReference Include="System.Text.Json" Version="8.0.4" />
   </ItemGroup>
 
 </Project>
diff --git a/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/Microsoft.Bcl.AsyncInterfaces.dll b/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/Microsoft.Bcl.AsyncInterfaces.dll
diff --git a/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/System.Text.Encodings.Web.dll b/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/System.Text.Encodings.Web.dll
diff --git a/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/System.Text.Json.dll b/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/System.Text.Json.dll
diff --git a/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/ToSic.Sxc.BuildTasks.dll b/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/ToSic.Sxc.BuildTasks.dll
diff --git a/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/ToSic.Sxc.BuildTasks.pdb b/Src/Build/ToSic.Sxc.BuildTasks/bin/Debug/net472/ToSic.Sxc.BuildTasks.pdb