Address PR comments

Picovoice · Jan 14, 2025 · 0e5d25c · 0e5d25c
1 parent da7d4ba
commit 0e5d25c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 56 deletions.
diff --git a/.github/workflows/rust-codestyle.yml b/.github/workflows/rust-codestyle.yml
@@ -43,11 +43,7 @@ jobs:
       working-directory: binding/rust
 
     - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Run clippy
       run: cargo clippy -- -D warnings
@@ -69,11 +65,7 @@ jobs:
       working-directory: binding/rust
 
     - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Run clippy
       run: cargo clippy -- -D warnings
diff --git a/.github/workflows/rust-demos.yml b/.github/workflows/rust-demos.yml
@@ -43,11 +43,7 @@ jobs:
       working-directory: binding/rust
 
     - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Rust build demo
       run: cargo build --verbose
@@ -70,10 +66,7 @@ jobs:
       working-directory: binding/rust
 
     - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Rust build demo
       run: cargo build --verbose

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -51,11 +51,7 @@ jobs:
       run: bash copy.sh
 
     - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Build
       run: cargo build --verbose
@@ -87,10 +83,7 @@ jobs:
         Copy-Item -Path "..\..\lib\windows" -Destination ".\data\lib" -Recurse
 
     - name: Install stable toolchain
-      uses: actions-rs/toolchain@v1
-      with:
-        toolchain: stable
-        override: true
+      uses: dtolnay/rust-toolchain@stable
 
     - name: Build
       run: cargo build --verbose

diff --git a/binding/dotnet/PvRecorder/PvRecorder.csproj b/binding/dotnet/PvRecorder/PvRecorder.csproj
@@ -49,10 +49,23 @@
             <Link>lib\windows\amd64\libpv_recorder.dll</Link>
             <Visible>false</Visible>
         </Content>
+        <Content Include="..\..\..\lib\mac\x86_64\libpv_recorder.dylib">
+            <PackagePath>
+                build/netstandard2.0/libpv_recorder.dylib;
+                build/netcoreapp3.0/lib/mac/x86_64/libpv_recorder.dylib;
+                build/net6.0/lib/mac/x86_64/libpv_recorder.dylib;
+                build/net8.0/lib/mac/x86_64/libpv_recorder.dylib;
+            </PackagePath>
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <Link>lib\mac\x86_64\libpv_recorder.dylib</Link>
+            <Visible>false</Visible>
+        </Content>
+    </ItemGroup>
+
+    <!--.NET 6.0+ libs-->
+    <ItemGroup>
         <Content Include="..\..\..\lib\windows\arm64\libpv_recorder.dll">
             <PackagePath>
-                build/netstandard2.0/libpv_recorder.dll;
-                build/netcoreapp3.0/lib/windows/arm64/libpv_recorder.dll;
                 build/net6.0/lib/windows/arm64/libpv_recorder.dll;
                 build/net8.0/lib/windows/arm64/libpv_recorder.dll;
             </PackagePath>
@@ -62,33 +75,24 @@
         </Content>
         <Content Include="..\..\..\lib\linux\x86_64\libpv_recorder.so">
             <PackagePath>
-                build/netstandard2.0/libpv_recorder.so;
-                build/netcoreapp3.0/lib/linux/x86_64/libpv_recorder.so;
                 build/net6.0/lib/linux/x86_64/libpv_recorder.so;
                 build/net8.0/lib/linux/x86_64/libpv_recorder.so;
             </PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
             <Link>lib\linux\x86_64\libpv_recorder.so</Link>
             <Visible>false</Visible>
         </Content>
-        <Content Include="..\..\..\lib\mac\x86_64\libpv_recorder.dylib">
+        <Content Include="..\..\..\lib\mac\arm64\libpv_recorder.dylib">
             <PackagePath>
-                build/netstandard2.0/libpv_recorder.dylib;
-                build/netcoreapp3.0/lib/mac/x86_64/libpv_recorder.dylib;
-                build/net6.0/lib/mac/x86_64/libpv_recorder.dylib;
-                build/net8.0/lib/mac/x86_64/libpv_recorder.dylib;
+                build/net6.0/lib/mac/arm64/libpv_recorder.dylib;
+                build/net8.0/lib/mac/arm64/libpv_recorder.dylib;
             </PackagePath>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>lib\mac\x86_64\libpv_recorder.dylib</Link>
+            <Link>lib\mac\arm64\libpv_recorder.dylib</Link>
             <Visible>false</Visible>
         </Content>
-    </ItemGroup>
-
-    <!--.NET Core 3.0+ libs-->
-    <ItemGroup>
         <Content Include="..\..\..\lib\raspberry-pi\**\*" Exclude="..\..\..\lib\raspberry-pi\arm11\*">
             <PackagePath>
-                build/netcoreapp3.0/lib/raspberry-pi;
                 build/net6.0/lib/raspberry-pi;
                 build/net8.0/lib/raspberry-pi;
             </PackagePath>
@@ -98,19 +102,6 @@
         </Content>
     </ItemGroup>
 
-    <!--.NET 6.0+ libs-->
-    <ItemGroup>
-        <Content Include="..\..\..\lib\mac\arm64\libpv_recorder.dylib">
-            <PackagePath>
-                build/net6.0/lib/mac/arm64/libpv_recorder.dylib;
-                build/net8.0/lib/mac/arm64/libpv_recorder.dylib;
-            </PackagePath>
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-            <Link>lib\mac\arm64\libpv_recorder.dylib</Link>
-            <Visible>false</Visible>
-        </Content>
-    </ItemGroup>
-
     <!--Resource files-->
     <ItemGroup>
         <Folder Include="Content\" />