Update to OpenSilver v3.2.0

barjonp · barjonp · commit 2048bdf77bc3 · 2025-03-14T11:26:30.000+01:00
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -1,6 +1,6 @@
 name: OpenSilver.ControlsKit Build
 env:
-  next-release-version: '2.0.1'
+  next-release-version: '3.3.0'
   opensilver-package-source: 'https://www.myget.org/F/opensilver/api/v3/index.json'
   suffix: 'preview'
 on:
diff --git a/src/FastControls.TestApp/FastControls.TestApp.Browser/FastControls.TestApp.Browser.csproj b/src/FastControls.TestApp/FastControls.TestApp.Browser/FastControls.TestApp.Browser.csproj
@@ -1,18 +1,18 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <NoXamlPreprocessor>True</NoXamlPreprocessor>
-    <OpenSilverType>6</OpenSilverType>
+    <OpenSilverType>7</OpenSilverType>
     <PublishTrimmed>true</PublishTrimmed>
     <!-- Uncomment to enable AOT compilation when publishing -->
     <!--<RunAOTCompilation>true</RunAOTCompilation>-->
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
-    <PackageReference Include="OpenSilver" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.11" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.11" PrivateAssets="all" />
+    <PackageReference Include="OpenSilver.WebAssembly" Version="3.2.0" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/FastControls.TestApp/FastControls.TestApp.Browser/Interop/UnmarshalledJavaScriptExecutionHandler.cs b/src/FastControls.TestApp/FastControls.TestApp.Browser/Interop/UnmarshalledJavaScriptExecutionHandler.cs
diff --git a/src/FastControls.TestApp/FastControls.TestApp.Browser/Pages/Index.cs b/src/FastControls.TestApp/FastControls.TestApp.Browser/Pages/Index.cs
@@ -1,10 +1,7 @@
-﻿using DotNetForHtml5;
-using FastControls.TestApp.Browser.Interop;
-using Microsoft.AspNetCore.Components;
+﻿using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.JSInterop;
 using System.Threading.Tasks;
-using System;
+using OpenSilver.WebAssembly;
 
 namespace FastControls.TestApp.Browser.Pages
 {
@@ -18,17 +15,7 @@ protected override void BuildRenderTree(RenderTreeBuilder __builder)
         protected async override Task OnInitializedAsync()
         {
             await base.OnInitializedAsync();
-
-            if (!await JSRuntime.InvokeAsync<bool>("getOSFilesLoadedPromise"))
-            {
-                throw new InvalidOperationException("Failed to initialize OpenSilver. Check your browser's console for error details.");
-            }
-
-            Cshtml5Initializer.Initialize(new UnmarshalledJavaScriptExecutionHandler(JSRuntime));
-            Program.RunApplication();
+            await Runner.RunApplicationAsync<TestApp.App>();
         }
-
-        [Inject]
-        private IJSRuntime JSRuntime { get; set; }
     }
 }
diff --git a/src/FastControls.TestApp/FastControls.TestApp.Browser/Program.cs b/src/FastControls.TestApp/FastControls.TestApp.Browser/Program.cs
@@ -1,9 +1,5 @@
 ﻿using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using System;
-using System.Net.Http;
 using System.Threading.Tasks;
-using System.Windows;
 
 namespace FastControls.TestApp.Browser
 {
@@ -13,19 +9,8 @@ public static async Task Main(string[] args)
         {
             var builder = WebAssemblyHostBuilder.CreateDefault(args);
             builder.RootComponents.Add<App>("#app");
-
-            builder.Services.AddTransient(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-
             var host = builder.Build();
             await host.RunAsync();
         }
-
-        public static void RunApplication()
-        {
-            Application.RunApplication(() =>
-            {
-                var app = new FastControls.TestApp.App();
-            });
-        }
     }
 }
