v1.6.0 issue #12

tossnet · Mar 28, 2024 · d9bfddb · d9bfddb
1 parent c13f86b
commit d9bfddb
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 22 deletions.
diff --git a/BlazorCaptcha/BlazorCaptcha.csproj b/BlazorCaptcha/BlazorCaptcha.csproj
@@ -12,9 +12,9 @@
 		<PackageReleaseNotes>Update nuget packages</PackageReleaseNotes>
 		<PackageIcon>icon.png</PackageIcon>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Version>1.5.0</Version>
-		<AssemblyVersion>1.5.0.0</AssemblyVersion>
-		<FileVersion>1.5.0.0</FileVersion>
+		<Version>1.6.0</Version>
+		<AssemblyVersion>1.6.0.0</AssemblyVersion>
+		<FileVersion>1.6.0.0</FileVersion>
 		<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
 		<Licence>GPL-3.0</Licence>
 		<DebugType>embedded</DebugType>
@@ -46,17 +46,19 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.14" />
-    <PackageReference Include="SkiaSharp" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
-    <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.6" />
+	  <PackageReference Include="SkiaSharp" Version="3.0.0-preview.2.1" />
+	  <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.0.0-preview.2.1" />
+	  <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.0.0-preview.2.1" />
+	  <PackageReference Include="SkiaSharp.Views.Blazor" Version="3.0.0-preview.1.8" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
 	<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.1" />
 	<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.1" />
-	<PackageReference Include="SkiaSharp" Version="2.88.7" />
-	<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
-	<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.7" />
+	<PackageReference Include="SkiaSharp" Version="3.0.0-preview.1.8" />
+	<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.0.0-preview.1.8" />
+	<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.0.0-preview.1.8" />
+	  <PackageReference Include="SkiaSharp.Views.Blazor" Version="3.0.0-preview.1.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/README.md b/README.md
@@ -54,16 +54,19 @@ For client-side and server-side Blazor - add script section to _Host.cshtml (hea
 ## <a name="ReleaseNotes"></a>Release Notes
 
 
-<details open="open"><summary>Version 1.5.0</summary>
+<details  open="open"><summary>Version 1.6.0</summary>
 
->- 
-Add DotNet 8.0 framework target
+>- issue #12
+</details>
+
+<details><summary>Version 1.5.0</summary>
+
+>- Add DotNet 8.0 framework target
 </details>
 
 <details ><summary>Version 1.4.2</summary>
 
->- 
-Update nuget packages
+>- Update nuget packages
 </details>
 
 <details><summary>Version 1.4.1</summary>

diff --git a/Samples/BlazorWebAssembly/Blazor-Wasm-Captcha-Test/Blazor-Wasm-Captcha-Test.csproj b/Samples/BlazorWebAssembly/Blazor-Wasm-Captcha-Test/Blazor-Wasm-Captcha-Test.csproj
@@ -9,10 +9,16 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.14" PrivateAssets="all" />
+	  <PackageReference Include="SkiaSharp.Views.Blazor" Version="3.0.0-preview.1.8" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\BlazorCaptcha\BlazorCaptcha.csproj" />
   </ItemGroup>
 
+	<ItemGroup>
+		<NativeFileReference Include="$(SkiaSharpStaticLibraryPath)\2.0.23\*.a" />
+	</ItemGroup>
+
+
 </Project>
diff --git a/Samples/BlazorWebAssembly/Blazor-Wasm-Captcha-Test/Pages/Index.razor b/Samples/BlazorWebAssembly/Blazor-Wasm-Captcha-Test/Pages/Index.razor
@@ -5,17 +5,17 @@
 
 <h3>Hello, world!</h3>
 
-<Captcha @bind-CaptchaWord="@Captcha" Width="200" Height="50" CharNumber="@CaptchaLetters" />
-
+@* <Captcha @bind-CaptchaWord="@Captcha" Width="200" Height="50" CharNumber="@CaptchaLetters" /> *@
+                    <Toto></Toto>
 <p>@Captcha</p>
 
 @code{
     private string Captcha  { get; set; } = "";
-    private int CaptchaLetters = 5;
+    // private int CaptchaLetters = 5;
     
-    protected override Task OnInitializedAsync()
-    {
-        Captcha = BlazorCaptcha.Tools.GetCaptchaWord(CaptchaLetters);
-        return base.OnInitializedAsync();
-    }
+    // protected override Task OnInitializedAsync()
+    // {
+    //     Captcha = BlazorCaptcha.Tools.GetCaptchaWord(CaptchaLetters);
+    //     return base.OnInitializedAsync();
+    // }
 }