Merge pull request #15 from newky2k/development

Added mac support and android 10
newky2k · Jun 11, 2020 · ec976f3 · ec976f3
2 parents 6b32e36 + 0a78a55
commit ec976f3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/DSoft.Messaging/DSoft.MessageBus.csproj b/src/DSoft.Messaging/DSoft.MessageBus.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="MSBuild.Sdk.Extras/2.0.54">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;MonoAndroid80;MonoAndroid81;MonoAndroid90;tizen40;</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;Xamarin.WatchOS10;MonoAndroid80;MonoAndroid81;MonoAndroid90;MonoAndroid10.0;tizen40;</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);uap10.0.16299;</TargetFrameworks>
     <PackageId>DSoft.MessageBus</PackageId>
     <ReleaseVersion>1.3.4</ReleaseVersion>
@@ -69,6 +69,11 @@
     <Compile Include="**\*.ios.*.cs" />
   </ItemGroup>
 
+  <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.Mac')) ">
+    <Compile Include="**\*.mac.cs" />
+    <Compile Include="**\*.mac.*.cs" />
+  </ItemGroup>
+
   <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.TVOS')) ">
     <Compile Include="**\*.tvos.cs" />
     <Compile Include="**\*.tvos.*.cs" />

diff --git a/...ssaging/ThreadControl.ios.tvos.watchos.cs → ...ing/ThreadControl.ios.mac.tvos.watchos.cs b/...ssaging/ThreadControl.ios.tvos.watchos.cs → ...ing/ThreadControl.ios.mac.tvos.watchos.cs