deps: switch to netstandard2.1. bump pinmame-native

Author: jsm174

VisualPinball.Engine.PinMAME/Games/Rock.cs

@@ -120,6 +120,12 @@ public class Rock : System80
 			new GamelogicEngineCoil("06", 6) { Description = "Four Pos. Bank Reset", DeviceHint = "^4PosBank\\s*" },
 			new GamelogicEngineCoil("08", 8) { Description = "Knocker Assembly" },
 			new GamelogicEngineCoil("09", 9) { Description = "Outhole", DeviceHint = "^Trough\\s*\\d?", DeviceItemHint = "eject_coil" },
+
+			new GamelogicEngineCoil(CoilFlipperLowerRight, 46) { Description = "Right Flippers", DeviceHint = "^(Upper|Lower)RightFlipper$", NumMatches = 2 },
+			new GamelogicEngineCoil(CoilFlipperLowerLeft, 48) { Description = "Left Flippers", DeviceHint = "^(Upper|Lower)LeftFlipper$",  NumMatches = 2 },
+
+			new GamelogicEngineCoil(CoilFlipperUpperRight, 34) { IsUnused = true },
+			new GamelogicEngineCoil(CoilFlipperUpperLeft, 36) { IsUnused = true },
 		};
 	}
 }

VisualPinball.Engine.PinMAME/VisualPinball.Engine.PinMAME.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <LangVersion>8</LangVersion>
     <AssemblyVersion>0.1.0.0</AssemblyVersion>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -17,18 +17,25 @@
 
   <ItemGroup>
     <PackageReference Include="PinMame" Version="0.1.0-preview.47" />
-    <PackageReference Include="PinMame.Native" Version="3.4.0-preview.313" />
+    <PackageReference Include="PinMame.Native" Version="3.4.0-preview.316" />
     <PackageReference Include="VisualPinball.Engine" Version="0.0.1-preview.71" />
+    <!-- Uncomment when doing local dev -->
+    <!--
+    <Reference Include="VisualPinball.Engine">
+      <HintPath>..\..\VisualPinball.Engine\VisualPinball.Engine\.bin\Release\netstandard2.0\VisualPinball.Engine.dll</HintPath>
+    </Reference>
+    -->
   </ItemGroup>
 
-  <Target Name="PluginsDeploy" AfterTargets="Build">
-    <Copy SourceFiles="$(OutDir)$(AssemblyName).dll" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(OutDir)PinMame.dll" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
-    <Copy Condition="'$(RuntimeIdentifier)' == 'win-x64'" SourceFiles="$(OutDir)libpinmame-3.4.dll" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
-    <Copy Condition="'$(RuntimeIdentifier)' == 'win-x86'" SourceFiles="$(OutDir)libpinmame-3.4.dll" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
-    <Copy Condition="'$(RuntimeIdentifier)' == 'osx-x64'" SourceFiles="$(OutDir)libpinmame.3.4.dylib" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
-    <Copy Condition="'$(RuntimeIdentifier)' == 'osx-arm64'" SourceFiles="$(OutDir)libpinmame.3.4.dylib" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
-    <Copy Condition="'$(RuntimeIdentifier)' == 'linux-x64'" SourceFiles="$(OutDir)libpinmame.so.3.4" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
+  <Target Name="PluginsDeploy" AfterTargets="AfterBuild">
+    <ItemGroup>
+      <Plugins Include="$(OutDir)$(AssemblyName).dll" />
+      <Plugins Include="$(OutDir)PinMame.dll" />
+
+      <Plugins Include="$(NuGetPackageRoot)\pinmame.native.$(RuntimeIdentifier)\3.4.0-preview.316\runtimes\$(RuntimeIdentifier)\native\*" />
+    </ItemGroup>
+    <Message Text="PluginsDeploy: @(Plugins)" />
+    <Copy SourceFiles="@(Plugins)" DestinationFolder="..\VisualPinball.Engine.PinMAME.Unity\Plugins\$(RuntimeIdentifier)" SkipUnchangedFiles="true" />
   </Target>
 
 </Project>