Skip to content

Commit

Permalink
Merge pull request #764 from IgniteUI/vnext
Browse files Browse the repository at this point in the history
RELEASE - Update latest samples to production
  • Loading branch information
ChronosSF authored Sep 10, 2024
2 parents 47e072a + fa857f3 commit b82e8df
Show file tree
Hide file tree
Showing 1,597 changed files with 51,434 additions and 24,670 deletions.
11 changes: 6 additions & 5 deletions azure-pipelines/build-pipeline-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ parameters:
displayName: 'Get verbose output from steps - where configurable'
type: boolean
default: false
# - name: shouldCleanPostExectuion
# displayName: 'Clean all pipeline dirs after the pipeline finishes?'
# type: boolean
# default: true
- name: shouldCleanPostExectuion
displayName: 'Clean all pipeline dirs after the pipeline finishes?'
type: boolean
default: true

name: $(BuildDefinitionName)_$(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)

Expand All @@ -38,7 +38,8 @@ stages:

- template: templates/build-steps-template.yml
parameters:
igVersion: '23.2.204'
igVersion: '24.1.41'
igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
projectToBuild: Client
isVerbose: ${{ parameters.isVerbose }}
shouldCleanPostExectuion: ${{ parameters.shouldCleanPostExectuion }}
11 changes: 6 additions & 5 deletions azure-pipelines/build-pipeline-server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ parameters:
displayName: 'Get verbose output from steps - where configurable'
type: boolean
default: false
# - name: shouldCleanPostExectuion
# displayName: 'Clean all pipeline dirs after the pipeline finishes?'
# type: boolean
# default: true
- name: shouldCleanPostExectuion
displayName: 'Clean all pipeline dirs after the pipeline finishes?'
type: boolean
default: true

name: $(BuildDefinitionName)_$(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)

Expand All @@ -37,7 +37,8 @@ stages:

- template: templates/build-steps-template.yml
parameters:
igVersion: '23.2.204'
igVersion: '24.1.41'
igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
projectToBuild: Server
isVerbose: ${{ parameters.isVerbose }}
shouldCleanPostExectuion: ${{ parameters.shouldCleanPostExectuion }}
49 changes: 27 additions & 22 deletions azure-pipelines/templates/build-steps-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
- name: projectToBuild
- name: isVerbose
default: false
- name: shouldCleanPostExectuion

steps:
- task: NodeTool@0
Expand All @@ -19,7 +20,6 @@ steps:
workingDir: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.Gulp'
verbose: ${{ parameters.isVerbose }}
customCommand: ci


- task: CmdLine@2
displayName: 'npx gulp copySamplesTo${{ parameters.projectToBuild }}'
Expand All @@ -32,19 +32,29 @@ steps:
displayName: 'Install dotnet if not already present'
inputs:
packageType: 'sdk'
version: '6.0.415' #'6.x'
performMultiLevelLookup: true
version: '8.0.100' # we are currently building a 8.0 app. TODO: Try upgrading to 8.x in the future
performMultiLevelLookup: false


- task: PowerShell@2
displayName: 'Generate NuGet.config for IG ProGet NuGet feed'
displayName: 'Generate NuGet.config for IG ProGet NuGet feed and u'
inputs:
targetType: 'inline'
script: |
dotnet new nugetconfig --force
# The name of the source doesn't currently matter as the credentials are attached thanks to URL matching - according to MS docs
dotnet nuget add source ${{ parameters.igNuGetFeedUrl }} --name "IG ProGet NuGet"
failOnStderr: true
showWarnings: true
workingDirectory: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.${{ parameters.projectToBuild }}'

