.NET 9.0 update

JoeShook · Dec 18, 2024 · f267494 · f267494
1 parent 90726bc
commit f267494
Show file tree

Hide file tree

Showing 43 changed files with 757 additions and 720 deletions.
diff --git a/Client/Program.cs b/Client/Program.cs
@@ -11,7 +11,7 @@
 using Hl7.Fhir.FhirPath;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Fast.Components.FluentUI;
+using Microsoft.FluentUI.AspNetCore.Components;
 using MudBlazor.Services;
 using UdapEd.Client.Services;
 using UdapEd.Client.Services.Search;

diff --git a/Client/UdapEd.Client.csproj b/Client/UdapEd.Client.csproj
@@ -1,33 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
-
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
     <PackageReference Include="MudBlazor" Version="7.15.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Shared\UdapEd.Shared.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Udap.CdsHooks.Model" Version="0.4.0" />
     <PackageReference Include="Udap.Common" Version="0.4.0" />
   </ItemGroup>
-
   <!-- From:: https://jonhilton.net/visual-studio-2022-blazor-css-intellisense/ -->
   <Target Name="CollectMudBlazorStaticAssets" DependsOnTargets="ResolveStaticWebAssetsInputs" AfterTargets="Build" Condition=" '$(Configuration)' == 'Debug' ">
     <Copy SourceFiles="%(StaticWebAsset.Identity)" DestinationFolder="wwwroot/temp" Condition="$([System.String]::Copy(%(StaticWebAsset.Identity)).Contains('mudblazor'))" />
   </Target>
-
-</Project>
+</Project>
diff --git a/Client/_Imports.razor b/Client/_Imports.razor
@@ -12,5 +12,4 @@
 @* @using Udap.Model *@
 @* @using UdapEd.Shared.Model *@
 @* @using System.Reflection *@
-@* @using BQuery *@
 @* @using UdapEd.Shared *@
diff --git a/Client/wwwroot/index.html b/Client/wwwroot/index.html
@@ -31,7 +31,6 @@
   </div>
   <script src="_framework/blazor.webassembly.js"></script>
   <script src="_content/MudBlazor/MudBlazor.min.js"></script>
-  <script src="_content/BQuery/bQuery.min.js"></script>
   <script src="_content/UdapEd.Shared/scripts/AutoFocus.js"></script>
   <script src="_content/UdapEd.Shared/scripts/UdapEdUtility.js"></script>
   <script src="_content/UdapEd.Shared/scripts/EventHandlers.js"></script>

diff --git a/Client/wwwroot/temp/MudBlazor.min.css b/Client/wwwroot/temp/MudBlazor.min.css
diff --git a/Client/wwwroot/temp/MudBlazor.min.js b/Client/wwwroot/temp/MudBlazor.min.js
diff --git a/Server/UdapEd.Server.csproj b/Server/UdapEd.Server.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
-
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -10,38 +9,29 @@
     <DockerfileContext>..</DockerfileContext>
     <UserSecretsId>e17eb5d1-fcd6-4149-b420-26b7e7d50e28</UserSecretsId>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Firely.Fhir.Packages" Version="4.9.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="8.0.10" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.10.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
-    <PackageReference Include="System.IO" Version="4.3.0" />
-
-
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.10.1" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.10.0" />
-
     <PackageReference Include="Udap.CdsHooks.Model" Version="0.4.0" />
     <PackageReference Include="Udap.Smart.Model" Version="0.4.0" />
-
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Client\UdapEd.Client.csproj" />
     <ProjectReference Include="..\Shared\UdapEd.Shared.csproj" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Udap.Client" Version="0.4.0" />
     <PackageReference Include="Udap.Model" Version="0.4.0" />
     <PackageReference Include="Udap.Common" Version="0.4.0" />
   </ItemGroup>
-
   <ItemGroup>
     <None Update="fhirlabs.net.client.pfx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -65,9 +55,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Authentication\" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Shared/CdsComponents/CardList.razor b/Shared/CdsComponents/CardList.razor
@@ -1,5 +1,5 @@
 @using Udap.CdsHooks.Model
-@using Microsoft.Fast.Components.FluentUI
+@using Microsoft.FluentUI.AspNetCore.Components
 
 @code {
     [Parameter]

diff --git a/Shared/CdsComponents/ContextView.razor b/Shared/CdsComponents/ContextView.razor
@@ -1,4 +1,4 @@
-@using Microsoft.Fast.Components.FluentUI
+@using Microsoft.FluentUI.AspNetCore.Components
 @code {
     [Parameter]
     public string Class { get; set; } = string.Empty;

diff --git a/Shared/CdsComponents/FhirLabsCard.razor b/Shared/CdsComponents/FhirLabsCard.razor
@@ -1,4 +1,4 @@
-@using Microsoft.Fast.Components.FluentUI
+@using Microsoft.FluentUI.AspNetCore.Components
 @using System.Collections.Generic
 @using Udap.CdsHooks.Model
 @inject NavigationManager Navigation

diff --git a/Shared/CdsComponents/HookView.razor b/Shared/CdsComponents/HookView.razor
@@ -1,5 +1,5 @@
 @using Hl7.Fhir.Model
-@using Microsoft.Fast.Components.FluentUI
+@using Microsoft.FluentUI.AspNetCore.Components
 @using Udap.CdsHooks.Model
 
 

diff --git a/Shared/Components/CertificationAndEndorsementLoader.razor.cs b/Shared/Components/CertificationAndEndorsementLoader.razor.cs
@@ -7,15 +7,14 @@
 // */
 #endregion
 
-// using BQuery;
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.JSInterop;
 using MudBlazor;
 using UdapEd.Shared.Model;
 using UdapEd.Shared.Services;
 using Color = MudBlazor.Color;
-using FocusEventArgs = Microsoft.AspNetCore.Components.Web.FocusEventArgs;
+
 
 namespace UdapEd.Shared.Components;
 
@@ -58,7 +57,7 @@ await AppState.SetPropertyAsync(this, nameof(AppState.CertificationAndEndorsemen
     }
 
 
-    [JSInvokable("OnPageFocus")]
+    [JSInvokable("CertificationAndEndorsementLoader_OnPageFocus")]
     public static async Task OnPageFocus()
     {
         if (_instance != null)
@@ -67,7 +66,7 @@ public static async Task OnPageFocus()
         }
     }
 
-    [JSInvokable("OnPageBlur")]
+    [JSInvokable("CertificationAndEndorsementLoader_OnPageBlur")]
     public static void OnPageBlur()
     {
         _instance?.OnPageBlurInstance();