diff --git a/src/FastControls.TestApp/FastControls.TestApp.Simulator/FastControls.TestApp.Simulator.csproj b/src/FastControls.TestApp/FastControls.TestApp.Simulator/FastControls.TestApp.Simulator.csproj
@@ -2,11 +2,11 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net472</TargetFramework>
+        <TargetFramework>net8.0-windows</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="OpenSilver.Simulator" Version="2.2.0" />
+        <PackageReference Include="OpenSilver.Simulator" Version="3.2.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/FastControls.TestApp/FastControls.TestApp/FastControls.TestApp.csproj b/src/FastControls.TestApp/FastControls.TestApp/FastControls.TestApp.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenSilver" Version="2.2.0" />
+    <PackageReference Include="OpenSilver" Version="3.2.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/FastControls/FastCheckBox.cs b/src/FastControls/FastCheckBox.cs
@@ -11,12 +11,15 @@
 *====================================================================================*/
 
 using System;
+using System.ComponentModel;
 using System.Globalization;
 using System.Windows;
 using CSHTML5.Internal;
 
 namespace OpenSilver.ControlsKit
 {
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("Deprecated. It will be removed in a future release.")]
     public class FastCheckBox : FrameworkElement
     {
         public static readonly DependencyProperty IsCheckedProperty =
@@ -45,7 +48,7 @@ public class FastCheckBox : FrameworkElement
                     CallPropertyChangedWhenLoadedIntoVisualTree = WhenToCallPropertyChangedEnum.IfPropertyIsSet
                 });
 
-        private object _checkboxHtmlElementRef;
+        private INTERNAL_HtmlDomElementReference _checkboxHtmlElementRef;
 
         private IDisposable _jsCallbackOnClick;
         private object _labelHtmlElementRef;
@@ -102,7 +105,7 @@ public override object CreateDomElement(object parentRef, out object domElementW
                 // Trigger click notifications
                 OnClick(new RoutedEventArgs
                 {
-                    OriginalSource = this
+                    Source = this
                 });
             }));
             // Subscribe to the javascript click event through a simple listener
@@ -111,7 +114,10 @@ public override object CreateDomElement(object parentRef, out object domElementW
 
             INTERNAL_HtmlDomManager.CreateDomElementAppendItAndGetStyle(
                 "input",
-                _labelHtmlElementRef, this, out _checkboxHtmlElementRef);
+                _labelHtmlElementRef, this, out object checkboxHtmlElementRef);
+
+            _checkboxHtmlElementRef = (INTERNAL_HtmlDomElementReference)checkboxHtmlElementRef;
+
             INTERNAL_HtmlDomManager.SetDomElementAttribute(_checkboxHtmlElementRef, "type", "checkbox");
 
             INTERNAL_HtmlDomManager.CreateDomElementAppendItAndGetStyle("span", _labelHtmlElementRef, this,
@@ -192,21 +198,21 @@ private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyCha
             {
                 checkbox.OnChecked(new RoutedEventArgs
                 {
-                    OriginalSource = checkbox
+                    Source = checkbox
                 });
             }
             else if (newValue == false)
             {
                 checkbox.OnUnchecked(new RoutedEventArgs
                 {
-                    OriginalSource = checkbox
+                    Source = checkbox
                 });
             }
             else
             {
                 checkbox.OnIndeterminate(new RoutedEventArgs
                 {
-                    OriginalSource = checkbox
+                    Source = checkbox
                 });
             }
         }
diff --git a/src/FastControls/OpenSilver.ControlsKit.FastControls.csproj b/src/FastControls/OpenSilver.ControlsKit.FastControls.csproj
@@ -18,7 +18,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="OpenSilver" Version="2.2.0" />
+    <PackageReference Include="OpenSilver" Version="3.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OpenSilver.ControlsKit.Controls/OpenSilver.ControlsKit.Controls.csproj b/src/OpenSilver.ControlsKit.Controls/OpenSilver.ControlsKit.Controls.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenSilver" Version="2.2.0" />
+    <PackageReference Include="OpenSilver" Version="3.2.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/OpenSilver.ControlsKit.Controls/StaggeredPanel.cs b/src/OpenSilver.ControlsKit.Controls/StaggeredPanel.cs
@@ -248,10 +248,6 @@ protected override Size ArrangeOverride(Size finalSize)
             return base.ArrangeOverride(finalSize);
         }
 
-        protected override void INTERNAL_OnAttachedToVisualTree()
-        {
-            base.INTERNAL_OnAttachedToVisualTree();
-        }
         private static void OnDesiredColumnWidthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var panel = (StaggeredPanel)d;
