Merge branch 'v2.9.0' of https://github.com/codeproject/CodeProject.AI-Server into v2.9.0

Author: ChrisMaunder

src/demos/modules/DotNetLongProcess/DotNetLongProcess.csproj

@@ -56,9 +56,16 @@
 		<RestoreAdditionalProjectSources Condition="'$(GpuType)'=='OpenVINO'">./LocalNugets</RestoreAdditionalProjectSources>
 	</PropertyGroup>
 
+	<ItemGroup Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'"> <!-- Mac Apple Silicon -->
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'"> <!-- NOT Mac Apple Silicon -->
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<PackageReference Include="SkiaSharp" Version="2.88.8" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
 	</ItemGroup>
 
 	<!-- Output the settings based on what we've determined above -->

src/demos/modules/DotNetSimple/DotNetSimple.csproj

@@ -54,9 +54,6 @@
 		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
 		<PackageReference Include="SkiaSharp" Version="2.88.8" />
 
-        <PackageReference Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-        <PackageReference Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'" Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-
 		<!-- Hardware Specific packages. Note that for CUDA, even if there may not be any actual
 		     CUDA hardware available, the package will still run fine. It's big, but if it does
 			 find CUDA on the machine then it's worth it. -->
@@ -69,6 +66,14 @@
 
 	</ItemGroup>
 
+	<ItemGroup Condition="'$(IsOsx)'=='true' And '$(IsArm64)'=='true'"> <!-- Mac Apple Silicon -->
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(IsOsx)'!='true' Or '$(IsArm64)'!='true'"> <!-- NOT Mac Apple Silicon -->
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+	</ItemGroup>
+
 	<!-- Output the settings based on what we've determined above -->
 	<Target Name="SettingsCheck" AfterTargets="BeforeBuild">
 		<Message Importance="High" Text="       $(Name): Building for hardware $(GpuType)" />