ci: update osx to support dual binary builds. bump to unity 2021.3.0f1

.github/workflows/build.yml

@@ -21,17 +21,15 @@ jobs:
           - os: windows-latest
             rid: win-x86
           - os: macos-latest
-            rid: osx-x64
-          - os: macos-latest
-            rid: osx-arm64
+            rid: osx
           - os: macos-latest
             rid: ios-arm64
           - os: ubuntu-latest
             rid: linux-x64
           - os: ubuntu-latest
             rid: android-arm64-v8a
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '3.1.x'
@@ -42,7 +40,7 @@ jobs:
       - run: |
           mkdir tmp
           cp -r VisualPinball.Unity/Plugins/${{ matrix.rid }} tmp
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: Plugins
           path: tmp
@@ -52,12 +50,12 @@ jobs:
     needs: [ build ]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/download-artifact@v2
+      - uses: actions/checkout@v3
+      - uses: actions/download-artifact@v3
         with:
           name: Plugins
           path: VisualPinball.Unity/Plugins
-      - uses: actions/cache@v3.0.1
+      - uses: actions/cache@v3
         with:
          path: VisualPinball.Unity/VisualPinball.Unity.Test/TestProject~/Library
          key: Library-Test-Project
@@ -78,7 +76,7 @@ jobs:
         with:
           path: ${{ steps.test.outputs.artifactsPath }}/*.xml
           access-token: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         if: always()
         with:
           name: Test results

.github/workflows/dependents.yml

@@ -7,11 +7,11 @@ jobs:
   VisualPinball-Unity-Hdrp:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
            path: VisualPinball.Engine
       - name: Checkout VisualPinball.Unity.Hdrp
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
            repository: VisualPinball/VisualPinball.Unity.Hdrp
            path: VisualPinball.Unity.Hdrp
@@ -35,11 +35,11 @@ jobs:
   VisualPinball-Unity-Urp:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
            path: VisualPinball.Engine
       - name: Checkout VisualPinball.Unity.Urp
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
            repository: VisualPinball/VisualPinball.Unity.Urp
            path: VisualPinball.Unity.Urp

.github/workflows/documentation.yml

@@ -7,7 +7,7 @@ jobs:
     if: github.repository == 'freezy/VisualPinball.Engine' && github.ref == 'refs/heads/master' 
     name: Build and publish documentation
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: nikeee/[email protected]
         name: Build Documentation
         with:

.github/workflows/publish.yml

@@ -7,7 +7,7 @@ jobs:
   publish-registry:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dawidd6/action-download-artifact@v2
         with:
           workflow: build
@@ -35,7 +35,7 @@ jobs:
   publish-nuget:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '3.1.x'

.github/workflows/release.yml

@@ -7,7 +7,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Fetch next version

VisualPinball.Engine.Test/VisualPinball.Engine.Test.csproj

@@ -28,10 +28,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0-preview-20220131-20" />
-    <PackageReference Include="FluentAssertions" Version="6.5.1" ExcludeAssets="Compile" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0-preview-20220401-08" />
+    <PackageReference Include="FluentAssertions" Version="6.6.0" ExcludeAssets="Compile" />
     <PackageReference Include="JeremyAnsel.Media.WavefrontObj" Version="2.0.19" />
   </ItemGroup>
   <ItemGroup>
@@ -40,7 +40,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FluentAssertions">
-      <HintPath>$(NuGetPackageRoot)\fluentassertions\6.5.1\lib\netstandard2.1\FluentAssertions.dll</HintPath>
+      <HintPath>$(NuGetPackageRoot)\fluentassertions\6.6.0\lib\netstandard2.1\FluentAssertions.dll</HintPath>
     </Reference>
   </ItemGroup>
   <Target Name="PluginsDeploy" AfterTargets="Build">

VisualPinball.Engine/VisualPinball.Engine.csproj

@@ -20,18 +20,18 @@
   <PropertyGroup Condition="'$(RuntimeIdentifier)' == ''">
     <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$(PlatformTarget)' != 'x86'">win-x64</RuntimeIdentifier>
     <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$(PlatformTarget)' == 'x86'">win-x86</RuntimeIdentifier>
-    <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64</RuntimeIdentifier>
+    <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx</RuntimeIdentifier>
     <RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</RuntimeIdentifier>
   </PropertyGroup>
   <ItemGroup>
     <None Remove="**/*.meta" Visible="false" />
     <None Remove="obj\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="NLog" Version="4.7.15" />
     <PackageReference Include="OpenMcdf" Version="2.2.1.9" />
-    <PackageReference Include="NetMiniZ" Version="1.3.0-preview.1" />
-    <PackageReference Include="NetMiniZ.Native" Version="1.3.0" />
+    <PackageReference Include="NetMiniZ" Version="1.4.0-preview.2" />
+    <PackageReference Include="NetMiniZ.Native" Version="1.4.0" />
     <PackageReference Include="NetVips" Version="2.1.0" />
     <PackageReference Include="NetVips.Native" Version="8.12.2" />
   </ItemGroup>
@@ -58,11 +58,23 @@
       <Plugins Include="$(OutDir)NetVips.dll" />
       <Plugins Include="$(OutDir)System.Buffers.dll" />
     </ItemGroup>
-    <ItemGroup Condition="'$(RuntimeIdentifier)' != 'ios-arm64' And '$(RuntimeIdentifier)' != 'android-arm64-v8a'">
-      <Plugins Include="$(NuGetPackageRoot)\netminiz.native.$(RuntimeIdentifier)\1.3.0\runtimes\$(RuntimeIdentifier)\native\*" />
+    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'win-x64' Or '$(RuntimeIdentifier)' == 'win-x86' Or '$(RuntimeIdentifier)' == 'osx' Or '$(RuntimeIdentifier)' == 'linux-x64'">
+      <Plugins Include="$(NuGetPackageRoot)\netminiz.native.$(RuntimeIdentifier)\1.4.0\runtimes\$(RuntimeIdentifier)\native\*" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'win-x64' Or '$(RuntimeIdentifier)' == 'win-x86' Or '$(RuntimeIdentifier)' == 'linux-x64'">
       <Plugins Include="$(NuGetPackageRoot)\netvips.native.$(RuntimeIdentifier)\8.12.2\runtimes\$(RuntimeIdentifier)\native\*" />
     </ItemGroup>
     <Message Text="PluginsDeploy: @(Plugins)" />
     <Copy SourceFiles="@(Plugins)" DestinationFolder="..\VisualPinball.Unity\Plugins\$(RuntimeIdentifier)\" SkipUnchangedFiles="true" />
   </Target>
+  <!-- NetVips does not have dual architecture binaries for osx -->
+  <Target Name="PluginsDeploy_osx" AfterTargets="PluginsDeploy" Condition="'$(RuntimeIdentifier)' == 'osx'">
+    <ItemGroup>
+      <Plugins_x64 Include="$(NuGetPackageRoot)\netvips.native.osx-x64\8.12.2\runtimes\osx-x64\native\*" />
+      <Plugins_arm64 Include="$(NuGetPackageRoot)\netvips.native.osx-arm64\8.12.2\runtimes\osx-arm64\native\*" />
+    </ItemGroup>
+    <Message Text="PluginsDeploy_osx: @(Plugins_x64) @(Plugins_arm64)" />
+    <Copy SourceFiles="@(Plugins_x64)" DestinationFolder="..\VisualPinball.Unity\Plugins\osx\x64\" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="@(Plugins_arm64)" DestinationFolder="..\VisualPinball.Unity\Plugins\osx\arm64\" SkipUnchangedFiles="true" />
+  </Target>
 </Project>