Skip to content

Publish blazor samples to production #925

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dkamburov merged 9 commits into from
Jan 28, 2025
Merged

Publish blazor samples to production #925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
99f22ce
mdd-add-custom-content-grid-toolbar
mddifilippo89 Jan 9, 2025
09980df
Merge pull request #920 from IgniteUI/mdd-add-custom-content-grid-too…
HUSSAR-mtrela Jan 9, 2025
008d0e4
Add generic sample tests and test generation. (#823)
skrustev Jan 13, 2025
375b879
Unify pivot sales data with generated one. (#853)
skrustev Jan 17, 2025
3ade449
Change how grids save state on navigation (#842)
mddragnev Jan 17, 2025
a58653e
Adding changes from build igniteui-xplat-examples-output+PRs_2025.1.2…
azure-pipelines[bot] Jan 22, 2025
5bbe5c7
chore(*): update ig packages to Blazor 24.2.79 (#923)
dkamburov Jan 23, 2025
ea24db0
chore(*): update ig packages to Blazor 24.2.71 (#924)
MayaKirova Jan 24, 2025
c0a9f4d
Update blazor tests dotnet to v9. (#921)
skrustev Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@

/browser/Tests

/browser/IgBlazorSamples.Test/Generated/**

# misc
.DS_Store
.env.local
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ NOTE Do NOT find replace version of packages in package.json files.
- run the `gulp updateIG` command
- create AND merge a pull request with changes in all *.csproj files in this repository
- 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.

- also update version in yml files: `/azure-pipelines/build-pipeline-client.yml` and `/azure-pipelines/build-pipeline-server.yml` in the `igVersion` parameter.

## Resources

Expand Down
7 changes: 7 additions & 0 deletions azure-pipelines/NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="local-packages" value="../Dependencies/Blazor_NuGet" />
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
</packageSources>
</configuration>
2 changes: 1 addition & 1 deletion azure-pipelines/build-pipeline-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ stages:

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

- template: templates/build-steps-template.yml
parameters:
igVersion: '24.2.52'
igVersion: '24.2.71'
igNuGetFeedUrl: $(IG_Nuget_Feed_URL)
projectToBuild: Server
isVerbose: ${{ parameters.isVerbose }}
Expand Down
4 changes: 2 additions & 2 deletions azure-pipelines/templates/build-steps-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ steps:
customCommand: ci

- task: CmdLine@2
displayName: 'npx gulp copySamplesTo${{ parameters.projectToBuild }}'
displayName: 'npx gulp copySamplesTo${{ parameters.projectToBuild }}CI'
inputs:
script: 'npx gulp copySamplesTo${{ parameters.projectToBuild }}'
script: 'npx gulp copySamplesTo${{ parameters.projectToBuild }}CI'
workingDirectory: '$(Build.SourcesDirectory)\browser\IgBlazorSamples.Gulp'
failOnStderr: true

Expand Down
18 changes: 18 additions & 0 deletions browser/.runsettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<RunSettings>
<NUnit>
<NumberOfTestWorkers>7</NumberOfTestWorkers>
</NUnit>
<Playwright>
<BrowserName>chromium</BrowserName>
<ExpectTimeout>5000</ExpectTimeout>
<LaunchOptions>
<!--<Headless>false</Headless>-->
</LaunchOptions>
</Playwright>
<TestRunParameters>
<Parameter name="defaultTimeout" value="40000" />
<Parameter name="useInMemoryClient" value="true" />
<Parameter name="testUrl" value="http://localhost:4200" />
</TestRunParameters>
</RunSettings>
6 changes: 3 additions & 3 deletions browser/IgBlazorSamples.Client/IgBlazorSamples.Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
<!-- End NPM Updates -->

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="24.2.52" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="24.2.52" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="24.2.52" />
<PackageReference Include="IgniteUI.Blazor" Version="24.2.71" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="24.2.71" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="24.2.71" />
<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" />
Expand Down
18 changes: 18 additions & 0 deletions browser/IgBlazorSamples.Gulp/gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,21 @@ exports.updateIG = updateIG = gulp.series(
sb.updateIG,
);

// Copy samples task used only for local run of the Samples Browser Server.
exports.copySamplesToServer = copySamplesToServer = gulp.series(
// sb.updateVersion,
sb.getSamples,
sb.copySamplesToServer,
);

// Copy samples task used on host agents. Samples Browser Server from there has added '/blazor-samples' to the base url.
exports.copySamplesToServerCI = copySamplesToServerCI = gulp.series(
// sb.updateVersion,
sb.getSamples,
sb.copySamplesToServerCI,
);

// Copy samples task used only for local run of the SB Client.
exports.copySamplesToClient = copySamplesToClient = gulp.series(
// sb.updateVersion,
sb.getSamples,
Expand All @@ -81,6 +90,15 @@ exports.copySamplesToClient = copySamplesToClient = gulp.series(
);
exports.updateBrowser = updateBrowser = copySamplesToClient;

// Copy samples task used on host agents. Samples Browser Client from there has added '/blazor-samples' to the base url.
exports.copySamplesToClientCI = copySamplesToClientCI = gulp.series(
// sb.updateVersion,
sb.getSamples,
sb.copySamplesToClientCI,
sb.updateCodeViewer,
sb.updateReadme,
);

exports.cleanupSampleBrowsers = cleanupSampleBrowsers = gulp.series(
sb.cleanupSampleBrowsers,
);
Expand Down
25 changes: 18 additions & 7 deletions browser/IgBlazorSamples.Gulp/tasks/gulp-samples.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ function copySamplePages(cb, outputPath) {
cb();
}

function copySampleScripts(cb, outputPath, indexName) {
function copySampleScripts(cb, outputPath, indexName, isLocalBuild) {
var insertScriptFiles = [];

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

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

var isLocalBuild = __dirname.indexOf('Agent') < 0;
for (let i = 0; i < indexLines.length; i++) {
if (indexLines[i].indexOf('<base href') > 0) {
if (isLocalBuild) {
Expand Down Expand Up @@ -495,19 +494,31 @@ function copySampleScripts(cb, outputPath, indexName) {
// '../../browser/IgBlazorSamples.Server/wwwroot'
function copySamplesToServer(cb) {
cleanupSampleBrowser( "../../browser/IgBlazorSamples.Server");
copySampleScripts(cb, "../../browser/IgBlazorSamples.Server", "/Pages/_Host.cshtml");
copySampleScripts(cb, "../../browser/IgBlazorSamples.Server", "/Pages/_Host.cshtml", true);
copySamplePages(cb, "../../browser/IgBlazorSamples.Server");
} exports.copySamplesToServer = copySamplesToServer;

function copySamplesToServerCI(cb) {
cleanupSampleBrowser( "../../browser/IgBlazorSamples.Server");
copySampleScripts(cb, "../../browser/IgBlazorSamples.Server", "/Pages/_Host.cshtml", false);
copySamplePages(cb, "../../browser/IgBlazorSamples.Server");
} exports.copySamplesToServerCI = copySamplesToServerCI;

// '../../browser/IgBlazorSamples.Client/Pages'
// '../../browser/IgBlazorSamples.Client/Services'
// '../../browser/IgBlazorSamples.Client/wwwroot'
function copySamplesToClient(cb) {
cleanupSampleBrowser( "../../browser/IgBlazorSamples.Client");
copySampleScripts(cb, "../../browser/IgBlazorSamples.Client", "/wwwroot/index.html");
copySampleScripts(cb, "../../browser/IgBlazorSamples.Client", "/wwwroot/index.html", true);
copySamplePages(cb, "../../browser/IgBlazorSamples.Client");
} exports.copySamplesToClient = copySamplesToClient;

function copySamplesToClientCI(cb) {
cleanupSampleBrowser( "../../browser/IgBlazorSamples.Client");
copySampleScripts(cb, "../../browser/IgBlazorSamples.Client", "/wwwroot/index.html", false);
copySamplePages(cb, "../../browser/IgBlazorSamples.Client");
} exports.copySamplesToClientCI = copySamplesToClientCI;

function updateReadme(cb) {

var changeFilesCount = 0;
Expand Down Expand Up @@ -593,9 +604,9 @@ function updateIG(cb) {

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

<ItemGroup>
<PackageReference Include="IgniteUI.Blazor" Version="24.2.52" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="24.2.52" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="24.2.52" />
<PackageReference Include="IgniteUI.Blazor" Version="24.2.71" />
<PackageReference Include="IgniteUI.Blazor.Documents.Core" Version="24.2.71" />
<PackageReference Include="IgniteUI.Blazor.Documents.Excel" Version="24.2.71" />
<PackageReference Include="Microsoft.AspNetCore.Components" Version="9.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
Expand Down
54 changes: 54 additions & 0 deletions browser/IgBlazorSamples.Test.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.1.32210.238
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgBlazorSamples.Client", "IgBlazorSamples.Client\IgBlazorSamples.Client.csproj", "{8D8DE753-4CD1-4B21-9C9F-2E40AE5EED1B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgBlazorSamples.Shared", "IgBlazorSamples.Shared\IgBlazorSamples.Shared.csproj", "{FBA48919-F510-4D99-A3F6-6743A9C304D2}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgBlazorSamples.Core", "IgBlazorSamples.Core\IgBlazorSamples.Core.csproj", "{B64DD2DE-32F6-4CF8-B9F5-7F0E29796460}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F85EE908-E593-4D66-A46D-2193EF3C98C2}"
ProjectSection(SolutionItems) = preProject
.runsettings = .runsettings
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgBlazorSamples.TestServer", "IgBlazorSamples.TestServer\IgBlazorSamples.TestServer.csproj", "{3E6A34E9-442D-4CC0-BE26-0C872B51FF55}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IgBlazorSamples.Test", "IgBlazorSamples.Test\IgBlazorSamples.Test.csproj", "{EFFA7E4D-7130-40AE-9E8B-6110FCB099AF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{8D8DE753-4CD1-4B21-9C9F-2E40AE5EED1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D8DE753-4CD1-4B21-9C9F-2E40AE5EED1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D8DE753-4CD1-4B21-9C9F-2E40AE5EED1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D8DE753-4CD1-4B21-9C9F-2E40AE5EED1B}.Release|Any CPU.Build.0 = Release|Any CPU
{FBA48919-F510-4D99-A3F6-6743A9C304D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FBA48919-F510-4D99-A3F6-6743A9C304D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBA48919-F510-4D99-A3F6-6743A9C304D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBA48919-F510-4D99-A3F6-6743A9C304D2}.Release|Any CPU.Build.0 = Release|Any CPU
{B64DD2DE-32F6-4CF8-B9F5-7F0E29796460}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B64DD2DE-32F6-4CF8-B9F5-7F0E29796460}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B64DD2DE-32F6-4CF8-B9F5-7F0E29796460}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B64DD2DE-32F6-4CF8-B9F5-7F0E29796460}.Release|Any CPU.Build.0 = Release|Any CPU
{3E6A34E9-442D-4CC0-BE26-0C872B51FF55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3E6A34E9-442D-4CC0-BE26-0C872B51FF55}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3E6A34E9-442D-4CC0-BE26-0C872B51FF55}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3E6A34E9-442D-4CC0-BE26-0C872B51FF55}.Release|Any CPU.Build.0 = Release|Any CPU
{EFFA7E4D-7130-40AE-9E8B-6110FCB099AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EFFA7E4D-7130-40AE-9E8B-6110FCB099AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EFFA7E4D-7130-40AE-9E8B-6110FCB099AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EFFA7E4D-7130-40AE-9E8B-6110FCB099AF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {2B229BA4-53C2-4C4E-8A25-BA19866A265A}
EndGlobalSection
EndGlobal
Loading
Loading