Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -198,3 +198,4 @@ CHANGELOG.md


/AllTestResults/coverage.cobertura.xml
/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/Logs/*.txt
388 changes: 0 additions & 388 deletions AllTestResults/coverage.cobertura.xml

This file was deleted.

498 changes: 5 additions & 493 deletions CHANGELOG.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions PackageSettings.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<NupkgOutputPath>$(NupkgOutputPath)</NupkgOutputPath>

<!--can be local folder-->

<TELBlazorPackageSource>$(TELBlazorPackageSource)</TELBlazorPackageSource>

<!--Use project reference for faster iteration in development-->
Expand Down
285 changes: 262 additions & 23 deletions README.md

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@
"Blazored.LocalStorage": "[4.5.0, )",
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
"Serilog": "[4.2.0, )",
"TELBlazor.Components": "[10.9.9, )"
"TELBlazor.Components": "[1.4.0, )"
}
},
"Microsoft.AspNetCore.Components.Web": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"APIs": {
},

"Serilog": {
"Using": [
"Serilog.Sinks.BrowserConsole"
],
"MinimumLevel": {
"Default": "Information",
"Override": {
"Microsoft": "Warning",
"System": "Warning"
}
},
"WriteTo": [
{
"Name": "BrowserConsole",
"Args": {
"formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
}
}
],
"Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId" ],
"Properties": {
"Application": "TELBlazor ShowCase E2E Client",
"Environment": "Development"
}
},
"Properties": {
"Application": "TELBlazor ShowCase E2E Client",
"Environment": "Development"
},
"AllowedHosts": "*"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gitinclude
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gitinclude

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@
"Blazored.LocalStorage": "[4.5.0, )",
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
"Serilog": "[4.2.0, )",
"TELBlazor.Components": "[10.9.9, )"
"TELBlazor.Components": "[1.4.0, )"
}
},
"Microsoft.AspNetCore.Components.Web": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ namespace TELBlazor.Components.ShowCase.E2ETests.Helpers
{
public static class BrowserHelper
{
// Setting value using PackageSetting.props potentially replace appsettings.Test.json in future especially if apis
static bool headless =>
#if HEADLESS_TESTING
true;
#else
false;
#endif

public static async Task<IBrowserContext> CreateBrowserContextAsync(IPlaywright playwright, string browserType, bool jsEnabled, ViewportType viewport, string baseUrl)
{
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<Configurations>Debug;Release;ci</Configurations>

<DefineConstants Condition="'$(HeadlessTesting)' == 'true'">$(DefineConstants);HEADLESS_TESTING</DefineConstants>
</PropertyGroup>
<Target Name="SetHeadlessTestingEnvVar" BeforeTargets="Build">
<Message Text="Setting HeadlessTesting: $(HeadlessTesting)" Importance="high" />
<Exec Command="set HEADLESS_TESTING $(HeadlessTesting)" />
</Target>

<ItemGroup>
<PackageReference Include="AutoFixture" />
<PackageReference Include="coverlet.msbuild" />
Expand Down
2 changes: 1 addition & 1 deletion TELBlazor.Components.ShowCase.E2ETests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -1608,7 +1608,7 @@
"Blazored.LocalStorage": "[4.5.0, )",
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
"Serilog": "[4.2.0, )",
"TELBlazor.Components": "[10.9.9, )"
"TELBlazor.Components": "[1.4.0, )"
}
},
"Blazored.LocalStorage": {
Expand Down
20 changes: 13 additions & 7 deletions TELBlazor.Components.ShowCase.Shared/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,19 @@
"resolved": "4.2.0",
"contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
},
"TELBlazor.Components": {
"type": "Direct",
"requested": "[1.4.0, )",
"resolved": "1.4.0",
"contentHash": "2EVdlHZ8E7DZHSE6b+ZUFHTiRq0Vp9+7kMxyRkaRx3Di4B84rwX9Uo3bAzWf/0MrF9/rDslXEUpO/RdCkbECHA==",
"dependencies": {
"Microsoft.AspNetCore.Components.Web": "8.0.14",
"Microsoft.Extensions.DependencyInjection": "8.0.1",
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
"Microsoft.Extensions.Http": "8.0.1",
"Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
}
},
"Microsoft.AspNetCore.Authorization": {
"type": "Transitive",
"resolved": "8.0.14",
Expand Down Expand Up @@ -154,13 +167,6 @@
"resolved": "8.0.0",
"contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA=="
},
"telblazor.components": {
"type": "Project",
"dependencies": {
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
"Microsoft.Extensions.Http": "[8.0.1, )"
}
},
"Microsoft.Extensions.DependencyInjection": {
"type": "CentralTransitive",
"requested": "[8.0.1, )",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@
"Blazored.LocalStorage": "[4.5.0, )",
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
"Serilog": "[4.2.0, )",
"TELBlazor.Components": "[10.9.9, )"
"TELBlazor.Components": "[1.4.0, )"
}
},
"Microsoft.AspNetCore.Components.Web": {
Expand Down
20 changes: 13 additions & 7 deletions TELBlazor.Components.UnitTests/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,19 @@
"xunit.core": "2.4.1"
}
},
"TELBlazor.Components": {
"type": "Direct",
"requested": "[1.4.0, )",
"resolved": "1.4.0",
"contentHash": "2EVdlHZ8E7DZHSE6b+ZUFHTiRq0Vp9+7kMxyRkaRx3Di4B84rwX9Uo3bAzWf/0MrF9/rDslXEUpO/RdCkbECHA==",
"dependencies": {
"Microsoft.AspNetCore.Components.Web": "8.0.14",
"Microsoft.Extensions.DependencyInjection": "8.0.1",
"Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2",
"Microsoft.Extensions.Http": "8.0.1",
"Microsoft.Extensions.Options.ConfigurationExtensions": "8.0.0"
}
},
"xunit": {
"type": "Direct",
"requested": "[2.9.0, )",
Expand Down Expand Up @@ -1666,13 +1679,6 @@
"xunit.extensibility.core": "[2.9.0]"
}
},
"telblazor.components": {
"type": "Project",
"dependencies": {
"Microsoft.AspNetCore.Components.Web": "[8.0.14, )",
"Microsoft.Extensions.Http": "[8.0.1, )"
}
},
"Microsoft.AspNetCore.Components.Web": {
"type": "CentralTransitive",
"requested": "[8.0.14, )",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<p class="nhsuk-tag--green">!!!!!! Change example !!!!!!</p>
<p class="nhsuk-tag--red">!!!!!! If im red we are getting nhsuk-tag-red !!!!!!</p>
<p class="scoped-css-simple-counter-red">if im red we have scoped css (though for our scenario we probably will solely rely on nhsuk)</p>
<div>
<h3 id="graphitti-wall">Graphitti Wall</h3>
<p>I ❤️ 🐄s</p>
</div>
5 changes: 4 additions & 1 deletion TELBlazor.Components/TELBlazor.Components.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,10 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<Target Name="WriteTELBlazorPackageVersionToFile" BeforeTargets="PrepareForBuild">
<Target Name="CleanVersionInfoFile" BeforeTargets="WriteTELBlazorPackageVersionToFile">
<Delete Files="TELBlazorPackageVersion/VersionInfo.cs" />
</Target>
<Target Name="WriteTELBlazorPackageVersionToFile" BeforeTargets="RunGulp">
<WriteLinesToFile File="wwwroot/TELBlazorPackageVersion.txt" Lines="$(TELBlazorPackageVersion)" Overwrite="true" Encoding="UTF-8" />
<WriteLinesToFile File="TELBlazorPackageVersion/VersionInfo.cs" Lines="namespace TELBlazor.Components.TELBlazorPackageVersion { public static class VersionInfo { public static string TELBlazorPackageVersion = &quot;$(TELBlazorPackageVersion)&quot; %3B; } }" Overwrite="true" Encoding="UTF-8" />
</Target>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
namespace TELBlazor.Components.TELBlazorPackageVersion { public static class VersionInfo { public static string TELBlazorPackageVersion = "10.9.9" ;
namespace TELBlazor.Components.TELBlazorPackageVersion { public static class VersionInfo { public static string TELBlazorPackageVersion = "1.4.0" ;
public static string TELFrontEndPackageVersion = "0.0.2"; } }
2 changes: 1 addition & 1 deletion TELBlazor.Components/wwwroot/TELBlazorPackageVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.9.9
1.4.0
3 changes: 2 additions & 1 deletion nuget.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@
<packageSources>
<clear />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<!--set with local environment variable or cicd sed replacement-->

<add key="TELBlazorPackageSource" value="%TELBlazorPackageSource%" />

</packageSources>
<packageSourceCredentials>
<TELBlazorPackageSource>
Expand Down