- task: PowerShell@2
displayName: 'Identify trial packages and use licensed ones instead'
inputs:
targetType: 'inline'
script: |
$xml = [XML](Get-Content '.\IgBlazorSamples.${{ parameters.projectToBuild }}.csproj');
$nodes = $xml.SelectNodes("//PackageReference[starts-with(@Include,'IgniteUI')]") |
ForEach-Object {
$_.SetAttribute("Include",$_.Include.Replace(".Trial",""));
Expand All @@ -56,28 +66,22 @@ steps:
showWarnings: true
workingDirectory: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.${{ parameters.projectToBuild }}'

- task: NuGetAuthenticate@1
displayName: 'Authenticate to IG ProGet NuGet feed'
inputs:
nuGetServiceConnections: 'IG ProGet IgniteUINuGet - Staging'
forceReinstallCredentialProvider: true

- task: DotNetCoreCLI@2
displayName: 'dotnet restore'
inputs:
command: 'restore'
projects: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.${{ parameters.projectToBuild }}'
# We want the dependency tree to be evaluated each time and to be sure that the dependencies are freshly downloaded
restoreArguments: '--ignore-failed-sources --no-cache --force'
feedsToUse: 'config'
nugetConfigPath: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.${{ parameters.projectToBuild }}\NuGet.Config'
verbosityRestore: 'Diagnostic'
arguments: "--ignore-failed-sources"
# This task cannot use an apiKey directly (yet) so use any other service connection not based on an api key
externalFeedCredentials: 'IG ProGet IgniteUINuGet - Staging'
${{ if eq(parameters.isVerbose, true) }}:
verbosityRestore: 'Diagnostic'
${{ else }}:
verbosityRestore: 'Normal'

- task: DotNetCoreCLI@2
displayName: 'dotnet build'
inputs:
command: 'build'
projects: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.${{ parameters.projectToBuild }}'
# arguments: '--configuration Release'

- task: DeleteFiles@1
displayName: 'Delete NuGet.config file - used only at build time'
Expand All @@ -89,7 +93,8 @@ steps:
# Using a CmldLine call for this opeation, because I couldn't get it to work as expected with the DotNetCoreCLI task
displayName: 'dotnet publish'
inputs:
script: 'dotnet publish -c release -o $(Build.SourcesDirectory)\browser\IgBlazorSamples.${{ parameters.projectToBuild }}\publish'
# Skip the restore process as it is already done. Got an error when I tried skipping the build process (which is already done as well)
script: 'dotnet publish --no-restore -c release -o $(Build.SourcesDirectory)\browser\IgBlazorSamples.${{ parameters.projectToBuild }}\publish'
workingDirectory: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.${{ parameters.projectToBuild }}'

- task: ArchiveFiles@2
Expand All @@ -108,5 +113,5 @@ steps:
targetPath: '$(Build.ArtifactStagingDirectory)/BlazorSamples${{ parameters.projectToBuild }}.zip'
artifact: 'BlazorSamples${{ parameters.projectToBuild }}'

# - ${{ if eq(parameters.shouldCleanPostExectuion, true) }}:
# - task: PostBuildCleanup@4
- ${{ if eq(parameters.shouldCleanPostExectuion, true) }}:
- task: PostBuildCleanup@4
6 changes: 3 additions & 3 deletions browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@
<!-- End NPM Updates -->

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="23.2.204" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="23.2.204" />
<PackageReference Include="IgniteUI.Blazor" Version="23.2.204" />
<PackageReference Include="IgniteUI.Blazor" Version="24.1.46" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="24.1.46" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="24.1.46" />
<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" />
Expand Down
17 changes: 17 additions & 0 deletions browser/IgBlazorSamples.Client/wwwroot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,47 +94,57 @@
<script src="sb/data-grid-performance.js"></script>
<script src="sb/data-grid-type-marketing-table.js"></script>
<script src="sb/grid-advanced-filtering-options.js"></script>
<script src="sb/grid-advanced-filtering-style.js"></script>
<script src="sb/grid-binding-composite-data.js"></script>
<script src="sb/grid-binding-crud-data.js"></script>
<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-clipboard-operations.js"></script>
<script src="sb/grid-column-moving-options.js"></script>
<script src="sb/grid-column-moving-styles.js"></script>
<script src="sb/grid-column-pinning-options.js"></script>
<script src="sb/grid-column-pinning-right-side.js"></script>
<script src="sb/grid-column-resizing.js"></script>
<script src="sb/grid-conditional-cell-style-1.js"></script>
<script src="sb/grid-conditional-cell-style-2.js"></script>
<script src="sb/grid-conditional-row-selectors.js"></script>
<script src="sb/grid-data-batch-editing-actions.js"></script>
<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 src="sb/grid-data-summary-options.js"></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 src="sb/grid-editing-events.js"></script>
<script src="sb/grid-editing-excel-style.js"></script>
<script src="sb/grid-editing-excel-style-custom.js"></script>
<script src="sb/grid-editing-lifecycle.js"></script>
<script src="sb/grid-excel-style-filtering-sample-1.js"></script>
<script src="sb/grid-excel-style-filtering-sample-2.js"></script>
<script src="sb/grid-excel-style-filtering-sample-3.js"></script>
<script src="sb/grid-excel-style-filtering-style.js"></script>
<script src="sb/grid-filtering-strategy.js"></script>
<script src="sb/grid-finjs.js"></script>
<script src="sb/grid-groupby-expressions.js"></script>
<script src="sb/grid-groupby-paging.js"></script>
<script src="sb/grid-groupby-styling.js"></script>
<script src="sb/grid-keyboard-mrl-navigation.js"></script>
<script src="sb/grid-layout-display-density.js"></script>
<script src="sb/grid-master-detail.js"></script>
<script src="sb/grid-multi-cell-selection-mode.js"></script>
<script src="sb/grid-multi-column-headers-export.js"></script>
<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-overview-dark.js"></script>
<script src="sb/grid-paste.js"></script>
<script src="sb/grid-row-classes.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>
<script src="sb/grid-row-paging-options.js"></script>
<script src="sb/grid-row-pinning-extra-column.js"></script>
<script src="sb/grid-row-pinning-options.js"></script>
<script src="sb/grid-row-pinning-style.js"></script>
Expand All @@ -155,9 +165,11 @@
<script src="sb/hierarchical-grid-custom-filtering.js"></script>
<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 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>
<script src="sb/hierarchical-grid-layout-display-density.js"></script>
<script src="sb/hierarchical-grid-multi-column-headers-export.js"></script>
<script src="sb/hierarchical-grid-multi-column-headers-template.js"></script>
<script src="sb/hierarchical-grid-row-classes.js"></script>
Expand All @@ -172,6 +184,7 @@
<script src="sb/pivot-grid-aggregate-max-sales.js"></script>
<script src="sb/pivot-grid-aggregate-units-sold.js"></script>
<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-clipboard-operations.js"></script>
<script src="sb/tree-grid-column-moving-options.js"></script>
Expand All @@ -194,9 +207,13 @@
<script src="sb/tree-grid-excel-style-filtering-style.js"></script>
<script src="sb/tree-grid-finjs.js"></script>
<script src="sb/tree-grid-keyboard-custom-navigation.js"></script>
<script src="sb/tree-grid-layout-display-density.js"></script>
<script src="sb/tree-grid-multi-cell-selection-mode.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-classes.js"></script>
<script src="sb/tree-grid-row-drag-base.js"></script>
<script src="sb/tree-grid-row-paging-options.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>
Expand Down
26 changes: 12 additions & 14 deletions browser/IgBlazorSamples.Gulp/tasks/gulp-samples.js
Original file line number Diff line number Diff line change
Expand Up @@ -156,18 +156,16 @@ function getSamples(cb) {
igConfig.SamplesCopyPath + '/charts/data-chart/itemized-column-chart/App.razor',
igConfig.SamplesCopyPath + '/charts/data-chart/itemized-stacked-bar-chart/App.razor',
igConfig.SamplesCopyPath + '/charts/data-chart/itemized-stacked-column-chart/App.razor',
// excluding bugged samples:
igConfig.SamplesCopyPath + '/grids/tree-grid/editing-columns/App.razor', // BUG https://github.com/IgniteUI/igniteui-blazor-examples/issues/423
// excluding deferred gird samples
igConfig.SamplesCopyPath + '/grids/grid/toolbar-style/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/advanced-filtering-style/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/toolbar-style/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/advanced-filtering-style/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/binding-nested-data-2/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/column-hiding-styles/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/column-moving-styles/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/column-pinning-styles/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/column-resize-styling/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/column-moving-styles/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/column-pinning-styles/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/column-resize-styling/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/column-selection-styles/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/conditional-cell-style-2/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/conditional-cell-style-2/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/data-exporting-indicator/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/data-performance-infinite-scroll/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/data-performance-operations/App.razor',
Expand All @@ -178,7 +176,7 @@ function getSamples(cb) {
// igConfig.SamplesCopyPath + '/grids/grid/excel-style-filtering-sample-1/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/excel-style-filtering-sample-2/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/excel-style-filtering-sample-3/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/excel-style-filtering-style/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/excel-style-filtering-style/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/external-excel-style-filtering/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/filtering-style/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/filtering-template/App.razor',
Expand All @@ -187,9 +185,9 @@ function getSamples(cb) {
igConfig.SamplesCopyPath + '/grids/grid/remote-paging-batch-editing/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/remote-paging-custom/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/remote-paging-template/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/row-classes/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/row-classes/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/row-drop-indicator/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/row-editing-style/App.razor',
// igConfig.SamplesCopyPath + '/grids/grid/row-editing-style/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/row-paging-style/App.razor',
igConfig.SamplesCopyPath + '/grids/grid/infinite-scroll/App.razor', // broken sample - undo when new IG packages deployed
];
Expand Down Expand Up @@ -592,9 +590,9 @@ function updateIG(cb) {

let packageUpgrades = [
// update version of IG packages and change to Trial or non-trial
{ name: "IgniteUI.Blazor", version: "23.2.218" },
{ name: "IgniteUI.Blazor.Documents.Core", version: "23.2.218" },
{ name: "IgniteUI.Blazor.Documents.Excel", version: "23.2.218" },
{ name: "IgniteUI.Blazor", version: "24.1.46" },
{ name: "IgniteUI.Blazor.Documents.Core", version: "24.1.46" },
{ name: "IgniteUI.Blazor.Documents.Excel", version: "24.1.46" },
// these IG packages are sometimes updated:
{ name: "Microsoft.AspNetCore.Components", version: "8.0.0" },
{ name: "Microsoft.AspNetCore.Components.Web", version: "8.0.0" },
Expand Down
6 changes: 3 additions & 3 deletions browser/IgBlazorSamples.Server/IgBlazorSamples.Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="23.2.204" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="23.2.204" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="23.2.204" />
<PackageReference Include="IgniteUI.Blazor" Version="24.1.46" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="24.1.46" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="24.1.46" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="23.2.218" />
<PackageReference Include="IgniteUI.Blazor" Version="24.1.46" />
<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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="23.2.218" />
<PackageReference Include="IgniteUI.Blazor" Version="24.1.46" />
<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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="23.2.218" />
<PackageReference Include="IgniteUI.Blazor" Version="24.1.46" />
<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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="23.2.218" />
<PackageReference Include="IgniteUI.Blazor" Version="24.1.46" />
<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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="23.2.218" />
<PackageReference Include="IgniteUI.Blazor" Version="24.1.46" />
<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" />
Expand Down
Loading

0 comments on commit b82e8df

Please sign in to comment.