diff --git a/.github/workflows/build-telerik-showcase.yml b/.github/workflows/build-telerik-showcase.yml
index 05c171c..b79ae22 100644
--- a/.github/workflows/build-telerik-showcase.yml
+++ b/.github/workflows/build-telerik-showcase.yml
@@ -6,14 +6,21 @@ env:
virtual-directory-release: '/telerikshowcase/release/'
app-path-release: 'opensilverdemos/telerikshowcase/release/'
deploy-service-url: 'opensilverdemos.scm.azurewebsites.net:443'
- next-release-version: '1.2.0'
on:
workflow_dispatch:
inputs:
+ opensilver-version:
+ description: 'OpenSilver version'
+ default: '3.2.0'
+ required: true
+ opensilver-controlskit-version:
+ description: 'OpenSilver.ControlsKit version'
+ default: '3.2.0'
+ required: true
telerik-version:
- description: 'Telerik version to use'
- default: '2.0.0'
+ description: 'OpenSilver.TelerikUI version'
+ default: '3.2.0'
required: true
telerik-options:
type: choice
@@ -41,7 +48,7 @@ jobs:
uses: rlespinasse/github-slug-action@v3.x
- uses: actions/setup-dotnet@v1
with:
- dotnet-version: '7.0.200'
+ dotnet-version: '9.0.102'
- name: Clone Telerik Showcase
uses: actions/checkout@v2
with:
@@ -51,31 +58,14 @@ jobs:
mv Nuget.default.Config Nuget.Config
- name: Replace text in Nuget.Config
run: |
- sed -i 's\myget_username\${{ secrets.MYGET_USERNAME }}\" />\g' Nuget.Config
- sed -i 's\myget_password\${{ secrets.MYGET_PASSWORD }}\" />\g' Nuget.Config
- - name: Get OpenSilver version
- run: |
- nuget install OpenSilver.Compatibility.TelerikUI.4.6 -source https://www.myget.org/F/opensilver-private/api/v3/index.json -source https://www.myget.org/F/opensilver-private-rc/api/v3/index.json -source https://www.myget.org/F/opensilver/api/v3/index.json -source https://api.nuget.org/v3/index.json -version ${{ github.event.inputs.telerik-version }} -output TelerikInstall
- ls TelerikInstall
- $opensilver_version = ls TelerikInstall -Filter OpenSilver.2* | % { $_.name }
- $opensilver_version = $opensilver_version.Split(".", 2)[1]
- echo $opensilver_version
- echo "opensilver_version=$opensilver_version" >> $env:GITHUB_ENV
- - name: Replace text
- run: |
- sed -zi 's\1.1.0\${{ github.event.inputs.telerik-version }}\2g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj
- # sed -i 's\OpenSilver.Compatibility.TelerikUI\OpenSilver.Compatibility.TelerikUI.4.6\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj
- sed -i 's\1.1.0\${{ env.opensilver_version }}\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.csproj
- sed -i 's\1.1.0\${{ env.opensilver_version }}\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.csproj
- - name: Restore Showcase packages
- run: |
- nuget restore OpenSilver.Samples.TelerikUI.sln
+ sed -i 's|myget_username|${{ secrets.MYGET_USERNAME }}|g' Nuget.Config
+ sed -i 's|myget_password|${{ secrets.MYGET_PASSWORD }}|g' Nuget.Config
- name: Replace text
run: |
- sed -i 's\\\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/index.html
+ sed -i 's|||g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/index.html
- name: Replace UserName
run: |
- sed -i 's\USERNAME\${{ secrets.OPENSILVERDEMOSUSERNAME }}\g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Properties/PublishProfiles/publish.pubxml
+ sed -i 's|USERNAME|${{ secrets.OPENSILVERDEMOSUSERNAME }}|g' OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Properties/PublishProfiles/publish.pubxml
- name: Build and Deploy
run: |
- msbuild OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Browser\OpenSilver.Samples.TelerikUI.Browser.csproj /p:DeployOnBuild=true /p:PublishProfile="OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Browser\Properties\PublishProfiles\publish.pubxml" /p:Password=${{ secrets.OPENSILVERDEMOSUSERPWD }} /p:DeployIisAppPath=${{ env.apath }} /p:MSDeployServiceURL=${{ env.deploy-service-url }} /p:Configuration=Release
+ msbuild OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Browser\OpenSilver.Samples.TelerikUI.Browser.csproj /p:DeployOnBuild=true /p:PublishProfile="OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Browser\Properties\PublishProfiles\publish.pubxml" /p:Password=${{ secrets.OPENSILVERDEMOSUSERPWD }} /p:DeployIisAppPath=${{ env.apath }} /p:MSDeployServiceURL=${{ env.deploy-service-url }} /p:Configuration=Release /p:OpenSilverVersion=${{ github.event.inputs.opensilver-version }} /p:TelerikVersion=${{ github.event.inputs.telerik-version }} /p:OpenSilverControlsKitVersion=${{ github.event.inputs.opensilver-controlskit-version }} -restore
diff --git a/Directory.Build.props b/Directory.Build.props
new file mode 100644
index 0000000..492070f
--- /dev/null
+++ b/Directory.Build.props
@@ -0,0 +1,7 @@
+
+
+ 3.2.0
+ 3.2.0
+ 3.2.0
+
+
\ No newline at end of file
diff --git a/OpenSilver.Samples.TelerikUI.sln b/OpenSilver.Samples.TelerikUI.sln
index a7a2b41..6b2ffd4 100644
--- a/OpenSilver.Samples.TelerikUI.sln
+++ b/OpenSilver.Samples.TelerikUI.sln
@@ -19,6 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSilver.Samples.TelerikU
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenSilver.Samples.TelerikUI.Simulator.VB", "OpenSilver.Samples.TelerikUI\OpenSilver.Samples.TelerikUI.Simulator\OpenSilver.Samples.TelerikUI.Simulator.VB.csproj", "{48250897-203A-4AAD-92FA-64972ECCCCF3}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
+ ProjectSection(SolutionItems) = preProject
+ .github\workflows\build-telerik-showcase.yml = .github\workflows\build-telerik-showcase.yml
+ Directory.Build.props = Directory.Build.props
+ Nuget.default.Config = Nuget.default.Config
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Build/CommonFiles/CustomDictionary.xml b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Build/CommonFiles/CustomDictionary.xml
deleted file mode 100644
index 7ce79d1..0000000
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Build/CommonFiles/CustomDictionary.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
- aa
- arccotangent
- behaviour
- cmyka
- Col_index_num
- d
- dbl
- dd
- datetext
- dependant
- dir
- dockable
- endperiod
- errorval
- flyout
- fv
- groupable
- headered
- headered
- hlsa
- hsva
- infos
- interopability
- Kronecker
- lowerlimit
- Macauley
- minimizable
- mmmm
- modificator
- ms
- multi
- nper
- npery
- numdigits
- offscreen
- params
- paddings
- pmt
- pr
- pt
- pv
- rad
- rgba
- shader
- shiftamount
- silverlight
- sortable
- src
- startnum
- startperiod
- StartPeriod
- Substract
- telerik
- themable
- theming
- titlecase
- unapply
- untyped
- upperlimit
- utils
- virtualizing
- withintext
- x
- xbap
- xnum
- y
- yld
- ynum
- yy
- yyyy
- zz
- Inumber
- I
- num
- Inum
- Real_num
- realnum
- I_num
- yi
- yj
- th
- Toint
- Fromint
- Touint
- To_uint
- Fromuint
- From_uint
- Column_num
- Row_num
- Area_num
- Row_index_num
- Range_lookup
- Table_array
-
-
-
\ No newline at end of file
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Documents/CommonFiles/CodeAnalysisDictionary.xml b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Documents/CommonFiles/CodeAnalysisDictionary.xml
deleted file mode 100644
index 91833f9..0000000
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Documents/CommonFiles/CodeAnalysisDictionary.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
- ASAP
- copyable
- cornsilk
- date
- defaultable
- deflater
- deletable
- DOCX
- dx
- dy
- gainsboro
- HLS
- HSL
- HSLA
- info
- infos
- inlinable
- inlineable
- inlines
- m
- metaphone
- monospace
- notifiable
- PDF
- PHP
- RAD
- RTL
- saka
- scriptlet
- scriptlets
- Sdt
- splittable
- Telerik
- TOC
- TOF
- tokenizer
- TOT
- twip
- untrackable
- utils
- x
- xap
- y
- argb
- a
- r
- g
- b
- themable
- kashida
- docx
- dct
- Theming
- en
- Xlsx
- Pkcs
- Pkcs1
- Pkcs7
- Pkcs7Detached
- ADBE
- oid
- Fips
- Xlit
-
-
-
-
-
-
-
-
-
-
-
-
-
- ID
- Cm
- Mm
-
-
-
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Interop/UnmarshalledJavaScriptExecutionHandler.cs b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Interop/UnmarshalledJavaScriptExecutionHandler.cs
deleted file mode 100644
index 3f9ae87..0000000
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Interop/UnmarshalledJavaScriptExecutionHandler.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-using DotNetForHtml5;
-using Microsoft.JSInterop;
-using Microsoft.JSInterop.WebAssembly;
-
-namespace OpenSilver.Samples.TelerikUI.Browser.Interop
-{
- public class UnmarshalledJavaScriptExecutionHandler : IWebAssemblyExecutionHandler
- {
- private const string MethodName = "callJSUnmarshalled_v2";
- private readonly WebAssemblyJSRuntime _runtime;
-
- public UnmarshalledJavaScriptExecutionHandler(IJSRuntime runtime)
- {
- _runtime = runtime as WebAssemblyJSRuntime;
- }
-
- public void ExecuteJavaScript(string javaScriptToExecute)
- {
- _runtime.InvokeUnmarshalled(MethodName, javaScriptToExecute);
- }
-
- public object ExecuteJavaScriptWithResult(string javaScriptToExecute)
- {
- return _runtime.InvokeUnmarshalled(MethodName, javaScriptToExecute);
- }
-
- public TResult InvokeUnmarshalled(string identifier, T0 arg0)
- {
- return _runtime.InvokeUnmarshalled(identifier, arg0);
- }
-
- public TResult InvokeUnmarshalled(string identifier, T0 arg0, T1 arg1)
- {
- return _runtime.InvokeUnmarshalled(identifier, arg0, arg1);
- }
-
- public TResult InvokeUnmarshalled(string identifier, T0 arg0, T1 arg1, T2 arg2)
- {
- return _runtime.InvokeUnmarshalled(identifier, arg0, arg1, arg2);
- }
- }
-}
\ No newline at end of file
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.VB.csproj b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.VB.csproj
index 376e0e4..31557cd 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.VB.csproj
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.VB.csproj
@@ -1,9 +1,9 @@
- net7.0
+ net9.0
True
- 5
+ 7
true
bin/$(Configuration)_vb
@@ -11,11 +11,11 @@
-
-
-
+
+
+
-
+
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.csproj b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.csproj
index 970dd69..2a7d652 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.csproj
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/OpenSilver.Samples.TelerikUI.Browser.csproj
@@ -1,9 +1,9 @@
- net7.0
+ net9.0
True
- 5
+ 7
true
bin/$(Configuration)_cs
@@ -11,17 +11,13 @@
-
-
-
+
+
+
-
-
-
-
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Pages/Index.cs b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Pages/Index.cs
index 46ff0f1..5aa8b91 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Pages/Index.cs
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Pages/Index.cs
@@ -1,8 +1,7 @@
-using DotNetForHtml5;
-using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components;
using Microsoft.AspNetCore.Components.Rendering;
-using Microsoft.JSInterop;
-using OpenSilver.Samples.TelerikUI.Browser.Interop;
+using System.Threading.Tasks;
+using OpenSilver.WebAssembly;
namespace OpenSilver.Samples.TelerikUI.Browser.Pages
{
@@ -13,14 +12,10 @@ protected override void BuildRenderTree(RenderTreeBuilder __builder)
{
}
- protected override void OnInitialized()
+ protected async override Task OnInitializedAsync()
{
- base.OnInitialized();
- Cshtml5Initializer.Initialize(new UnmarshalledJavaScriptExecutionHandler(JSRuntime));
- Program.RunApplication();
+ await base.OnInitializedAsync();
+ await Runner.RunApplicationAsync();
}
-
- [Inject]
- private IJSRuntime JSRuntime { get; set; }
}
}
\ No newline at end of file
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Program.cs b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Program.cs
index 07589df..efe860b 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Program.cs
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/Program.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Threading.Tasks;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using Microsoft.Extensions.DependencyInjection;
-using DotNetForHtml5;
namespace OpenSilver.Samples.TelerikUI.Browser
{
@@ -13,20 +8,9 @@ public class Program
public async static Task Main(string[] args)
{
var builder = WebAssemblyHostBuilder.CreateDefault(args);
- builder.RootComponents.Add("app");
-
- builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
-
+ builder.RootComponents.Add("#app");
var host = builder.Build();
await host.RunAsync();
}
-
- public static void RunApplication()
- {
- Application.RunApplication(() =>
- {
- var app = new OpenSilver.Samples.TelerikUI.App();
- });
- }
}
}
\ No newline at end of file
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/BlazorLoader.js b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/BlazorLoader.js
deleted file mode 100644
index 7245072..0000000
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/BlazorLoader.js
+++ /dev/null
@@ -1,28 +0,0 @@
-function onResourceLoaded(resourceIndex, totalResources)
-{
- document.getElementById("silverlight-loading-percentage").innerHTML = Math.round((resourceIndex / totalResources) * 100) + "%";
-}
-
-var i = 0;
-var allResourcesBeingLoaded = [];
-Blazor.start({ // start manually with loadBootResource
- loadBootResource: function (type, name, defaultUri, integrity) {
- if (type == "dotnetjs")
- return defaultUri;
-
- var fetchResources = fetch(defaultUri, {
- cache: 'no-cache',
- integrity: integrity,
- headers: { 'MyCustomHeader': 'My custom value' }
- });
-
-
- allResourcesBeingLoaded.push(fetchResources);
- fetchResources.then((r) => {
- i++;
- var total = allResourcesBeingLoaded.length;
- onResourceLoaded(i, total);
- });
- return fetchResources;
- }
-});
\ No newline at end of file
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/Build/CommonFiles/CustomDictionary.xml b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/Build/CommonFiles/CustomDictionary.xml
deleted file mode 100644
index 7ce79d1..0000000
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/Build/CommonFiles/CustomDictionary.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
- aa
- arccotangent
- behaviour
- cmyka
- Col_index_num
- d
- dbl
- dd
- datetext
- dependant
- dir
- dockable
- endperiod
- errorval
- flyout
- fv
- groupable
- headered
- headered
- hlsa
- hsva
- infos
- interopability
- Kronecker
- lowerlimit
- Macauley
- minimizable
- mmmm
- modificator
- ms
- multi
- nper
- npery
- numdigits
- offscreen
- params
- paddings
- pmt
- pr
- pt
- pv
- rad
- rgba
- shader
- shiftamount
- silverlight
- sortable
- src
- startnum
- startperiod
- StartPeriod
- Substract
- telerik
- themable
- theming
- titlecase
- unapply
- untyped
- upperlimit
- utils
- virtualizing
- withintext
- x
- xbap
- xnum
- y
- yld
- ynum
- yy
- yyyy
- zz
- Inumber
- I
- num
- Inum
- Real_num
- realnum
- I_num
- yi
- yj
- th
- Toint
- Fromint
- Touint
- To_uint
- Fromuint
- From_uint
- Column_num
- Row_num
- Area_num
- Row_index_num
- Range_lookup
- Table_array
-
-
-
\ No newline at end of file
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/CommonFiles/CodeAnalysisDictionary.xml b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/CommonFiles/CodeAnalysisDictionary.xml
deleted file mode 100644
index 91833f9..0000000
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/CommonFiles/CodeAnalysisDictionary.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
- ASAP
- copyable
- cornsilk
- date
- defaultable
- deflater
- deletable
- DOCX
- dx
- dy
- gainsboro
- HLS
- HSL
- HSLA
- info
- infos
- inlinable
- inlineable
- inlines
- m
- metaphone
- monospace
- notifiable
- PDF
- PHP
- RAD
- RTL
- saka
- scriptlet
- scriptlets
- Sdt
- splittable
- Telerik
- TOC
- TOF
- tokenizer
- TOT
- twip
- untrackable
- utils
- x
- xap
- y
- argb
- a
- r
- g
- b
- themable
- kashida
- docx
- dct
- Theming
- en
- Xlsx
- Pkcs
- Pkcs1
- Pkcs7
- Pkcs7Detached
- ADBE
- oid
- Fips
- Xlit
-
-
-
-
-
-
-
-
-
-
-
-
-
- ID
- Cm
- Mm
-
-
-
diff --git a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/index.html b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/index.html
index 30d9a05..4bb69e0 100644
--- a/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/index.html
+++ b/OpenSilver.Samples.TelerikUI/OpenSilver.Samples.TelerikUI.Browser/wwwroot/index.html
@@ -4,37 +4,53 @@
Demo of Telerik UI compiled with OpenSilver
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
+
+