Skip to content

Commit 7132f00

Browse files
Phil-NHSPhil-NHS
committed
chore(cicd): Tweaks only
1 parent 688172d commit 7132f00

File tree

13 files changed

+40
-28
lines changed

13 files changed

+40
-28
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@
5858
<PackageVersion Include="Microsoft.Playwright.Xunit" Version="1.50.0" />
5959
<PackageVersion Include="Verify.Playwright" Version="3.0.0" />
6060
<!-- Internal packages -->
61-
<PackageVersion Include="TELBlazor.Components" Version="$(TELBlazorPackageVersion)" />
61+
<PackageVersion Include="TELBlazor.Components" Version="$(TELBlazorPackageVersion)" IncludePrerelease="true"/>
6262
</ItemGroup>
6363
</Project>

‎PackageSettings.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@
5050

5151
<!--Building the components project makes the package publish isnt needed-->
5252
<DisablePackageGeneration>$(DISABLE_PACKAGE_GENERATION)</DisablePackageGeneration>
53-
53+
54+
<!--So updates prerelease versions-->
55+
<RestorePrerelease>true</RestorePrerelease>
5456
</PropertyGroup>
5557

5658
</Project>

‎TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
<ItemGroup>
3737
<ProjectReference Include="..\..\TELBlazor.Components.ShowCase.Shared\TELBlazor.Components.ShowCase.Shared.csproj" />
38-
<ProjectReference Include="..\..\TELBlazor.Components\TELBlazor.Components.csproj" />
3938
</ItemGroup>
4039

4140
<ItemGroup>

‎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.5-local, )"
324+
"TELBlazor.Components": "[1.9.9, )"
325325
}
326326
},
327327
"Markdig": {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@
348348
"Serilog.Settings.Configuration": "[8.0.0, )",
349349
"Serilog.Sinks.BrowserConsole": "[8.0.0, )",
350350
"Serilog.Sinks.Http": "[8.0.0, )",
351-
"TELBlazor.Components": "[1.9.5-local, )",
352351
"TELBlazor.Components.ShowCase.Shared": "[1.0.0, )"
353352
}
354353
},
@@ -359,7 +358,7 @@
359358
"Markdig": "[0.41.3, )",
360359
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
361360
"Serilog": "[4.2.0, )",
362-
"TELBlazor.Components": "[1.9.5-local, )"
361+
"TELBlazor.Components": "[1.9.9, )"
363362
}
364363
},
365364
"Markdig": {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,6 @@
16011601
"Serilog.Settings.Configuration": "[8.0.0, )",
16021602
"Serilog.Sinks.BrowserConsole": "[8.0.0, )",
16031603
"Serilog.Sinks.Http": "[8.0.0, )",
1604-
"TELBlazor.Components": "[1.9.5-local, )",
16051604
"TELBlazor.Components.ShowCase.Shared": "[1.0.0, )"
16061605
}
16071606
},
@@ -1612,7 +1611,7 @@
16121611
"Markdig": "[0.41.3, )",
16131612
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
16141613
"Serilog": "[4.2.0, )",
1615-
"TELBlazor.Components": "[1.9.5-local, )"
1614+
"TELBlazor.Components": "[1.9.9, )"
16161615
}
16171616
},
16181617
"Blazored.LocalStorage": {

‎TELBlazor.Components.ShowCase.Shared/TELBlazor.Components.ShowCase.Shared.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<PackageReference Include="Markdig" />
1414
<PackageReference Include="Microsoft.AspNetCore.Components.Web" />
1515
<PackageReference Include="Serilog" />
16-
<PackageReference Include="TELBlazor.Components" />
16+
17+
<!--Overrided by project reference when configured to do so-->
18+
<PackageReference Include="TELBlazor.Components" IncludePrerelease="true" />
1719
</ItemGroup>
1820
<ItemGroup>
1921
<Content Remove="packages.lock.json" />

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@
3939
},
4040
"TELBlazor.Components": {
4141
"type": "Direct",
42-
"requested": "[1.9.5-local, )",
43-
"resolved": "1.10.0-refactor-logging.1-250812-1712",
44-
"contentHash": "GLxrOCQUIWGGBObMTQlofwBmUw5HwU31dR2JUeEWcFP40s2bpNfBMX92kZkov1zxABKH7ioxMpc86MANI/06rw==",
42+
"requested": "[1.9.9, )",
43+
"resolved": "1.9.9",
44+
"contentHash": "l3oiHqxM2b8BIidNdYd/cyPThdZSL2vVYQWeXE/I/ywKBfQmCbO7KzdK9uXTFruwVFRz4yFd3cJWq3ivDYwEDA==",
4545
"dependencies": {
4646
"Blazored.LocalStorage": "4.5.0",
4747
"Microsoft.AspNetCore.Components.Web": "8.0.14",

‎TELBlazor.Components.ShowCase.WasmStaticClient/TELBlazor.Components.ShowCase.WasmStaticClient.csproj‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,14 @@
4242
<PackageReference Include="Serilog.Settings.Configuration" />
4343
<PackageReference Include="Serilog.Sinks.BrowserConsole" />
4444
<PackageReference Include="Serilog.Sinks.Http" />
45+
46+
<!--Overrided by project reference when configured to do so-->
47+
<PackageReference Include="TELBlazor.Components" IncludePrerelease="true" />
4548
</ItemGroup>
4649

4750
<ItemGroup>
4851
<ProjectReference Include="..\TELBlazor.Components.ShowCase.Shared\TELBlazor.Components.ShowCase.Shared.csproj" />
49-
<ProjectReference Include="..\TELBlazor.Components\TELBlazor.Components.csproj" />
52+
<ProjectReference Include="..\TELBlazor.Components\TELBlazor.Components.csproj" Condition="'$(UseTELBlazorComponentsProjectReference)' == 'true'" />
5053
</ItemGroup>
5154

5255
<ItemGroup>

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,21 @@
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+
},
145160
"Microsoft.AspNetCore.Authorization": {
146161
"type": "Transitive",
147162
"resolved": "8.0.14",
@@ -448,23 +463,14 @@
448463
"System.Text.Encodings.Web": "8.0.0"
449464
}
450465
},
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-
},
460466
"telblazor.components.showcase.shared": {
461467
"type": "Project",
462468
"dependencies": {
463469
"Blazored.LocalStorage": "[4.5.0, )",
464470
"Markdig": "[0.41.3, )",
465471
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
466472
"Serilog": "[4.2.0, )",
467-
"TELBlazor.Components": "[1.9.5-local, )"
473+
"TELBlazor.Components": "[1.9.9, )"
468474
}
469475
},
470476
"Markdig": {

0 commit comments

Comments
 (0)