Skip to content

Commit 236f3b1

Browse files
committed
Adapting to github codespaces, upgraded to .net 7
1 parent 1ebe3b6 commit 236f3b1

File tree

4 files changed

+16
-13
lines changed

4 files changed

+16
-13
lines changed

.devcontainer/devcontainer.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
"name": "C# (.NET)",
33
"image": "mcr.microsoft.com/devcontainers/dotnet:0-7.0",
44
"features": {
5-
"ghcr.io/devcontainers/features/node:1": {
6-
"version": "lts"
7-
}
5+
"ghcr.io/devcontainers/features/node:1": {},
6+
"ghcr.io/devcontainers/features/common-utils:1": {}
87
},
98
"customizations": {
109
"vscode": {

Codeuctivity.HtmlRenderer/Renderer.cs

+6-4
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ private async Task<Renderer> InitializeAsync(BrowserFetcher browserFetcher)
6565

6666
private LaunchOptions SystemSpecificConfig()
6767
{
68-
if (string.IsNullOrEmpty(LaunchOptions) && (IsRunningOnWsl() || IsRunningOnAzureLinux()))
68+
if (string.IsNullOrEmpty(LaunchOptions) && (IsRunningOnWslOrAzure() || IsRunningOnAzureLinux()))
6969
{
7070
return new LaunchOptions { Headless = true, Args = new string[] { "--no-sandbox" } };
7171
}
@@ -85,16 +85,18 @@ private static bool IsRunningOnAzureLinux()
8585
return RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && websiteSku.IndexOf("Linux", StringComparison.OrdinalIgnoreCase) >= 0;
8686
}
8787

88-
private static bool IsRunningOnWsl()
88+
private static bool IsRunningOnWslOrAzure()
8989
{
9090
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
9191
{
9292
return false;
9393
}
9494

9595
var version = File.ReadAllText("/proc/version");
96-
var IsWsl = version.IndexOf("Microsoft", StringComparison.OrdinalIgnoreCase) >= 0;
97-
return IsWsl;
96+
var IsAzure = version.IndexOf("Microsoft", StringComparison.OrdinalIgnoreCase) >= 0;
97+
var IsWsl = version.IndexOf("azure", StringComparison.OrdinalIgnoreCase) >= 0;
98+
99+
return IsWsl || IsAzure;
98100
}
99101

100102
/// <summary>

Codeuctivity.HtmlRendererCliTests/Codeuctivity - Backup.HtmlRendererCliTests.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
11-
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.46.0.54807">
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
11+
<PackageReference Include="SonarAnalyzer.CSharp" Version="8.48.0.56517">
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
<PrivateAssets>all</PrivateAssets>
1414
</PackageReference>

Codeuctivity.HtmlRendererTests/RendererTests.cs

+6-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public async Task ShouldConvertHtmlToPdf(string testFileName)
3333

3434
using var rasterize = new Rasterizer();
3535

36-
if (!IsRunningOnWsl())
36+
if (!IsRunningOnWslOrAzure())
3737
{
3838
var actualImages = await rasterize.ConvertToPngAsync(actualFilePath, actualImagePathDirectory);
3939
Assert.Single(actualImages);
@@ -43,16 +43,18 @@ public async Task ShouldConvertHtmlToPdf(string testFileName)
4343
await ChromiumProcessDisposedAsserter.AssertNoChromeProcessIsRunning();
4444
}
4545

46-
private static bool IsRunningOnWsl()
46+
private static bool IsRunningOnWslOrAzure()
4747
{
4848
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
4949
{
5050
return false;
5151
}
5252

5353
var version = File.ReadAllText("/proc/version");
54-
var IsWsl = version.Contains("Microsoft", StringComparison.InvariantCultureIgnoreCase);
55-
return IsWsl;
54+
var IsAzure = version.IndexOf("Microsoft", StringComparison.OrdinalIgnoreCase) >= 0;
55+
var IsWsl = version.IndexOf("azure", StringComparison.OrdinalIgnoreCase) >= 0;
56+
57+
return IsWsl || IsAzure;
5658
}
5759

5860
[Theory]

0 commit comments

Comments
 (0)