Skip to content

Commit

Permalink
Merge pull request #588 from IgniteUI/vnext
Browse files Browse the repository at this point in the history
MASS MERGE Latest Changes to Production - 2024 JAN
  • Loading branch information
HUSSAR-mtrela authored Jan 25, 2024
2 parents 05d8858 + b4c9046 commit 5d67f00
Show file tree
Hide file tree
Showing 1,525 changed files with 62,173 additions and 4,216 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,14 @@ To set up this project locally, clone this repository:
git clone https://github.com/IgniteUI/igniteui-blazor-examples.git
```

> **_NOTE:_** You should use [master](https://github.com/IgniteUI/igniteui-blazor-examples/tree/master) branch of this repository if you want to run samples on your computer. Use the [vnext](https://github.com/IgniteUI/igniteui-blazor-examples/tree/vnext) branch only when you want to contribute new samples to this repository.
## Running Individual Sample

Note, as of 2022, this repo is targeting .NET 6.0 and Visual Studio 2022. VS 2019 does not support .NET 6.0.

- check out the **master** branch

- in VS 2022, open a solution file from the [./samples](./samples) folder, e.g.

[./samples/charts/category-chart/overview/BlazorClientApp.csproj](./samples/charts/category-chart/overview/BlazorClientApp.csproj)
Expand All @@ -75,6 +79,8 @@ At this point, you should see a website with a single example of [Ignite UI for

## Running All Samples

- check out the **master** branch

- open VS Code as Administrator

- open the [./browser/IgBlazorSamples.Gulp](./browser/IgBlazorSamples.Gulp) folder
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines/build-pipeline-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ stages:

- template: templates/build-steps-template.yml
parameters:
igVersion: '23.2.96'
igVersion: '23.2.120'
igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
projectToBuild: Client
isVerbose: ${{ parameters.isVerbose }}
2 changes: 1 addition & 1 deletion azure-pipelines/build-pipeline-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ stages:

- template: templates/build-steps-template.yml
parameters:
igVersion: '23.2.96'
igVersion: '23.2.120'
igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
projectToBuild: Server
isVerbose: ${{ parameters.isVerbose }}
4 changes: 2 additions & 2 deletions browser/IgBlazorSamples.Client/App.razor
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
else
SB.AppBaseUri = "/samples";

Console.WriteLine("SB App Base " + SB.AppBaseUri);
Console.WriteLine("SB.APP Base " + SB.AppBaseUri);
SB.HomeTitle = "Home"; // "Blazor Samples running on Client-Side";
var igType = typeof(IgniteUIBlazor);
var igAssembly = igType.Assembly;
var igVersion = igAssembly.GetName().Version;
if (igVersion != null)
SB.IgVersion = igVersion.Major + "." + igVersion.Minor + "." + igVersion.Build;
Console.WriteLine("SB App uses IG version: " + SB.IgVersion);
Console.WriteLine("SB.APP uses IG version: " + SB.IgVersion);

await Task.Delay(1);
}
Expand Down
22 changes: 11 additions & 11 deletions browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<!-- note copied Nullable/ImplicitUsings from a new Blazor project that targets .NET 6 -->
<Nullable>enable</Nullable>
Expand All @@ -15,12 +15,12 @@
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702,IDE0028,BL0005,0219,CS1998,0219l,RSG002,CS8618,CS8612,CS8625,CS8601,CS8602,CS0219,CS8600,CS8622,CS8603,CS8604,CS8605</NoWarn>
<NoWarn>1701;1702;NU1803,IDE0028,BL0005,0219,CS1998,0219l,RSG002,CS8618,CS8612,CS8625,CS8601,CS8602,CS0219,CS8600,CS8622,CS8603,CS8604,CS8605</NoWarn>
<OutputPath>output</OutputPath>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<NoWarn>1701;1702,IDE0028,BL0005,0219,CS1998,0219l,RSG002,CS8618,CS8612,CS8625,CS8601,CS8602,CS0219,CS8600,CS8622,CS8603,CS8604,CS8605</NoWarn>
<NoWarn>1701;1702;NU1803,IDE0028,BL0005,0219,CS1998,0219l,RSG002,CS8618,CS8612,CS8625,CS8601,CS8602,CS0219,CS8600,CS8622,CS8603,CS8604,CS8605</NoWarn>
</PropertyGroup>

<Target Name="DebugEnsureNodeEnv" BeforeTargets="Build" Condition=" '$(Configuration)' == 'Debug' And !Exists('$(NpmRoot)node_modules') ">
Expand All @@ -38,16 +38,16 @@
<!-- End NPM Updates -->

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="23.2.97" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="23.2.97" />
<PackageReference Include="IgniteUI.Blazor" Version="23.2.97" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="23.2.120" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="23.2.120" />
<PackageReference Include="IgniteUI.Blazor" Version="23.2.120" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Cors" Version="2.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion browser/IgBlazorSamples.Client/ReadMe.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ from `./samples/` folder to `./browser/IgBlazorSamples.Client/`

- output files will be located in:

`./browser/browser/IgBlazorSamples.Client/bin/Release/net6.0/publish/wwwroot`
`./browser/browser/IgBlazorSamples.Client/bin/Release/net8.0/publish/wwwroot`
6 changes: 6 additions & 0 deletions browser/IgBlazorSamples.Client/global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"sdk": {
"version": "8.0.0",
"rollForward": "latestMinor"
}
}
11 changes: 9 additions & 2 deletions browser/IgBlazorSamples.Client/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<script>
var path = window.location.pathname.split('/');
var base = document.getElementsByTagName('base')[0];
console.log('index origin ' + window.location.origin);
console.log('index path ' + window.location.pathname);
//console.log('index origin ' + window.location.origin);
//console.log('index path ' + window.location.pathname);
// if (window.location.host.includes('localhost')) {
// base.setAttribute('href', '/');
// } else if (path.length > 2) {
Expand Down Expand Up @@ -78,6 +78,7 @@
<script src="sb/data-chart-type-scatter-polyline-series.js"></script>
<script src="sb/financial-chart-indicator-customization.js"></script>
<script src="sb/financial-chart-performance.js"></script>
<script src="sb/toolbar-download-data-chart-as-image.js"></script>
<script src="sb/excel-library-operations-on-workbooks.js"></script>
<script src="sb/excel-library-operations-on-worksheets.js"></script>
<script src="sb/excel-library-overview.js"></script>
Expand Down Expand Up @@ -130,6 +131,7 @@
<script src="sb/grid-multi-column-headers-template.js"></script>
<script src="sb/grid-multi-row-dragging.js"></script>
<script src="sb/grid-overview.js"></script>
<script src="sb/grid-paste.js"></script>
<script src="sb/grid-row-drag-base.js"></script>
<script src="sb/grid-row-drag-to-grid.js"></script>
<script src="sb/grid-row-paging-basic.js"></script>
Expand All @@ -151,6 +153,7 @@
<script src="sb/tree-grid-column-pinning-options.js"></script>
<script src="sb/tree-grid-column-pinning-styles.js"></script>
<script src="sb/tree-grid-conditional-cell-style-1.js"></script>
<script src="sb/tree-grid-conditional-row-selectors.js"></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>
Expand All @@ -161,6 +164,10 @@
<script src="sb/tree-grid-keyboard-custom-navigation.js"></script>
<script src="sb/tree-grid-multi-column-headers-export.js"></script>
<script src="sb/tree-grid-multi-column-headers-template.js"></script>
<script src="sb/tree-grid-row-pinning-extra-column.js"></script>
<script src="sb/tree-grid-row-pinning-options.js"></script>
<script src="sb/tree-grid-row-pinning-style.js"></script>
<script src="sb/tree-grid-row-selection-template-excel.js"></script>
<script src="sb/tree-grid-row-selection-template-numbers.js"></script>
<script src="sb/tree-grid-row-styles.js"></script>
<script src="sb/combo-templates.js"></script>
Expand Down
16 changes: 12 additions & 4 deletions browser/IgBlazorSamples.Core/IgBlazorSamples.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
<AssemblyName>Infragistics.Samples.Core</AssemblyName>
<RootNamespace>Infragistics.Samples.Core</RootNamespace>
<Version>4.0.0</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;NU1803</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<NoWarn>1701;1702;NU1803</NoWarn>
</PropertyGroup>

<ItemGroup>
<Content Remove="Navigation\MainLayout.razor" />
<Content Remove="Navigation\NavMenu.razor" />
Expand All @@ -21,9 +29,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
</ItemGroup>

</Project>
11 changes: 8 additions & 3 deletions browser/IgBlazorSamples.Core/Navigation/BrowserLayout.razor
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,18 @@ protected override async Task OnInitializedAsync()
@* await SB.CheckUIAsync(NavManager.Uri);
StateHasChanged(); *@
await Task.Delay(1);
await JSRuntime.InvokeVoidAsync("attachPreventScroll");
if (!NavManager.Uri.Contains("/blazor-server"))
{
await JSRuntime.InvokeVoidAsync("attachPreventScroll");
}
}

public async ValueTask DisposeAsync()
{
await JSRuntime.InvokeVoidAsync("removePreventScroll");

if (!NavManager.Uri.Contains("/blazor-server"))
{
await JSRuntime.InvokeVoidAsync("removePreventScroll");
}
}

protected bool IsSampleWithNavigation() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<div style="font-size: 0.75rem; text-align: center;">
<span>
Meanwhile, you can explore all Web Component samples on this
Meanwhile, you can explore all Blazor samples on this
<a href="https://infragistics.com/blazor-client/" target="_blank">website</a>
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion browser/IgBlazorSamples.Core/Services/SamplesBrowser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public SampleBrowser(NavigationManager navManager, IJSRuntime jsRuntime, HttpCli
this.JSRuntime = jsRuntime;

// Console.WriteLine("SB Const()");
Console.WriteLine("SB URL: " + navManager.Uri);
Console.WriteLine("SB.APP URL: " + navManager.Uri);
// NavManager = NavigationManager();
// NavManager.LocationChanged += this.OnLocationChanged;
// NavManager.LocationChanged += new EventHandler<LocationChangedEventArgs>(this.OnLocationChanged);
Expand Down
16 changes: 8 additions & 8 deletions browser/IgBlazorSamples.Gulp/tasks/gulp-samples.js
Original file line number Diff line number Diff line change
Expand Up @@ -590,17 +590,17 @@ function updateIG(cb) {

let packageUpgrades = [
// update version of IG packages and change to Trial or non-trial
{ name: "IgniteUI.Blazor", version: "23.2.97" },
{ name: "IgniteUI.Blazor.Documents.Core", version: "23.2.97" },
{ name: "IgniteUI.Blazor.Documents.Excel", version: "23.2.97" },
{ name: "IgniteUI.Blazor", version: "23.2.120" },
{ name: "IgniteUI.Blazor.Documents.Core", version: "23.2.120" },
{ name: "IgniteUI.Blazor.Documents.Excel", version: "23.2.120" },
// these IG packages are sometimes updated:
{ name: "Microsoft.AspNetCore.Components", version: "6.0.25" },
{ name: "Microsoft.AspNetCore.Components.Web", version: "6.0.25" },
{ name: "Microsoft.AspNetCore.Components.WebAssembly", version: "6.0.25" },
{ name: "Microsoft.AspNetCore.Components.WebAssembly.DevServer", version: "6.0.25" }, // suffix: 'PrivateAssets="all" ' },
{ name: "Microsoft.AspNetCore.Components", version: "8.0.0" },
{ name: "Microsoft.AspNetCore.Components.Web", version: "8.0.0" },
{ name: "Microsoft.AspNetCore.Components.WebAssembly", version: "8.0.0" },
{ name: "Microsoft.AspNetCore.Components.WebAssembly.DevServer", version: "8.0.0" }, // suffix: 'PrivateAssets="all" ' },
{ name: "Microsoft.AspNetCore.Cors", version: "2.2.0" },
{ name: "Microsoft.AspNetCore.Http.Abstractions", version: "2.2.0" },
{ name: "System.Net.Http.Json", version:"6.0.0" },
{ name: "System.Net.Http.Json", version:"8.0.0" },
];

// creating package mapping for quick lookup
Expand Down
6 changes: 3 additions & 3 deletions browser/IgBlazorSamples.Gulp/tasks/gulp-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ function testProjectFiles(cb) {
var requiredStrings = [
'<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">',
'<NoWarn>1701;1702,IDE0028,BL0005,0219,CS1998</NoWarn>',
'<TargetFramework>net6.0</TargetFramework>',
'<TargetFramework>net8.0</TargetFramework>',
'<RazorLangVersion>3.0</RazorLangVersion>',
'<PackageReference Include="IgniteUI.Blazor.Trial" Version',
'<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />',
'<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" />',
'<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />',
'<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />',
'</Project>',
];
gulp.src([
Expand Down
14 changes: 7 additions & 7 deletions browser/IgBlazorSamples.Server/IgBlazorSamples.Server.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<AssemblyName>Infragistics.Samples</AssemblyName>
<RootNamespace>Infragistics.Samples</RootNamespace>
<Version>4.0.0</Version>
Expand All @@ -28,13 +28,13 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="23.2.97" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="23.2.97" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="23.2.97" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
<PackageReference Include="IgniteUI.Blazor" Version="23.2.120" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="23.2.120" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="23.2.120" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
16 changes: 12 additions & 4 deletions browser/IgBlazorSamples.Shared/IgBlazorSamples.Shared.csproj
Original file line number Diff line number Diff line change
@@ -1,17 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
<AssemblyName>Infragistics.Samples.Shared</AssemblyName>
<RootNamespace>Infragistics.Samples.Shared</RootNamespace>
<Version>4.0.0</Version>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<NoWarn>1701;1702;NU1803;BL0007</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<NoWarn>1701;1702;NU1803;BL0007</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
</ItemGroup>


Expand Down
6 changes: 6 additions & 0 deletions browser/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,14 @@ This browser application will allows you to browse all samples of the [IgniteUI
- and many more


## Branches

> **_NOTE:_** You should use [master](https://github.com/IgniteUI/igniteui-blazor-examples/tree/master) branch of this repository if you want to run samples on your computer. Use the [vnext](https://github.com/IgniteUI/igniteui-blazor-examples/tree/vnext) branch only when you want to contribute new samples to this repository.
# Instructions

- check out the **master** branch

- open VS Code as Administrator

- open the [./browser/IgBlazorSamples.Gulp](./browser/IgBlazorSamples.Gulp) folder
Expand Down
6 changes: 6 additions & 0 deletions samples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,10 @@ In this folder, you will find stand-alone **samples** on how to use the [IgniteU
- [Excel Library](https://infragistics.com/blazorsite/components/excel_library_using_workbooks.html)
- and many more

## Branches

> **_NOTE:_** You should use [master](https://github.com/IgniteUI/igniteui-blazor-examples/tree/master) branch of this repository if you want to run samples on your computer. Use the [vnext](https://github.com/IgniteUI/igniteui-blazor-examples/tree/vnext) branch only when you want to contribute new samples to this repository.
## Instructions

Navigate to sub-folders to get more information about each sample. Also, you can run each sample on Code Sandbox website by clicking on the **Edit on CodeSandbox** button in a readme file of sample project, .e.g. [./samples/charts/category-chart/overview/README.md](./samples/charts/category-chart/overview/README.md)
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
<AssemblyName>Infragistics.Samples</AssemblyName>
<RootNamespace>Infragistics.Samples</RootNamespace>
Expand All @@ -12,10 +12,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="23.2.97" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
<PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
<PackageReference Include="IgniteUI.Blazor" Version="23.2.120" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
</ItemGroup>

</Project>
Loading

0 comments on commit 5d67f00

Please sign in to comment.