diff --git a/src/OpenSilver.ControlsKit.sln b/src/OpenSilver.ControlsKit.sln
@@ -15,6 +15,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FastControls.TestApp.Simula
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSilver.ControlsKit.Controls", "OpenSilver.ControlsKit.Controls\OpenSilver.ControlsKit.Controls.csproj", "{EFAC9728-C7A6-431F-8780-5AE3531B3764}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
+	ProjectSection(SolutionItems) = preProject
+		build\build-nuget-package.bat = build\build-nuget-package.bat
+		build\nuspec\ControlsKit.nuspec = build\nuspec\ControlsKit.nuspec
+		Directory.Build.targets = Directory.Build.targets
+		..\.github\workflows\github-actions.yml = ..\.github\workflows\github-actions.yml
+		Nuget.Config = Nuget.Config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
diff --git a/src/build/build-nuget-package.bat b/src/build/build-nuget-package.bat
@@ -21,10 +21,9 @@ if /i "%PackageVersion%" EQU "" (
   set /p PackageVersion="%ESC% Package version:%ESC% "
 )
 
-
 rem If argument 2 is not given, use default value for OpenSilverVersion:
 set "OpenSilverVersion=%~2"
-if not defined OpenSilverVersion set "OpenSilverVersion=2.2.0"
+if not defined OpenSilverVersion set "OpenSilverVersion=3.2.0"
 
 rem Get the current date and time:
 for /F "tokens=2" %%i in ('date /t') do set currentdate=%%i
