Skip to content

Commit d0172a6

Browse files
Phil-NHSPhil-NHS
committed
chore(cicd): tiny change
1 parent 7132f00 commit d0172a6

File tree

8 files changed

+47
-62
lines changed

8 files changed

+47
-62
lines changed

‎TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/packages.lock.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
"Markdig": "[0.41.3, )",
322322
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
323323
"Serilog": "[4.2.0, )",
324-
"TELBlazor.Components": "[1.9.9, )"
324+
"TELBlazor.Components": "[1.2.5-local, )"
325325
}
326326
},
327327
"Markdig": {

‎TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/packages.lock.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@
358358
"Markdig": "[0.41.3, )",
359359
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
360360
"Serilog": "[4.2.0, )",
361-
"TELBlazor.Components": "[1.9.9, )"
361+
"TELBlazor.Components": "[1.2.5-local, )"
362362
}
363363
},
364364
"Markdig": {

‎TELBlazor.Components.ShowCase.E2ETests/packages.lock.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@
16111611
"Markdig": "[0.41.3, )",
16121612
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
16131613
"Serilog": "[4.2.0, )",
1614-
"TELBlazor.Components": "[1.9.9, )"
1614+
"TELBlazor.Components": "[1.2.5-local, )"
16151615
}
16161616
},
16171617
"Blazored.LocalStorage": {

‎TELBlazor.Components.ShowCase.Shared/packages.lock.json‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,6 @@
3737
"resolved": "4.2.0",
3838
"contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
3939
},
40-
"TELBlazor.Components": {
41-
"type": "Direct",
42-
"requested": "[1.9.9, )",
43-
"resolved": "1.9.9",
44-
"contentHash": "l3oiHqxM2b8BIidNdYd/cyPThdZSL2vVYQWeXE/I/ywKBfQmCbO7KzdK9uXTFruwVFRz4yFd3cJWq3ivDYwEDA==",
45-
"dependencies": {
46-
"Blazored.LocalStorage": "4.5.0",
47-
"Microsoft.AspNetCore.Components.Web": "8.0.14",
48-
"Microsoft.Extensions.DependencyInjection": "8.0.1",
49-
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
50-
"Microsoft.Extensions.Http": "8.0.1",
51-
"Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0",
52-
"Serilog": "4.2.0"
53-
}
54-
},
5540
"Microsoft.AspNetCore.Authorization": {
5641
"type": "Transitive",
5742
"resolved": "8.0.14",
@@ -175,6 +160,15 @@
175160
"resolved": "8.0.0",
176161
"contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA=="
177162
},
163+
"telblazor.components": {
164+
"type": "Project",
165+
"dependencies": {
166+
"Blazored.LocalStorage": "[4.5.0, )",
167+
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
168+
"Microsoft.Extensions.Http": "[8.0.1, )",
169+
"Serilog": "[4.2.0, )"
170+
}
171+
},
178172
"Microsoft.Extensions.DependencyInjection": {
179173
"type": "CentralTransitive",
180174
"requested": "[8.0.1, )",

‎TELBlazor.Components.ShowCase.WasmStaticClient/packages.lock.json‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -142,21 +142,6 @@
142142
"Serilog.Sinks.File": "5.0.0"
143143
}
144144
},
145-
"TELBlazor.Components": {
146-
"type": "Direct",
147-
"requested": "[1.9.9, )",
148-
"resolved": "1.9.9",
149-
"contentHash": "l3oiHqxM2b8BIidNdYd/cyPThdZSL2vVYQWeXE/I/ywKBfQmCbO7KzdK9uXTFruwVFRz4yFd3cJWq3ivDYwEDA==",
150-
"dependencies": {
151-
"Blazored.LocalStorage": "4.5.0",
152-
"Microsoft.AspNetCore.Components.Web": "8.0.14",
153-
"Microsoft.Extensions.DependencyInjection": "8.0.1",
154-
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
155-
"Microsoft.Extensions.Http": "8.0.1",
156-
"Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0",
157-
"Serilog": "4.2.0"
158-
}
159-
},
160145
"Microsoft.AspNetCore.Authorization": {
161146
"type": "Transitive",
162147
"resolved": "8.0.14",
@@ -463,14 +448,23 @@
463448
"System.Text.Encodings.Web": "8.0.0"
464449
}
465450
},
451+
"telblazor.components": {
452+
"type": "Project",
453+
"dependencies": {
454+
"Blazored.LocalStorage": "[4.5.0, )",
455+
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
456+
"Microsoft.Extensions.Http": "[8.0.1, )",
457+
"Serilog": "[4.2.0, )"
458+
}
459+
},
466460
"telblazor.components.showcase.shared": {
467461
"type": "Project",
468462
"dependencies": {
469463
"Blazored.LocalStorage": "[4.5.0, )",
470464
"Markdig": "[0.41.3, )",
471465
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
472466
"Serilog": "[4.2.0, )",
473-
"TELBlazor.Components": "[1.9.9, )"
467+
"TELBlazor.Components": "[1.2.5-local, )"
474468
}
475469
},
476470
"Markdig": {

‎TELBlazor.Components.UnitTests/packages.lock.json‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,21 +139,6 @@
139139
"xunit.core": "2.4.1"
140140
}
141141
},
142-
"TELBlazor.Components": {
143-
"type": "Direct",
144-
"requested": "[1.9.9, )",
145-
"resolved": "1.9.9",
146-
"contentHash": "l3oiHqxM2b8BIidNdYd/cyPThdZSL2vVYQWeXE/I/ywKBfQmCbO7KzdK9uXTFruwVFRz4yFd3cJWq3ivDYwEDA==",
147-
"dependencies": {
148-
"Blazored.LocalStorage": "4.5.0",
149-
"Microsoft.AspNetCore.Components.Web": "8.0.14",
150-
"Microsoft.Extensions.DependencyInjection": "8.0.1",
151-
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
152-
"Microsoft.Extensions.Http": "8.0.1",
153-
"Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0",
154-
"Serilog": "4.2.0"
155-
}
156-
},
157142
"xunit": {
158143
"type": "Direct",
159144
"requested": "[2.9.0, )",
@@ -1681,6 +1666,15 @@
16811666
"xunit.extensibility.core": "[2.9.0]"
16821667
}
16831668
},
1669+
"telblazor.components": {
1670+
"type": "Project",
1671+
"dependencies": {
1672+
"Blazored.LocalStorage": "[4.5.0, )",
1673+
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
1674+
"Microsoft.Extensions.Http": "[8.0.1, )",
1675+
"Serilog": "[4.2.0, )"
1676+
}
1677+
},
16841678
"Blazored.LocalStorage": {
16851679
"type": "CentralTransitive",
16861680
"requested": "[4.5.0, )",

‎TELBlazor.Components/TELBlazor.Components.csproj‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,18 +59,17 @@
5959
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6060
</Content>
6161
</ItemGroup>
62-
<Target Name="RunGulp" BeforeTargets="PrepareForBuild">
63-
<!--
64-
1) Use solution root as working dir so npx picks up root/node_modules
65-
2) Tell gulp to run the gulpfile in this project directory
66-
3) Gulp to add the TELFrontend css version to version info file
67-
-->
68-
<Exec WorkingDirectory="$(MSBuildProjectDirectory)/.." Command="npx gulp --cwd &quot;$(MSBuildProjectDirectory)&quot; --gulpfile &quot;$(MSBuildProjectDirectory)/gulpfile.js&quot;" />
62+
<!--qqqq tidy up and comment later-->
63+
<!--Ensure no stale version cs files and that new ones are generated-->
64+
<!--<Delete Files="TELBlazorPackageVersion/VersionInfo.TELBlazor.cs" />
65+
<Delete Files="TELBlazorPackageVersion/VersionInfo.cs" />-->
66+
67+
<Target Name="PreBuildCleanup" BeforeTargets="GenerateTELBlazorPackageVersion">
68+
<Delete Files="TELBlazorPackageVersion/VersionInfo.TELBlazor.cs" />
6969
</Target>
70-
<Target Name="GenerateTELBlazorPackageVersion" BeforeTargets="RunGulp">
71-
<Delete Files="TELBlazorPackageVersion/VersionInfo.cs" />
72-
<WriteLinesToFile
73-
File="TELBlazorPackageVersion\VersionInfo.TELBlazor.cs"
70+
<Target Name="GenerateTELBlazorPackageVersion" DependsOnTargets="PreBuildCleanup" BeforeTargets="RunGulp">
71+
<WriteLinesToFile
72+
File="TELBlazorPackageVersion\VersionInfo.TELBlazor.cs"
7473
Lines="// This file is auto-generated. Do not edit manually.
7574
namespace TELBlazor.Components.TELBlazorPackageVersion
7675
{
@@ -79,9 +78,14 @@ namespace TELBlazor.Components.TELBlazorPackageVersion
7978
public const string TELBlazorPackageVersion = &quot;$(TELBlazorPackageVersion)&quot;%3B;
8079
}
8180
}"
82-
Overwrite="true"
81+
Overwrite="true"
8382
Encoding="UTF-8" />
8483
</Target>
8584

85+
<Target Name="RunGulp" DependsOnTargets="GenerateTELBlazorPackageVersion" BeforeTargets="PrepareForBuild">
86+
<Exec WorkingDirectory="$(MSBuildProjectDirectory)/.."
87+
Command="npx gulp --cwd &quot;$(MSBuildProjectDirectory)&quot; --gulpfile &quot;$(MSBuildProjectDirectory)/gulpfile.js&quot;" />
88+
</Target>
89+
8690
</Project>
8791

‎TELBlazor.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1616
nuget.config = nuget.config
1717
nuget.config.cicd = nuget.config.cicd
1818
nuget.config.template = nuget.config.template
19-
package-lock.json = package-lock.json
2019
package.json = package.json
2120
PackageSettings.props = PackageSettings.props
2221
PackageSettings.props.local = PackageSettings.props.local

0 commit comments

Comments
 (0)