Minor

shinyorg · Sep 22, 2023 · 4e0a9b3 · 4e0a9b3
1 parent eb93911
commit 4e0a9b3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/Shiny.Health/IsExternalInit.cs b/Shiny.Health/IsExternalInit.cs
@@ -0,0 +1,10 @@
+#if XAMARIN
+using System.ComponentModel;
+
+namespace System.Runtime.CompilerServices;
+
+
+[EditorBrowsable(EditorBrowsableState.Never)]
+internal static class IsExternalInit { }
+
+#endif
diff --git a/Shiny.Health/Shiny.Health.csproj b/Shiny.Health/Shiny.Health.csproj
@@ -8,7 +8,7 @@
 
         <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);netstandard2.1;xamarin.ios10;monoandroid12.0</TargetFrameworks>
         <Nullable>enable</Nullable>
-
+        <LangVersion>latest</LangVersion>
         <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
         <Authors>Allan Ritchie</Authors>
         <Owners>aritchie; shinylib</Owners>
@@ -49,7 +49,7 @@
         <!--<PackageReference Include="UnitsNet" Version="5.0.0-rc004" />-->
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
+    <ItemGroup Condition="$(TargetFramework.Contains('android'))">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\Android\**\*.cs" />
 
@@ -58,10 +58,14 @@
         <!--<PackageReference Include="Google.Apis.Fitness.v1" Version="1.58.0.2454" />-->
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0-ios'">
+    <ItemGroup Condition="$(TargetFramework.Contains('ios'))">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\iOS\**\*.cs" />
     </ItemGroup>
 
+    <PropertyGroup Condition="$(TargetFramework.Contains('netstandard')) OR $(TargetFramework.Contains('monoandroid')) OR $(TargetFramework.Contains('xamarin'))">
+        <DefineConstants>$(DefineConstants);XAMARIN</DefineConstants>
+    </PropertyGroup>
+
     <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="3.0.44" Condition="$([MSBuild]::IsOSPlatform('windows'))" />
 </Project>