@@ -48,7 +47,3 @@ echo.
 echo %ESC%[95mPacking %ESC%[0mOpenSilver.ControlsKit.Controls %ESC%[95mNuGet package%ESC%[0m
 echo. 
 nuget.exe pack nuspec\ControlsKit.nuspec -OutputDirectory "output/ControlsKit" -Properties "PackageVersion=%PackageVersion%;Configuration=Release;OpenSilverVersion=%OpenSilverVersion%;RepositoryUrl=https://github.com/OpenSilver/OpenSilver.ControlsKit"
-
-explorer "output\ControlsKit"
-
-pause
diff --git a/src/build/nuspec/ControlsKit.nuspec b/src/build/nuspec/ControlsKit.nuspec
@@ -8,8 +8,8 @@
     <repository type="git" url="$RepositoryUrl$" />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>The ControlsKit is a collection of controls that developers can use directly in their OpenSilver projects, to complement the built-in controls.</description>
-    <copyright>Copyright (c) 2023, Userware. All rights reserved.</copyright>
-    <tags>silverlight webassembly csharp xaml wasm dotnet .net C# javascript html html5 blazor mono uwp</tags>
+    <copyright>Copyright (c) 2025, Userware. All rights reserved.</copyright>
+    <tags>silverlight wpf webassembly csharp xaml wasm dotnet .net C# javascript html html5 blazor mono uwp</tags>
     <!-- <iconUrl> is deprecated and replaced by <icon> -->
     <!--<iconUrl>https://opensilver.net/permalinks/images/OpenSilver_logo_128x128.png</iconUrl>-->
     <icon>images\OpenSilver_icon.png</icon>

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,5 @@`
`1`	`1`	`using Microsoft.AspNetCore.Components.WebAssembly.Hosting;`
`2`		`-using Microsoft.Extensions.DependencyInjection;`
`3`		`-using System;`
`4`		`-using System.Net.Http;`
`5`	`2`	`using System.Threading.Tasks;`
`6`		`-using System.Windows;`
`7`	`3`
`8`	`4`	`namespace FastControls.TestApp.Browser`
`9`	`5`	`{`
`@@ -13,19 +9,8 @@ public static async Task Main(string[] args)`
`13`	`9`	`{`
`14`	`10`	`var builder = WebAssemblyHostBuilder.CreateDefault(args);`
`15`	`11`	`builder.RootComponents.Add<App>("#app");`
`16`		`-`
`17`		`- builder.Services.AddTransient(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });`
`18`		`-`
`19`	`12`	`var host = builder.Build();`
`20`	`13`	`await host.RunAsync();`
`21`	`14`	`}`
`22`		`-`
`23`		`- public static void RunApplication()`
`24`		`- {`
`25`		`- Application.RunApplication(() =>`
`26`		`- {`
`27`		`- var app = new FastControls.TestApp.App();`
`28`		`- });`
`29`		`- }`
`30`	`15`	`}`
`31`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,12 +11,15 @@`
`11`	`11`	`====================================================================================/`
`12`	`12`
`13`	`13`	`using System;`
	`14`	`+using System.ComponentModel;`
`14`	`15`	`using System.Globalization;`
`15`	`16`	`using System.Windows;`
`16`	`17`	`using CSHTML5.Internal;`
`17`	`18`
`18`	`19`	`namespace OpenSilver.ControlsKit`
`19`	`20`	`{`
	`21`	`+ [EditorBrowsable(EditorBrowsableState.Never)]`
	`22`	`+ [Obsolete("Deprecated. It will be removed in a future release.")]`
`20`	`23`	`public class FastCheckBox : FrameworkElement`
`21`	`24`	`{`
`22`	`25`	`public static readonly DependencyProperty IsCheckedProperty =`
`@@ -45,7 +48,7 @@ public class FastCheckBox : FrameworkElement`
`45`	`48`	`CallPropertyChangedWhenLoadedIntoVisualTree = WhenToCallPropertyChangedEnum.IfPropertyIsSet`
`46`	`49`	`});`
`47`	`50`
`48`		`- private object _checkboxHtmlElementRef;`
	`51`	`+ private INTERNAL_HtmlDomElementReference _checkboxHtmlElementRef;`
`49`	`52`
`50`	`53`	`private IDisposable _jsCallbackOnClick;`
`51`	`54`	`private object _labelHtmlElementRef;`
`@@ -102,7 +105,7 @@ public override object CreateDomElement(object parentRef, out object domElementW`
`102`	`105`	`// Trigger click notifications`
`103`	`106`	`OnClick(new RoutedEventArgs`
`104`	`107`	`{`
`105`		`- OriginalSource = this`
	`108`	`+ Source = this`
`106`	`109`	`});`
`107`	`110`	`}));`
`108`	`111`	`// Subscribe to the javascript click event through a simple listener`
`@@ -111,7 +114,10 @@ public override object CreateDomElement(object parentRef, out object domElementW`
`111`	`114`
`112`	`115`	`INTERNAL_HtmlDomManager.CreateDomElementAppendItAndGetStyle(`
`113`	`116`	`"input",`
`114`		`- _labelHtmlElementRef, this, out _checkboxHtmlElementRef);`
	`117`	`+ _labelHtmlElementRef, this, out object checkboxHtmlElementRef);`
	`118`	`+`
	`119`	`+ _checkboxHtmlElementRef = (INTERNAL_HtmlDomElementReference)checkboxHtmlElementRef;`
	`120`	`+`
`115`	`121`	`INTERNAL_HtmlDomManager.SetDomElementAttribute(_checkboxHtmlElementRef, "type", "checkbox");`
`116`	`122`
`117`	`123`	`INTERNAL_HtmlDomManager.CreateDomElementAppendItAndGetStyle("span", _labelHtmlElementRef, this,`
`@@ -192,21 +198,21 @@ private static void OnIsCheckedChanged(DependencyObject d, DependencyPropertyCha`
`192`	`198`	`{`
`193`	`199`	`checkbox.OnChecked(new RoutedEventArgs`
`194`	`200`	`{`
`195`		`- OriginalSource = checkbox`
	`201`	`+ Source = checkbox`
`196`	`202`	`});`
`197`	`203`	`}`
`198`	`204`	`else if (newValue == false)`
`199`	`205`	`{`
`200`	`206`	`checkbox.OnUnchecked(new RoutedEventArgs`
`201`	`207`	`{`
`202`		`- OriginalSource = checkbox`
	`208`	`+ Source = checkbox`
`203`	`209`	`});`
`204`	`210`	`}`
`205`	`211`	`else`
`206`	`212`	`{`
`207`	`213`	`checkbox.OnIndeterminate(new RoutedEventArgs`
`208`	`214`	`{`
`209`		`- OriginalSource = checkbox`
	`215`	`+ Source = checkbox`
`210`	`216`	`});`
`211`	`217`	`}`
`212`	`218`	`}`