RELEASE - 25.2 push to production

azure-pipelines/build-pipeline-client.yml

@@ -38,7 +38,7 @@ stages:
 
       - template: templates/build-steps-template.yml
         parameters:
-          igVersion: '25.1.82'
+          igVersion: '25.2.32'
           igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
           projectToBuild: Client
           isVerbose: ${{ parameters.isVerbose }}

azure-pipelines/build-pipeline-server.yml

@@ -37,7 +37,7 @@ stages:
 
       - template: templates/build-steps-template.yml
         parameters:
-          igVersion: '25.1.82'
+          igVersion: '25.2.32'
           igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
           projectToBuild: Server
           isVerbose: ${{ parameters.isVerbose }}

azure-pipelines/templates/build-steps-template.yml

@@ -95,7 +95,7 @@ steps:
       script: |
         $xml = [XML](Get-Content '.\IgBlazorSamples.${{ parameters.projectToBuild }}.csproj');
 
-        $nodes = $xml.SelectNodes("//PackageReference[starts-with(@Include,'IgniteUI')]") | 
+        $nodes = $xml.SelectNodes("//PackageReference[starts-with(@Include,'IgniteUI') and not(substring(@Include, string-length(@Include) - 3) = 'Lite')]") | 
           ForEach-Object { 
               $_.SetAttribute("Include",$_.Include.Replace(".Trial",""));
               $_.SetAttribute("Version", "${{ parameters.igVersion }}");

browser/IgBlazorSamples.Client/App.razor

@@ -19,7 +19,6 @@
     <NotFound>
         <LayoutView Layout="@typeof(BrowserLayout)">
             <SampleNotFound></SampleNotFound>
-            @*<p class="no-selection">Sorry, there's nothing at this address.</p>*@
         </LayoutView>
     </NotFound>
 </CustomRouter>
@@ -35,6 +34,7 @@
         else
             SB.AppBaseUri = "/samples";
 
+        Console.WriteLine("SB.APP URI  " + NavManager.Uri);
         Console.WriteLine("SB.APP Base " + SB.AppBaseUri);
         SB.HomeTitle = "Home"; // "Blazor Samples running on Client-Side";
 
@@ -45,47 +45,64 @@
             SB.IgVersion = igVersion.Major + "." + igVersion.Minor + "." + igVersion.Build;
         Console.WriteLine("SB.APP uses IG version: " + SB.IgVersion);
 
+        await LazyLoadAssemblies(NavManager.Uri, true);
+
         await Task.Delay(1);
     }
 
     private List<Assembly> LazyLoadedAssemblies = new List<Assembly>();
 
-    private async Task OnNavigateChangedAsync(string path)
+    private async Task OnNavigateChangedAsync(string navigationPath)
     { 
-        await LazyLoadAssemblies(path);
+        await LazyLoadAssemblies(navigationPath, true);
     }
 
-    // private async Task OnNavigateContextAsync(NavigationContext arg)
-    // {
-    //     await LazyLoadAssemblies(arg.Path);
-    // }
+    private bool LazyLoadingCompleted = false;
 
