]> O.S.I.I.S - jp/crow.git/commitdiff
test with net48, string to readonlyspan<char> missing testMono
authorJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Mon, 1 Nov 2021 20:15:21 +0000 (21:15 +0100)
committerJean-Philippe Bruyère <jp_bruyere@hotmail.com>
Mon, 1 Nov 2021 20:15:21 +0000 (21:15 +0100)
Crow/Crow.csproj
Crow/src/Colors.cs
Crow/src/Interface.cs
Directory.Build.props
Samples/Directory.Build.props

index 2771f658cdb5d0464fe2b6c0f56ef17bcfd352b9..9475f1099e00794012f6e4f7b21bd7b02f016b4a 100644 (file)
@@ -2,7 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
        <PropertyGroup>
 <!--           <TargetFrameworks>netstandard2.0</TargetFrameworks>-->
-               <TargetFramework>netcoreapp3.0</TargetFramework>
+               <TargetFrameworks>net48;netcoreapp3.0</TargetFrameworks>
+               <TargetFramework>net48</TargetFramework>
 
                <AssemblyVersion>$(CrowVersion)</AssemblyVersion>
                <PackageVersion>$(CrowPackageVersion)</PackageVersion>
                <DefineConstants>$(DefineConstants);DEBUG;TRACE;_DEBUG_BINDING;_DEBUG_CLIP_RECTANGLE</DefineConstants>
                <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
        </PropertyGroup>
-       <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
+       <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
                <PackageReference Include="System.Reflection.Emit.ILGeneration" Version="4.6.0" />
                <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.6.0" />
+               <PackageReference Include="System.IO.Compression" Version="4.3.0" />
+               <PackageReference Include="System.Memory" Version="4.5.4" />
        </ItemGroup>
        <ItemGroup>
                <!--<PackageReference Include="FastEnum" Version="1.5.3" />-->
index d24f5e94246052164649042faeb046c9e991c617..1d1152b571da10e2972de23070cf33354eadd84e 100644 (file)
@@ -3,9 +3,6 @@
 // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-//using FastEnumUtility;
 
 namespace Crow
 {
@@ -188,6 +185,7 @@ namespace Crow
                                (((uint)Math.Round (b * 255.0)) << 8) +
                                (((uint)Math.Round (a * 255.0)));
                }
+
                public Color (ReadOnlySpan<double> rgba) {
                        value =
                                (((uint)Math.Round (rgba[0] * 255.0)) << 24) +
index 66aa0e69b163745850b848d3d78b36a1c6677007..f5fff50103b36454e71b4236e6ded77672754da5 100644 (file)
@@ -76,8 +76,7 @@ namespace Crow
                                init_internal ();
                        }
                }
-               static void nativeHelpMessage () {
-               }
+#if !NET48
                static IntPtr resolveUnmanaged(Assembly assembly, String libraryName)
                {
                        try {
@@ -107,13 +106,14 @@ namespace Crow
                        }
                        return IntPtr.Zero;
                }
-
+#endif
 
                #region CTOR
                static Interface ()
                {
+#if !NET48
                        System.Runtime.Loader.AssemblyLoadContext.GetLoadContext(Assembly.GetExecutingAssembly()).ResolvingUnmanagedDll += resolveUnmanaged;
-
+#endif
                        CROW_CONFIG_ROOT =
                                System.IO.Path.Combine (
                                        Environment.GetFolderPath (Environment.SpecialFolder.UserProfile),
index 2da796a8adbe8b6c8ddc554b51b9225979df192f..cd39ab97cab809959e2bfab9f24587d3ba72d61d 100644 (file)
@@ -4,10 +4,10 @@
                <IntermediateOutputPath>$(SolutionDir)build\obj\$(Configuration)\</IntermediateOutputPath>
                <License>MIT</License>
                <Authors>Jean-Philippe Bruyère</Authors>
-               <LangVersion>7.3</LangVersion>
+               <!--<LangVersion>7.3</LangVersion>-->
 
-               <CrowVersion>0.9.8</CrowVersion>
-               <CrowPackageVersion>$(CrowVersion)</CrowPackageVersion>
+               <CrowVersion>0.9.9</CrowVersion>
+               <CrowPackageVersion>$(CrowVersion)-beta</CrowPackageVersion>
 
                <!-- If you dont have a native libstb on your system, enable the managed version of stb here
                                TODO: this could be detected on startup or install automatically-->
@@ -26,6 +26,6 @@
                <!-- Experimental vkvg backend, testing only-->
                <CrowVkvgBackend>false</CrowVkvgBackend>
 
-               <GlfwSharpVersion>0.2.14</GlfwSharpVersion>
+               <GlfwSharpVersion>0.2.15-beta</GlfwSharpVersion>
        </PropertyGroup>
 </Project>
index 3445954770cf996d53a653a7fa3ba8db2148da9c..458acc5f500106a4fe8aff1fad5c160f0af476f1 100644 (file)
@@ -1,8 +1,8 @@
 <Project>
        <PropertyGroup>
-               <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+               <TargetFrameworks>net48;netcoreapp3.1</TargetFrameworks>
                <!--<TargetFrameworks>net5</TargetFrameworks>-->
-               <OutputType>WinExe</OutputType>
+               <OutputType>Exe</OutputType>
 
                <SolutionDir>$(MSBuildThisFileDirectory)..\</SolutionDir>
                <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>