From: Jean-Philippe Bruyère Date: Thu, 19 Nov 2020 08:12:12 +0000 (+0100) Subject: save commit X-Git-Tag: v0.9.5-beta~113^2~1 X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=a77e1d7b06d860e040097b72cb9244a45e634e62;p=jp%2Fcrow.git save commit --- diff --git a/.gitignore b/.gitignore index bff27cf1..31d6ffa8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,6 @@ src/GraphicObjects/Panel.cs src/GraphicObjects/VerticalWrappingWidget.cs src/GraphicObjects/HorizontalWrappingWidget.cs TestResult.xml +*.swp +*.perf +.vscode diff --git a/.nuget/NuGet.config b/.nuget/NuGet.config deleted file mode 100644 index 97241036..00000000 --- a/.nuget/NuGet.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj index 481cb7b0..9f7349bd 100644 --- a/Crow/Crow.csproj +++ b/Crow/Crow.csproj @@ -38,17 +38,21 @@ - + + + + $(DefineConstants);STB_SHARP + - + Crow.%(Filename).template @@ -59,8 +63,6 @@ Crow.Cursors.%(Filename) - - - + diff --git a/Directory.Build.props b/Directory.Build.props index 9e62cfed..a05750a6 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,13 +1,13 @@ - $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory) $(SolutionDir)build\$(Configuration)\ $(SolutionDir)build\obj\$(Configuration)\ MIT Jean-Philippe Bruyère 7.2 - 0.9.1 + 0.9.2 $(CrowVersion)-beta true diff --git a/Samples/BasicTests/BasicTests.cs b/Samples/BasicTests/BasicTests.cs index 2e42052a..755c4a0b 100644 --- a/Samples/BasicTests/BasicTests.cs +++ b/Samples/BasicTests/BasicTests.cs @@ -2,7 +2,6 @@ using System; using System.Collections.Generic; using System.IO; using System.Linq; -using System.Reflection; using Crow; using Glfw; @@ -12,10 +11,6 @@ namespace tests { static void Main () { -#if NETCOREAPP3_1 - DllMapCore.Resolve.Enable (true); -#endif - using (BasicTests app = new BasicTests ()) { app.Run (); } @@ -49,7 +44,6 @@ namespace tests testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedControl", "*.crow")).ToArray (); testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedContainer", "*.crow")).ToArray (); testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/TemplatedGroup", "*.crow")).ToArray (); - testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Splitter", "*.crow")).ToArray (); testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Wrapper", "*.crow")).ToArray (); testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/Divers", "*.crow")).ToArray (); testFiles = testFiles.Concat (Directory.GetFiles (@"Interfaces/DragAndDrop", "*.crow")).ToArray (); diff --git a/Samples/DebugLogAnalyzer/Program.cs b/Samples/DebugLogAnalyzer/Program.cs index 6be26ced..bb793da3 100644 --- a/Samples/DebugLogAnalyzer/Program.cs +++ b/Samples/DebugLogAnalyzer/Program.cs @@ -13,9 +13,6 @@ namespace DebugLogAnalyzer { static void Main (string [] args) { -#if NETCOREAPP3_1 - DllMapCore.Resolve.Enable (true); -#endif using (Program app = new Program ()) app.Run (); } diff --git a/Samples/Directory.Build.props b/Samples/Directory.Build.props index fec3cb65..120aa913 100644 --- a/Samples/Directory.Build.props +++ b/Samples/Directory.Build.props @@ -1,9 +1,9 @@ - net472 + net472;netcoreapp3.1 Exe - $(MSBuildThisFileDirectory) + $(MSBuildThisFileDirectory)..\ $(SolutionDir)build\$(Configuration)\ $(SolutionDir)build\obj\$(Configuration)\ @@ -14,10 +14,10 @@ false $(SolutionDir)Samples\ + $(SolutionDir)Crow\App.config - diff --git a/Samples/HelloWorld/HelloWorld.csproj b/Samples/HelloWorld/HelloWorld.csproj index b19bb1c6..8186985d 100644 --- a/Samples/HelloWorld/HelloWorld.csproj +++ b/Samples/HelloWorld/HelloWorld.csproj @@ -1,4 +1,4 @@ - + diff --git a/Samples/HelloWorld/main.cs b/Samples/HelloWorld/main.cs index 743419ee..44ec3fb8 100644 --- a/Samples/HelloWorld/main.cs +++ b/Samples/HelloWorld/main.cs @@ -5,9 +5,6 @@ namespace HelloWorld { class Program { static void Main (string[] args) { -#if NETCOREAPP3_1 - DllMapCore.Resolve.Enable (true); -#endif using (Interface app = new Interface ()) { app.Initialized += (sender, e) => (sender as Interface).Load ("#HelloWorld.helloworld.crow"); app.Run (); diff --git a/Samples/ShowCase/ShowCase.cs b/Samples/ShowCase/ShowCase.cs index f3aba2b5..d8254317 100644 --- a/Samples/ShowCase/ShowCase.cs +++ b/Samples/ShowCase/ShowCase.cs @@ -16,9 +16,6 @@ namespace ShowCase { static void Main () { -#if NETCOREAPP3_1 - DllMapCore.Resolve.Enable (true); -#endif using (Showcase app = new Showcase ()) app.Run (); } diff --git a/Samples/ShowCase/packages.config b/Samples/ShowCase/packages.config deleted file mode 100644 index fba81ebc..00000000 --- a/Samples/ShowCase/packages.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/Samples/common/SampleBase.cs b/Samples/common/SampleBase.cs index 93aec907..65345be7 100644 --- a/Samples/common/SampleBase.cs +++ b/Samples/common/SampleBase.cs @@ -1,4 +1,6 @@ -using System; +using System.Net.NetworkInformation; +using System.Runtime.InteropServices; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -10,6 +12,24 @@ using Crow; namespace Crow { public class SampleBase : Interface { +#if NETCOREAPP + static IntPtr resolveUnmanaged (Assembly assembly, String libraryName) { + + switch (libraryName) + { + case "glfw3": + return NativeLibrary.Load("glfw", assembly, null); + case "rsvg-2.40": + return NativeLibrary.Load("rsvg-2", assembly, null); + } + Console.WriteLine ($"[UNRESOLVE] {assembly} {libraryName}"); + return IntPtr.Zero; + } + + static SampleBase () { + System.Runtime.Loader.AssemblyLoadContext.Default.ResolvingUnmanagedDll+=resolveUnmanaged; + } +#endif public Version CrowVersion => Assembly.GetAssembly (typeof (Widget)).GetName ().Version; #region Test values for Binding