-    private async Task LazyLoadAssemblies(string navigationPath)
+    private async Task LazyLoadAssemblies(string navigationPath, bool needsUpdate)
     { 
+
+        if (LazyLoadingCompleted)
+        {
+            Console.WriteLine("SB.APP LazyLoad Excel assemblies... skipped");
+            return;
+        }
+
         try
         {
             // lazy load Excel assemblies
             if (navigationPath.Contains("/excel/"))
             {
-                Router.IsLazyLoading = true;
-
-                Console.WriteLine("SB.APP lazy loading IgniteUI.Blazor.Documents.Excel...");
+                if (Router != null) Router.IsLazyLoading = true;
 
+                Console.WriteLine("SB.APP LazyLoad Excel assemblies... ");
                 var list = new List<string> {
                     "IgniteUI.Blazor.Documents.Core.wasm",
                     "IgniteUI.Blazor.Documents.Excel.wasm"
                 };
                 var assemblies = await AssemblyLoader.LoadAssembliesAsync(list);
+                Console.WriteLine("SB.APP LazyLoad Excel assemblies... done:");
+                foreach (var asmb in assemblies)
+                {
+                    var info = asmb.GetName();
+                    Console.WriteLine("- " + info.Name + " v" + info.Version);
+                }
 
                 LazyLoadedAssemblies.AddRange(assemblies);
-
+                LazyLoadingCompleted = true;
+
+                if (Router != null) Router.IsLazyLoaded = true;
+                if (Router != null) Router.IsLazyLoading = false;
+                if (Router != null) Router.NeedsUpdate = needsUpdate;
+            }
+            else
+            {
+                Console.WriteLine("SB.APP LazyLoad Excel assemblies... postponed");
             }
-            Router.IsLazyLoading = false;
-            Router.NeedsUpdate = true;
         }
         catch (Exception ex)
         {
-            Console.WriteLine("SB.APP failed on lazy loading:\n" + ex.Message);
+            Console.WriteLine("SB.APP LazyLoad Excel assemblies... failed:\n" + ex.Message);
         }
     }
 }

browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj

@@ -48,9 +48,10 @@
     <!-- End NPM Updates -->
 
   <ItemGroup>
-    <PackageReference Include="IgniteUI.Blazor" Version="25.1.82" />
-    <PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="25.1.82" />
-    <PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="25.1.82" />
+    <PackageReference Include="IgniteUI.Blazor.Trial" Version="25.2.32" />
+    <PackageReference Include="IgniteUI.Blazor.Documents.Core.Trial" Version="25.2.32" />
+    <PackageReference Include="IgniteUI.Blazor.Documents.Excel.Trial" Version="25.2.32" />
+    <PackageReference Include="IgniteUI.Blazor.GridLite" Version="1.0.7" />
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />

browser/IgBlazorSamples.Client/wwwroot/index.html

@@ -78,6 +78,7 @@
 <script src="sb/data-chart-tooltip-template.js"></script>
 <script src="sb/data-chart-type-scatter-polygon-series.js"></script>
 <script src="sb/data-chart-type-scatter-polyline-series.js"></script>
+<script src="sb/data-chart-user-annotation-layer.js"></script>
 <script src="sb/doughnut-chart-explosion.js"></script>
 <script src="sb/financial-chart-indicator-customization.js"></script>
 <script src="sb/financial-chart-performance.js"></script>
@@ -103,6 +104,7 @@
 <script src="sb/grid-binding-nested-data-1.js"></script>
 <script src="sb/grid-cascading-combo.js"></script>
 <script src="sb/grid-cell-editing-sample.js"></script>
+<script src="sb/grid-cell-merge.js"></script>
 <script src="sb/grid-clipboard-operations.js"></script>
 <script src="sb/grid-column-moving-options.js"></script>
 <script src="sb/grid-column-moving-styles.js"></script>
@@ -116,11 +118,11 @@
 <script src="sb/grid-data-paste-options.js"></script>
 <script src="sb/grid-data-performance-virtualization.js"></script>
 <script src="sb/grid-data-summary-formatter.js"></script>
-<script type="module" src="sb/grid-data-summary-options.js"></script>
+<script src="sb/grid-data-summary-options.js" type="module"></script>
 <script src="sb/grid-data-summary-template.js"></script>
 <script src="sb/grid-data-validator-service.js"></script>
 <script src="sb/grid-data-validator-service-extended.js"></script>
-<script type="module" src="sb/grid-disabled-summaries.js"></script>
+<script src="sb/grid-disabled-summaries.js" type="module"></script>
 <script src="sb/grid-editing-columns.js"></script>
 <script src="sb/grid-editing-events.js"></script>
 <script src="sb/grid-editing-excel-style.js"></script>
@@ -161,6 +163,7 @@
 <script src="sb/grid-toolbar-sample-3.js"></script>
 <script src="sb/grid-toolbar-sample-4.js"></script>
 <script src="sb/hierarchical-grid-cell-editing-sample.js"></script>
