From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Mon, 1 Nov 2021 20:15:21 +0000 (+0100)
Subject: test with net48, string to readonlyspan<char> missing
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=refs%2Fheads%2FtestMono;p=jp%2Fcrow.git

test with net48, string to readonlyspan<char> missing
---

diff --git a/Crow/Crow.csproj b/Crow/Crow.csproj
index 2771f658..9475f109 100644
--- a/Crow/Crow.csproj
+++ b/Crow/Crow.csproj
@@ -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>
@@ -34,9 +35,11 @@
 		<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" />-->
diff --git a/Crow/src/Colors.cs b/Crow/src/Colors.cs
index d24f5e94..1d1152b5 100644
--- a/Crow/src/Colors.cs
+++ b/Crow/src/Colors.cs
@@ -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) +
diff --git a/Crow/src/Interface.cs b/Crow/src/Interface.cs
index 66aa0e69..f5fff501 100644
--- a/Crow/src/Interface.cs
+++ b/Crow/src/Interface.cs
@@ -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),
diff --git a/Directory.Build.props b/Directory.Build.props
index 2da796a8..cd39ab97 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -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>
diff --git a/Samples/Directory.Build.props b/Samples/Directory.Build.props
index 34459547..458acc5f 100644
--- a/Samples/Directory.Build.props
+++ b/Samples/Directory.Build.props
@@ -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>