diff --git a/.vscode/launch.json b/.vscode/launch.json index 0909cdd8f..4df4537c0 100755 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -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", @@ -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", diff --git a/src/UltralightNet.AppCore.Binaries/UltralightNet.AppCore.Binaries.csproj b/src/UltralightNet.AppCore.Binaries/UltralightNet.AppCore.Binaries.csproj index 8093b2829..04c274967 100644 --- a/src/UltralightNet.AppCore.Binaries/UltralightNet.AppCore.Binaries.csproj +++ b/src/UltralightNet.AppCore.Binaries/UltralightNet.AppCore.Binaries.csproj @@ -1,6 +1,6 @@ - net6.0;net471;net46;net451;net45;netstandard2.1;netstandard2 + net6.0;netstandard2.0 x64 Ultralight, Inc. diff --git a/src/UltralightNet.AppCore.Binaries/runtimes/linux-x64/native/libAppCore.so b/src/UltralightNet.AppCore.Binaries/runtimes/linux-x64/native/libAppCore.so index b89248848..36803c7ab 100644 Binary files a/src/UltralightNet.AppCore.Binaries/runtimes/linux-x64/native/libAppCore.so and b/src/UltralightNet.AppCore.Binaries/runtimes/linux-x64/native/libAppCore.so differ diff --git a/src/UltralightNet.AppCore/UltralightNet.AppCore.csproj b/src/UltralightNet.AppCore/UltralightNet.AppCore.csproj index c403789a4..01907165d 100755 --- a/src/UltralightNet.AppCore/UltralightNet.AppCore.csproj +++ b/src/UltralightNet.AppCore/UltralightNet.AppCore.csproj @@ -13,6 +13,7 @@ + diff --git a/src/UltralightNet.Binaries/UltralightNet.Binaries.csproj b/src/UltralightNet.Binaries/UltralightNet.Binaries.csproj index f6c95880e..7be0e3fb9 100755 --- a/src/UltralightNet.Binaries/UltralightNet.Binaries.csproj +++ b/src/UltralightNet.Binaries/UltralightNet.Binaries.csproj @@ -1,6 +1,6 @@ - net6.0;net471;net46;net451;net45;netstandard2.1;netstandard2 + net6.0;netstandard2.0 x64 Ultralight, Inc. @@ -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)" /> diff --git a/src/UltralightNet/UltralightNet.csproj b/src/UltralightNet/UltralightNet.csproj index 3dfeb3fb1..a96c9f2ac 100755 --- a/src/UltralightNet/UltralightNet.csproj +++ b/src/UltralightNet/UltralightNet.csproj @@ -29,7 +29,7 @@ - +