+<script src="sb/hierarchical-grid-cell-merge.js"></script>
 <script src="sb/hierarchical-grid-cell-selection-mode.js"></script>
 <script src="sb/hierarchical-grid-column-moving-options.js"></script>
 <script src="sb/hierarchical-grid-column-moving-styles.js"></script>
@@ -172,7 +175,7 @@
 <script src="sb/hierarchical-grid-data-performance-virtualization.js"></script>
 <script src="sb/hierarchical-grid-data-summary-formatter.js"></script>
 <script src="sb/hierarchical-grid-data-summary-template.js"></script>
-<script type="module" src="sb/hierarchical-grid-disabled-summaries.js"></script>
+<script src="sb/hierarchical-grid-disabled-summaries.js" type="module"></script>
 <script src="sb/hierarchical-grid-editing-events.js"></script>
 <script src="sb/hierarchical-grid-editing-lifecycle.js"></script>
 <script src="sb/hierarchical-grid-excel-style-filtering-sample-3.js"></script>
@@ -193,6 +196,7 @@
 <script src="sb/pivot-grid-features.js"></script>
 <script src="sb/pivot-grid-state-persistence-main.js"></script>
 <script src="sb/tree-grid-cell-editing-sample.js"></script>
+<script src="sb/tree-grid-cell-merge.js"></script>
 <script src="sb/tree-grid-clipboard-operations.js"></script>
 <script src="sb/tree-grid-column-moving-options.js"></script>
 <script src="sb/tree-grid-column-moving-styles.js"></script>
@@ -206,7 +210,7 @@
 <script src="sb/tree-grid-data-summary-options.js"></script>
 <script src="sb/tree-grid-data-summary-options-styling.js"></script>
 <script src="sb/tree-grid-data-summary-template.js"></script>
-<script type="module" src="sb/tree-grid-disabled-summaries.js"></script>
+<script src="sb/tree-grid-disabled-summaries.js" type="module"></script>
 <script src="sb/tree-grid-editing-events.js"></script>
 <script src="sb/tree-grid-editing-lifecycle.js"></script>
 <script src="sb/tree-grid-excel-style-filtering-sample-1.js"></script>

browser/IgBlazorSamples.Core/IgBlazorSamples.Core.csproj

@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;NU1803</NoWarn>
+    <NoWarn>1701;1702;NU1803;BL0007</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <NoWarn>1701;1702;NU1803</NoWarn>
+    <NoWarn>1701;1702;NU1803;BL0007</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

browser/IgBlazorSamples.Core/Navigation/BrowserLayout.razor

@@ -54,13 +54,14 @@
 </div>
 
 @code {
+
+// gets whether SB is embeded in docs (no navigation menu)
 protected bool IsSampleEmbedded = false;
+
 protected static bool ToolbarCollapsed = false;
-//protected string ToolbarStyle => ToolbarCollapsed || SB.IsEmbedded ? "display: none" : "display: flex";
 protected string ToolbarStyle => ToolbarCollapsed || IsSampleEmbedded ? "display: none" : "display: flex";
 
 protected static bool SidebarCollapsed = false;
-//protected string SidebarStyle => SidebarCollapsed || SB.IsEmbedded ? "display: none" : "display: flex";
 protected string SidebarStyle => SidebarCollapsed || IsSampleEmbedded ? "display: none" : "display: flex";
 protected string SidebarWidth = "16rem";
 
@@ -96,27 +97,11 @@ public async ValueTask DisposeAsync()
     }
 }
 
