fixup

Author: Joe Shook

Shared/Components/CascadingAppState.razor

@@ -33,14 +33,24 @@
     {
         try
         {
-            // var json = await Http.GetStringAsync("wwwroot/Packages/udap_urls.json");
-
-            bool isMaui = AppDomain.CurrentDomain.GetAssemblies()
-				.Any(a => a.GetName().Name.StartsWith("Microsoft.Maui"));
+            bool isMauiExe = false;
+            try
+            {
+			    if (OperatingSystem.IsWindows())
+			    {
+			        var exeName = System.Diagnostics.Process.GetCurrentProcess().ProcessName;
+			        isMauiExe = exeName.Equals("UdapEdAppMaui", StringComparison.OrdinalIgnoreCase);
+			    }
+            }
+            catch (PlatformNotSupportedException)
+            {
+	            // Not supported in this environment (e.g., Blazor WASM)
+	            isMauiExe = false;
+            }
 
             string json;
             if (OperatingSystem.IsAndroid() || OperatingSystem.IsIOS() || OperatingSystem.IsMacCatalyst() || 
-                (isMaui && OperatingSystem.IsWindows()))
+                (isMauiExe && OperatingSystem.IsWindows()))
             {
                 // For .NET MAUI
                 await using var stream = await FileSystem.OpenAppPackageFileAsync("udap_urls.json");

UdapEdAppMaui/UdapEdAppMaui.csproj

@@ -87,13 +87,8 @@
     <!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
     <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
     <None Remove="CertificateStore\FhirLabs_mTLS_Client.pfx" Condition="'$(TargetFramework)' == 'net8.0-ios' Or '$(TargetFramework)' == 'net8.0-maccatalyst'" />
-    <MauiAsset Include="CertificateStore\FhirLabs_mTLS_Client.pfx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </MauiAsset>
     <None Remove="CertificateStore\fhirlabs.net.client.pfx" Condition="'$(TargetFramework)' == 'net8.0-ios' Or '$(TargetFramework)' == 'net8.0-maccatalyst'" />
-    <MauiAsset Include="CertificateStore\fhirlabs.net.client.pfx">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </MauiAsset>
+    
   </ItemGroup>
 
   <ItemGroup>
@@ -113,7 +108,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <MauiAsset LogicalName="fhirlabs.net.client.pfx" Include="CertificateStore/fhirlabs.net.client.pfx" />
+    <MauiAsset LogicalName="fhirlabs.net.client.pfx" Include="CertificateStore/fhirlabs.net.client.pfx" Condition="Exists('CertificateStore/fhirlabs.net.client.pfx')"/>
     <MauiAsset LogicalName="udap.emrdirect.client.certificate.p12" Include="CertificateStore/udap.emrdirect.client.certificate.p12" Condition="Exists('CertificateStore/udap.emrdirect.client.certificate.p12')" />
     <MauiAsset LogicalName="FhirLabs_mTLS_Client.pfx" Include="CertificateStore/FhirLabs_mTLS_Client.pfx" Condition="Exists('CertificateStore/FhirLabs_mTLS_Client.pfx')" />