Skip to content

Commit

Permalink
Update libAppCore.so
Browse files Browse the repository at this point in the history
Remove unnecessary TFMs
  • Loading branch information
SupinePandora43 committed Jul 18, 2023
1 parent d92a8c9 commit 581775d
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 37 deletions.
6 changes: 4 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
"args": [],
"cwd": "${workspaceFolder}/Examples/gpu/UltralightNet.Vulkan.TestApp/bin/Debug/net6.0",
"console": "internalConsole",
"stopAtEntry": false
"stopAtEntry": false,
"envFile": "${workspaceFolder}/.env"
},
{
"name": "Veldrid TestApp",
Expand All @@ -52,7 +53,8 @@
"args": [],
"cwd": "${workspaceFolder}/Examples/AppCore/UltralightNet.AppCore.TestApp/bin/Debug/net6.0",
"console": "internalConsole",
"stopAtEntry": false
"stopAtEntry": false,
"envFile": "${workspaceFolder}/.env"
},
{
"name": "TestApp",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net471;net46;net451;net45;netstandard2.1;netstandard2</TargetFrameworks>
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
<Platform>x64</Platform>

<Authors>Ultralight, Inc.</Authors>
Expand Down
Binary file not shown.
1 change: 1 addition & 0 deletions src/UltralightNet.AppCore/UltralightNet.AppCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<Compile Remove="LibraryImportGenerator/**" Condition="'$(TargetFramework)'=='net7.0'" />
</ItemGroup>
<ItemGroup>
<!-- <PackageReference Include="Microsoft.Interop.LibraryImportGenerator" Version="7.0.8.32201" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="All" /> -->
<PackageReference Include="System.ValueTuple" Version="4.5.0" PrivateAssets="All" />
<ProjectReference Include="..\UltralightNet\UltralightNet.csproj" />
<ProjectReference Include="..\UltralightNet.AppCore.Binaries\UltralightNet.AppCore.Binaries.csproj" />
Expand Down
34 changes: 1 addition & 33 deletions src/UltralightNet.Binaries/UltralightNet.Binaries.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0;net471;net46;net451;net45;netstandard2.1;netstandard2</TargetFrameworks>
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
<Platform>x64</Platform>

<Authors>Ultralight, Inc.</Authors>
Expand All @@ -23,47 +23,15 @@
<_NativeAssetName Include="runtimes/win-x64/native/Ultralight.dll" PackagePath="runtimes/win-x64/native" />
<_NativeAssetName Include="runtimes/win-x64/native/UltralightCore.dll" PackagePath="runtimes/win-x64/native" />
<_NativeAssetName Include="runtimes/win-x64/native/WebCore.dll" PackagePath="runtimes/win-x64/native" />
<_NativeAssetName Include="runtimes/win-x64/native/gio-2.0-0.dll" PackagePath="runtimes/win-x64/native" />
<_NativeAssetName Include="runtimes/win-x64/native/glib-2.0-0.dll" PackagePath="runtimes/win-x64/native" />
<_NativeAssetName Include="runtimes/win-x64/native/gmodule-2.0-0.dll" PackagePath="runtimes/win-x64/native" />
<_NativeAssetName Include="runtimes/win-x64/native/gobject-2.0-0.dll" PackagePath="runtimes/win-x64/native" />
<_NativeAssetName Include="runtimes/win-x64/native/gstreamer-full-1.0.dll" PackagePath="runtimes/win-x64/native" />
<_NativeAssetName Include="runtimes/win-x64/native/gthread-2.0-0.dll" PackagePath="runtimes/win-x64/native" />

<_NativeAssetName Include="runtimes/osx-x64/native/libUltralight.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libUltralightCore.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libWebCore.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libgio-2.0.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libgio-2.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libglib-2.0.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libglib-2.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libgmodule-2.0.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libgmodule-2.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libgobject-2.0.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libgobject-2.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libgstreamer-full-1.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libgthread-2.0.0.dylib" PackagePath="runtimes/osx-x64/native" />
<_NativeAssetName Include="runtimes/osx-x64/native/libgthread-2.0.dylib" PackagePath="runtimes/osx-x64/native" />

<_NativeAssetName Include="runtimes/linux-x64/native/libUltralight.so" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libUltralightCore.so" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libWebCore.so" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgio-2.0.so" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgio-2.0.so.0" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgio-2.0.so.0.6800.3" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libglib-2.0.so" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libglib-2.0.so.0" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libglib-2.0.so.0.6800.3" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgmodule-2.0.so" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgmodule-2.0.so.0" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgmodule-2.0.so.0.6800.3" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgobject-2.0.so" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgobject-2.0.so.0" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgobject-2.0.so.0.6800.3" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgstreamer-full-1.0.so" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgthread-2.0.so" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgthread-2.0.so.0" PackagePath="runtimes/linux-x64/native" />
<_NativeAssetName Include="runtimes/linux-x64/native/libgthread-2.0.so.0.6800.3" PackagePath="runtimes/linux-x64/native" />

<_ExistingAssets Include="@(_NativeAssetName)" />
<Content Include="@(_ExistingAssets->'%(Identity)')" CopyToOutputDirectory="PreserveNewest" PackagePath="%(PackagePath)" Pack="true" />
Expand Down
2 changes: 1 addition & 1 deletion src/UltralightNet/UltralightNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<!-- <PackageReference Include="ErrorProne.NET.Structs" Version="0.4.0-beta.1" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="All" /> -->
<!-- <PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.4.0-beta.1" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="All" /> -->

<PackageReference Include="Microsoft.Interop.LibraryImportGenerator" Version="7.0.8.32201" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="All" />
<!-- <PackageReference Include="Microsoft.Interop.LibraryImportGenerator" Version="7.0.8.32201" OutputItemType="Analyzer" ReferenceOutputAssembly="false" PrivateAssets="All" /> -->

<PackageReference Condition="'$(TargetFramework)'!='net5.0'" Include="System.Memory" Version="4.5.4" />
<PackageReference Condition="'$(TargetFramework)'!='net5.0'" Include="System.Numerics.Vectors" Version="4.5.0" />
Expand Down

0 comments on commit 581775d

Please sign in to comment.