-protected bool IsSampleWithNavigation() {
-    if (NavManager.Uri.Contains("/samples")) return true;
-    if (NavManager.Uri.EndsWith("/")) return true;
-    if (NavManager.Uri.EndsWith("/blazor-client")) return true;
-    if (NavManager.Uri.EndsWith("/blazor-client/")) return true;
-    if (NavManager.Uri.EndsWith("/blazor-server")) return true;
-    if (NavManager.Uri.EndsWith("/blazor-server/")) return true;
-    //if (NavManager.Uri.Contains("localhost")) return true; //&&
-    //if (NavManager.Uri + "/" == this.NavManager.BaseUri)  return true;
-
-    return false;
-
-    // return !NavManager.Uri.Contains("/samples") && NavManager.Uri != this.NavManager.BaseUri + "/";
-}
-
 protected override void OnInitialized()
 {
-    //Console.WriteLine("SB.NAV OnInit " + NavManager.BaseUri);
     //Console.WriteLine("SB.NAV OnInit " + NavManager.Uri);
 
-    this.IsSampleEmbedded = !IsSampleWithNavigation(); // NavManager.Uri.Contains("/samples") && NavManager.Uri != this.NavManager.BaseUri + "/";
+    this.IsSampleEmbedded = !SB.IsWithNavigation(); // NavManager.Uri.Contains("/samples") && NavManager.Uri != this.NavManager.BaseUri + "/";
 
     //Console.WriteLine("SB.NAV IsSampleEmbedded " + IsSampleEmbedded);
 
@@ -128,10 +113,9 @@ protected override void OnInitialized()
 
 public void OnSamplesLoaded(object sender, EventArgs arg)
 {
-    // Console.WriteLine("SB.NAV Loaded Base " + NavManager.BaseUri);
     // Console.WriteLine("SB.NAV Loaded " + NavManager.Uri);
 
-    this.IsSampleEmbedded = !IsSampleWithNavigation(); // !NavManager.Uri.Contains("/samples") && NavManager.Uri != this.NavManager.BaseUri;
+    this.IsSampleEmbedded = !SB.IsWithNavigation(); // !NavManager.Uri.Contains("/samples") && NavManager.Uri != this.NavManager.BaseUri;
 
     //Console.WriteLine("SB.NAV IsSampleEmbedded " + IsSampleEmbedded);
 
@@ -141,10 +125,9 @@ public void OnSamplesLoaded(object sender, EventArgs arg)
 
 public async void OnLocationChanged(object sender, LocationChangedEventArgs arg)
 {
-    //Console.WriteLine("SB.NAV Changed Base " + NavManager.BaseUri);
     // Console.WriteLine("SB.NAV " + NavManager.Uri.Replace(NavManager.BaseUri, ""));
 
-    this.IsSampleEmbedded = !IsSampleWithNavigation(); // !NavManager.Uri.Contains("/samples") && NavManager.Uri != this.NavManager.BaseUri;
+    this.IsSampleEmbedded = !SB.IsWithNavigation(); // !NavManager.Uri.Contains("/samples") && NavManager.Uri != this.NavManager.BaseUri;
 
     //Console.WriteLine("SB.NAV IsSampleEmbedded " + IsSampleEmbedded);
 

browser/IgBlazorSamples.Core/Navigation/BrowserMenu.razor

@@ -68,38 +68,13 @@
 
     protected override async Task OnInitializedAsync()
     {
-        //Console.WriteLine("SB.NAV Menu");
-        //Console.WriteLine("SB.NAV Menu " + NavManager.BaseUri);
-        //var toc = await Http.GetAsync<TOC>("toc.json");
-        //var client = new HttpClient();
-        //var response = await client.GetAsync("toc.json");
-        //// response.EnsureSuccessStatusCode();
-        //TOC toc = null;
-        //if (response != null)
-        //{
-        //    var jsonString = await response.Content.ReadAsStringAsync();
-        //    //toc = JsonConvert.DeserializeObject<TOC>(jsonString);
-        //}
-        try
-        {
-            var toc = await Http.GetFromJsonAsync<TOC>("toc.json");
-            await SB.Load(toc);
-            //Console.WriteLine("SB.NAV toc");
-            //System.Diagnostics.Debug.WriteLine("SB.NAV toc.json found: " + toc.Groups.Length + " groups");
-        }
-        catch (Exception ex)
-        {
-            Console.WriteLine("SB.NAV toc.json - error: \n" + ex.ToString());
-        }
-
-        // Console.WriteLine("SB.NAV loaded");
-
         SB.SamplesLoaded += OnSamplesLoaded;
         await Task.Delay(1);
     }
 
     public void OnSamplesLoaded(object sender, EventArgs arg)
     {
+        Console.WriteLine("SB.App populaiting NAV menu... done");
         StateHasChanged();
     }