Skip to content

Commit cc4b148

Browse files
authored
Publish blazor samples to production (#925)
1 parent d26a3b5 commit cc4b148

File tree

904 files changed

+2624
-1440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

904 files changed

+2624
-1440
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454

5555
/browser/Tests
5656

57+
/browser/IgBlazorSamples.Test/Generated/**
58+
5759
# misc
5860
.DS_Store
5961
.env.local

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ NOTE Do NOT find replace version of packages in package.json files.
119119
- run the `gulp updateIG` command
120120
- create AND merge a pull request with changes in all *.csproj files in this repository
121121
- create 2nd pull request with similar changes in `/editor-templates/Blazor/main-template/BlazorClientApp.csproj` of the [igniteui-xplat-examples](https://github.com/IgniteUI/igniteui-xplat-examples) repository.
122-
122+
- also update version in yml files: `/azure-pipelines/build-pipeline-client.yml` and `/azure-pipelines/build-pipeline-server.yml` in the `igVersion` parameter.
123123

124124
## Resources
125125

azure-pipelines/NuGet.config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="local-packages" value="../Dependencies/Blazor_NuGet" />
5+
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
6+
</packageSources>
7+
</configuration>

azure-pipelines/build-pipeline-client.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ stages:
3838

3939
- template: templates/build-steps-template.yml
4040
parameters:
41-
igVersion: '24.2.52'
41+
igVersion: '24.2.71'
4242
igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
4343
projectToBuild: Client
4444
isVerbose: ${{ parameters.isVerbose }}

azure-pipelines/build-pipeline-server.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ stages:
3737

3838
- template: templates/build-steps-template.yml
3939
parameters:
40-
igVersion: '24.2.52'
40+
igVersion: '24.2.71'
4141
igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
4242
projectToBuild: Server
4343
isVerbose: ${{ parameters.isVerbose }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ steps:
2424
customCommand: ci
2525

2626
- task: CmdLine@2
27-
displayName: 'npx gulp copySamplesTo${{ parameters.projectToBuild }}'
27+
displayName: 'npx gulp copySamplesTo${{ parameters.projectToBuild }}CI'
2828
inputs:
29-
script: 'npx gulp copySamplesTo${{ parameters.projectToBuild }}'
29+
script: 'npx gulp copySamplesTo${{ parameters.projectToBuild }}CI'
3030
workingDirectory: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.Gulp'
3131
failOnStderr: true
3232

browser/.runsettings

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RunSettings>
3+
<NUnit>
4+
<NumberOfTestWorkers>7</NumberOfTestWorkers>
5+
</NUnit>
6+
<Playwright>
7+
<BrowserName>chromium</BrowserName>
8+
<ExpectTimeout>5000</ExpectTimeout>
9+
<LaunchOptions>
10+
<!--<Headless>false</Headless>-->
11+
</LaunchOptions>
12+
</Playwright>
13+
<TestRunParameters>
14+
<Parameter name="defaultTimeout" value="40000" />
15+
<Parameter name="useInMemoryClient" value="true" />
16+
<Parameter name="testUrl" value="http://localhost:4200" />
17+
</TestRunParameters>
18+
</RunSettings>

browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
<!-- End NPM Updates -->
4949

5050
<ItemGroup>
51-
<PackageReference Include="IgniteUI.Blazor" Version="24.2.52" />
52-
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="24.2.52" />
53-
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="24.2.52" />
51+
<PackageReference Include="IgniteUI.Blazor" Version="24.2.71" />
52+
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="24.2.71" />
53+
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="24.2.71" />
5454
<PackageReference Include="Microsoft.AspNetCore.Components" Version="9.0.0" />
5555
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
5656
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.0" />

browser/IgBlazorSamples.Gulp/gulpfile.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,21 @@ exports.updateIG = updateIG = gulp.series(
6666
sb.updateIG,
6767
);
6868

69+
// Copy samples task used only for local run of the Samples Browser Server.
6970
exports.copySamplesToServer = copySamplesToServer = gulp.series(
7071
// sb.updateVersion,
7172
sb.getSamples,
7273
sb.copySamplesToServer,
7374
);
7475

76+
// Copy samples task used on host agents. Samples Browser Server from there has added '/blazor-samples' to the base url.
77+
exports.copySamplesToServerCI = copySamplesToServerCI = gulp.series(
78+
// sb.updateVersion,
79+
sb.getSamples,
80+
sb.copySamplesToServerCI,
81+
);
82+
83+
// Copy samples task used only for local run of the SB Client.
7584
exports.copySamplesToClient = copySamplesToClient = gulp.series(
7685
// sb.updateVersion,
7786
sb.getSamples,
@@ -81,6 +90,15 @@ exports.copySamplesToClient = copySamplesToClient = gulp.series(
8190
);
8291
exports.updateBrowser = updateBrowser = copySamplesToClient;
8392

93+
// Copy samples task used on host agents. Samples Browser Client from there has added '/blazor-samples' to the base url.
94+
exports.copySamplesToClientCI = copySamplesToClientCI = gulp.series(
95+
// sb.updateVersion,
96+
sb.getSamples,
97+
sb.copySamplesToClientCI,
98+
sb.updateCodeViewer,
99+
sb.updateReadme,
100+
);
101+
84102
exports.cleanupSampleBrowsers = cleanupSampleBrowsers = gulp.series(
85103
sb.cleanupSampleBrowsers,
86104
);

browser/IgBlazorSamples.Gulp/tasks/gulp-samples.js

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ function copySamplePages(cb, outputPath) {
376376
cb();
377377
}
378378

379-
function copySampleScripts(cb, outputPath, indexName) {
379+
function copySampleScripts(cb, outputPath, indexName, isLocalBuild) {
380380
var insertScriptFiles = [];
381381

382382
log('deleting scripts in: ' + outputPath + '/wwwroot/sb/*.js');
@@ -467,7 +467,6 @@ function copySampleScripts(cb, outputPath, indexName) {
467467

468468
// indexLines = indexLines.filter((v, i, a) => a.indexOf(v) === i);
469469

470-
var isLocalBuild = __dirname.indexOf('Agent') < 0;
471470
for (let i = 0; i < indexLines.length; i++) {
472471
if (indexLines[i].indexOf('<base href') > 0) {
473472
if (isLocalBuild) {
@@ -495,19 +494,31 @@ function copySampleScripts(cb, outputPath, indexName) {
495494
// '../../browser/IgBlazorSamples.Server/wwwroot'
496495
function copySamplesToServer(cb) {
497496
cleanupSampleBrowser( "../../browser/IgBlazorSamples.Server");
498-
copySampleScripts(cb, "../../browser/IgBlazorSamples.Server", "/Pages/_Host.cshtml");
497+
copySampleScripts(cb, "../../browser/IgBlazorSamples.Server", "/Pages/_Host.cshtml", true);
499498
copySamplePages(cb, "../../browser/IgBlazorSamples.Server");
500499
} exports.copySamplesToServer = copySamplesToServer;
501500

501+
function copySamplesToServerCI(cb) {
502+
cleanupSampleBrowser( "../../browser/IgBlazorSamples.Server");
503+
copySampleScripts(cb, "../../browser/IgBlazorSamples.Server", "/Pages/_Host.cshtml", false);
504+
copySamplePages(cb, "../../browser/IgBlazorSamples.Server");
505+
} exports.copySamplesToServerCI = copySamplesToServerCI;
506+
502507
// '../../browser/IgBlazorSamples.Client/Pages'
503508
// '../../browser/IgBlazorSamples.Client/Services'
504509
// '../../browser/IgBlazorSamples.Client/wwwroot'
505510
function copySamplesToClient(cb) {
506511
cleanupSampleBrowser( "../../browser/IgBlazorSamples.Client");
507-
copySampleScripts(cb, "../../browser/IgBlazorSamples.Client", "/wwwroot/index.html");
512+
copySampleScripts(cb, "../../browser/IgBlazorSamples.Client", "/wwwroot/index.html", true);
508513
copySamplePages(cb, "../../browser/IgBlazorSamples.Client");
509514
} exports.copySamplesToClient = copySamplesToClient;
510515

516+
function copySamplesToClientCI(cb) {
517+
cleanupSampleBrowser( "../../browser/IgBlazorSamples.Client");
518+
copySampleScripts(cb, "../../browser/IgBlazorSamples.Client", "/wwwroot/index.html", false);
519+
copySamplePages(cb, "../../browser/IgBlazorSamples.Client");
520+
} exports.copySamplesToClientCI = copySamplesToClientCI;
521+
511522
function updateReadme(cb) {
512523

513524
var changeFilesCount = 0;
@@ -593,9 +604,9 @@ function updateIG(cb) {
593604

594605
let packageUpgrades = [
595606
// update version of IG packages and change to Trial or non-trial
596-
{ version: "24.2.52", name: "IgniteUI.Blazor" },
597-
{ version: "24.2.52", name: "IgniteUI.Blazor.Documents.Core" },
598-
{ version: "24.2.52", name: "IgniteUI.Blazor.Documents.Excel" },
607+
{ version: "24.2.71", name: "IgniteUI.Blazor" },
608+
{ version: "24.2.71", name: "IgniteUI.Blazor.Documents.Core" },
609+
{ version: "24.2.71", name: "IgniteUI.Blazor.Documents.Excel" },
599610
// these IG packages are sometimes updated:
600611
{ version: "9.0.0", name: "Microsoft.AspNetCore.Components" },
601612
{ version: "9.0.0", name: "Microsoft.AspNetCore.Components.Web" },

0 commit comments

Comments
 (0)