split into osx and win packages

dragonfruitnetwork · Aug 15, 2023 · dc93ed8 · dc93ed8
1 parent b922f8e
commit dc93ed8
Show file tree

Hide file tree

Showing 23 changed files with 31 additions and 62 deletions.
diff --git a/...tive/DragonFruit.OnionFruit.Native.csproj → Common.Build.props b/...tive/DragonFruit.OnionFruit.Native.csproj → Common.Build.props
@@ -1,18 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project>
     <PropertyGroup>
         <OutputType>Library</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
-        <AssemblyTitle>OnionFruit Native</AssemblyTitle>
-        <Title>OnionFruit Native Libraries</Title>
-        <Description>Native libraries for OnionFruit</Description>
+        <IncludeBuildOutput>false</IncludeBuildOutput>
+        <TargetFramework>netstandard1.0</TargetFramework>
     </PropertyGroup>
 
     <PropertyGroup>
         <IsPackable>true</IsPackable>
+        <PackageIcon>icon.png</PackageIcon>
+        <Title>OnionFruit Native Libraries</Title>
         <PackageReadmeFile>readme.md</PackageReadmeFile>
-        <PackageId>DragonFruit.OnionFruit.Native</PackageId>
         <PackageTags>dragonfruit onionfruit native</PackageTags>
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <Description>Native libraries for OnionFruit</Description>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/DragonFruit.OnionFruit.Native.osx/DragonFruit.OnionFruit.Native.osx.csproj b/DragonFruit.OnionFruit.Native.osx/DragonFruit.OnionFruit.Native.osx.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="$(SolutionDir)Common.Build.props"/>
+
+    <PropertyGroup>
+        <PackageId>DragonFruit.OnionFruit.Native.osx</PackageId>
+    </PropertyGroup>
+
+</Project>
diff --git a/...mes/osx-arm64/native/libevent-2.1.7.dylib → ...mes/osx-arm64/native/libevent-2.1.7.dylib b/...mes/osx-arm64/native/libevent-2.1.7.dylib → ...mes/osx-arm64/native/libevent-2.1.7.dylib
diff --git a/...Native/runtimes/osx-arm64/native/lyrebird → ...ve.osx/runtimes/osx-arm64/native/lyrebird b/...Native/runtimes/osx-arm64/native/lyrebird → ...ve.osx/runtimes/osx-arm64/native/lyrebird
diff --git a/...untimes/osx-arm64/native/snowflake-client → ...untimes/osx-arm64/native/snowflake-client b/...untimes/osx-arm64/native/snowflake-client → ...untimes/osx-arm64/native/snowflake-client
diff --git a/...ruit.Native/runtimes/osx-arm64/native/tor → ....Native.osx/runtimes/osx-arm64/native/tor b/...ruit.Native/runtimes/osx-arm64/native/tor → ....Native.osx/runtimes/osx-arm64/native/tor
diff --git a/...ive/runtimes/osx-arm64/native/tor-LICENSE → ...osx/runtimes/osx-arm64/native/tor-LICENSE b/...ive/runtimes/osx-arm64/native/tor-LICENSE → ...osx/runtimes/osx-arm64/native/tor-LICENSE
diff --git a/...times/osx-x64/native/libevent-2.1.7.dylib → ...times/osx-x64/native/libevent-2.1.7.dylib b/...times/osx-x64/native/libevent-2.1.7.dylib → ...times/osx-x64/native/libevent-2.1.7.dylib
diff --git a/...t.Native/runtimes/osx-x64/native/lyrebird → ...tive.osx/runtimes/osx-x64/native/lyrebird b/...t.Native/runtimes/osx-x64/native/lyrebird → ...tive.osx/runtimes/osx-x64/native/lyrebird
diff --git a/.../runtimes/osx-x64/native/snowflake-client → .../runtimes/osx-x64/native/snowflake-client b/.../runtimes/osx-x64/native/snowflake-client → .../runtimes/osx-x64/native/snowflake-client
diff --git a/...nFruit.Native/runtimes/osx-x64/native/tor → ...it.Native.osx/runtimes/osx-x64/native/tor b/...nFruit.Native/runtimes/osx-x64/native/tor → ...it.Native.osx/runtimes/osx-x64/native/tor
diff --git a/...ative/runtimes/osx-x64/native/tor-LICENSE → ...e.osx/runtimes/osx-x64/native/tor-LICENSE b/...ative/runtimes/osx-x64/native/tor-LICENSE → ...e.osx/runtimes/osx-x64/native/tor-LICENSE
diff --git a/DragonFruit.OnionFruit.Native.sln b/DragonFruit.OnionFruit.Native.sln
@@ -1,6 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DragonFruit.OnionFruit.Native", "DragonFruit.OnionFruit.Native\DragonFruit.OnionFruit.Native.csproj", "{4F1C79A5-0AB4-4D7F-9786-D0898B74942E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DragonFruit.OnionFruit.Native.win", "DragonFruit.OnionFruit.Native.win\DragonFruit.OnionFruit.Native.win.csproj", "{4F1C79A5-0AB4-4D7F-9786-D0898B74942E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DragonFruit.OnionFruit.Native.osx", "DragonFruit.OnionFruit.Native.osx\DragonFruit.OnionFruit.Native.osx.csproj", "{9DF6F90C-FA9E-4A9F-BD19-54CD26252BF7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -12,5 +14,9 @@ Global
 		{4F1C79A5-0AB4-4D7F-9786-D0898B74942E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4F1C79A5-0AB4-4D7F-9786-D0898B74942E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4F1C79A5-0AB4-4D7F-9786-D0898B74942E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9DF6F90C-FA9E-4A9F-BD19-54CD26252BF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9DF6F90C-FA9E-4A9F-BD19-54CD26252BF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9DF6F90C-FA9E-4A9F-BD19-54CD26252BF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9DF6F90C-FA9E-4A9F-BD19-54CD26252BF7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/DragonFruit.OnionFruit.Native.win/DragonFruit.OnionFruit.Native.win.csproj b/DragonFruit.OnionFruit.Native.win/DragonFruit.OnionFruit.Native.win.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Import Project="$(SolutionDir)Common.Build.props"/>
+
+    <PropertyGroup>
+        <PackageId>DragonFruit.OnionFruit.Native.win</PackageId>
+    </PropertyGroup>
+
+</Project>
diff --git a/...tive/runtimes/win-x64/native/lyrebird.exe → ....win/runtimes/win-x64/native/lyrebird.exe b/...tive/runtimes/win-x64/native/lyrebird.exe → ....win/runtimes/win-x64/native/lyrebird.exe
diff --git a/...times/win-x64/native/snowflake-client.exe → ...times/win-x64/native/snowflake-client.exe b/...times/win-x64/native/snowflake-client.exe → ...times/win-x64/native/snowflake-client.exe
diff --git a/...ative/runtimes/win-x64/native/tor-LICENSE → ...e.win/runtimes/win-x64/native/tor-LICENSE b/...ative/runtimes/win-x64/native/tor-LICENSE → ...e.win/runtimes/win-x64/native/tor-LICENSE
diff --git a/...it.Native/runtimes/win-x64/native/tor.exe → ...ative.win/runtimes/win-x64/native/tor.exe b/...it.Native/runtimes/win-x64/native/tor.exe → ...ative.win/runtimes/win-x64/native/tor.exe
diff --git a/...tive/runtimes/win-x86/native/lyrebird.exe → ....win/runtimes/win-x86/native/lyrebird.exe b/...tive/runtimes/win-x86/native/lyrebird.exe → ....win/runtimes/win-x86/native/lyrebird.exe
diff --git a/...times/win-x86/native/snowflake-client.exe → ...times/win-x86/native/snowflake-client.exe b/...times/win-x86/native/snowflake-client.exe → ...times/win-x86/native/snowflake-client.exe
diff --git a/...ative/runtimes/win-x86/native/tor-LICENSE → ...e.win/runtimes/win-x86/native/tor-LICENSE b/...ative/runtimes/win-x86/native/tor-LICENSE → ...e.win/runtimes/win-x86/native/tor-LICENSE
diff --git a/...it.Native/runtimes/win-x86/native/tor.exe → ...ative.win/runtimes/win-x86/native/tor.exe b/...it.Native/runtimes/win-x86/native/tor.exe → ...ative.win/runtimes/win-x86/native/tor.exe
diff --git a/DragonFruit.OnionFruit.Native/TorResolver.cs b/DragonFruit.OnionFruit.Native/TorResolver.cs