Revert "Fix NPlug.Proxy when used from NuGet"

This reverts commit ba4daf0.

Author: xoofx

.github/workflows/ci-publish_nplug_proxy.yml

@@ -24,12 +24,12 @@ jobs:
     - name: Build
       shell: bash
       run: |
-        dotnet build -c Release ./src/NPlug.Proxy/NPlug.Proxy.csproj
+        dotnet build -c Release ./src/NPlug.Proxy/NPlug.Proxy.msbuildproj
 
     - name: Package
       shell: bash
       run: |
-        dotnet pack -c Release ./src/NPlug.Proxy/NPlug.Proxy.csproj -p:IsPackable=true
+        dotnet pack -c Release ./src/NPlug.Proxy/NPlug.Proxy.msbuildproj -p:IsPackable=true
 
     - name: Publish
       shell: bash

src/NPlug.Proxy/NPlug.Proxy.csproj src/NPlug.Proxy/NPlug.Proxy.msbuildproj

@@ -1,12 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.Build.NoTargets/3.7.0">
   <PropertyGroup>
-    <OutputType>Library</OutputType>
     <TargetFramework>net7.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
     <IsPackable Condition="'$(IsPackable)' == ''">false</IsPackable>
-    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <Version>1.1.0</Version>
+    <Version>1.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>

src/NPlug.Proxy/AudioPluginProxy.cs src/NPlug.Proxy/build/AudioPluginProxy.cs

@@ -8,7 +8,7 @@
 
 namespace NPlug.Proxy;
 
-public sealed class AudioPluginProxy : IDisposable
+internal sealed class AudioPluginProxy : IDisposable
 {
     private readonly IntPtr _nativeProxyHandle;
     private readonly bool _ownHandle;
@@ -126,7 +126,7 @@ public void Dispose()
             NativeLibrary.Free(_nativeProxyHandle);
         }
     }
-
+    
     private IntPtr InternalGetFactory()
     {
         return _nativeFactory?.Invoke() ?? IntPtr.Zero;

src/NPlug.Proxy/build/NPlug.Proxy.targets

@@ -26,6 +26,12 @@
     <NPlugProxyLibraryFile Condition="'$(NPlugProxyLibraryFile)' == ''">$(MSBuildThisFileDirectory)$(NPlugRuntimeIdentifier)\native\$(NPlugProxyLibraryLink)</NPlugProxyLibraryFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Condition="'$(NPlugAudioPluginProxy)' == 'true'" Include="$(MSBuildThisFileDirectory)AudioPluginProxy.cs">
+      <Visible>false</Visible>
+    </Compile>
+  </ItemGroup>
+
   <Target Name="VerifyNPlug" BeforeTargets="Build">
     <Error Condition="'$(NPlugVstArch)' == ''" Text="The .NET Platform RID `$(NPlugRuntimeIdentifier)` is not supported by NPlug."></Error>
     <Message Importance="high" Text="NPlugRuntimeIdentifier: $(NPlugRuntimeIdentifier)"/>

src/NPlug.Validator/NPlug.Validator.csproj

@@ -33,7 +33,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NPlug.Proxy\NPlug.Proxy.csproj" />
+    <ProjectReference Include="..\NPlug.Proxy\NPlug.Proxy.msbuildproj" />
   </ItemGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)../NPlug.Proxy/build/NPlug.Proxy.targets" />

src/NPlug.sln

@@ -46,7 +46,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{16297621
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NPlug.SimpleProgramChange", "..\samples\NPlug.SimpleProgramChange\NPlug.SimpleProgramChange.csproj", "{B29DFB8F-EECE-4418-955D-E629C9C2B8C2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NPlug.Proxy", "NPlug.Proxy\NPlug.Proxy.csproj", "{103E615E-DDA9-4EA0-A3CB-318BFC3D844A}"
+Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "NPlug.Proxy", "NPlug.Proxy\NPlug.Proxy.msbuildproj", "{103E615E-DDA9-4EA0-A3CB-318BFC3D844A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/NPlug/NPlug.csproj

@@ -62,6 +62,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\NPlug.Proxy\NPlug.Proxy.csproj" />
+    <ProjectReference Include="..\NPlug.Proxy\NPlug.Proxy.msbuildproj" />
   </ItemGroup>
 </Project>