Skip to content

Commit a79f45b

Browse files
highcraft-iohighcraft-io
committed
Upgrade to .NET 8
1 parent 988ea8c commit a79f45b

File tree

12 files changed

+85
-80
lines changed

12 files changed

+85
-80
lines changed

‎Examples/BrownsfashionScraper/BrownsfashionScraper.csproj

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>dotnet-BrownsfashionScraper-626F9B50-CA29-4462-A3BC-2B48D45857DC</UserSecretsId>
88
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
13-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
14-
<PackageReference Include="Serilog" Version="3.0.1" />
15-
<PackageReference Include="serilog.aspnetcore" Version="7.0.0" />
16-
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
17-
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
18-
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
19-
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
20-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
21-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
13+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
14+
<PackageReference Include="Serilog" Version="4.0.2" />
15+
<PackageReference Include="serilog.aspnetcore" Version="8.0.3" />
16+
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
17+
<PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0" />
18+
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
19+
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
20+
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
21+
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎Examples/WebReaper.AzureFuncs/WebReaper.AzureFuncs.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
5-
<LangVersion>11</LangVersion>
5+
<LangVersion>12</LangVersion>
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
99
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.OpenApi" Version="1.5.1" />
10-
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.11.0" />
11-
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="7.0.10" />
12-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
13-
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.2.0" />
14-
<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
10+
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.ServiceBus" Version="5.16.4" />
11+
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.10" />
12+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
13+
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.5.0" />
14+
<PackageReference Include="StackExchange.Redis" Version="2.8.16" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<None Update="host.json">

‎Examples/WebReaper.ConsoleApplication/WebReaper.ConsoleApplication.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net7.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<LangVersion>11</LangVersion>

‎Examples/WebReaper.DistributedScraperWorkerService/WebReaper.DistributedScraperWorkerService.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>dotnet-DistributedScraperWorkerService-BDA4CDE4-6E87-4C55-87B5-568C510A73A4</UserSecretsId>
8-
<LangVersion>11</LangVersion>
8+
<LangVersion>12</LangVersion>
99
</PropertyGroup>
1010

1111
<PropertyGroup Condition=" '$(RunConfiguration)' == 'DistributedScraperWorkerService' ">
1212
<ExternalConsole>true</ExternalConsole>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
16-
<PackageReference Include="Serilog" Version="3.0.1" />
17-
<PackageReference Include="serilog.aspnetcore" Version="7.0.0" />
18-
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
19-
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
20-
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
21-
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
22-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
23-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
24-
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
15+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
16+
<PackageReference Include="Serilog" Version="4.0.2" />
17+
<PackageReference Include="serilog.aspnetcore" Version="8.0.3" />
18+
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
19+
<PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0" />
20+
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
21+
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
22+
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
23+
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
24+
<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎Examples/WebReaper.ScraperWorkerService/WebReaper.ScraperWorkerService.csproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<UserSecretsId>dotnet-ScraperWorkerService-D9156731-5295-4079-A291-FD567AEC1775</UserSecretsId>
8-
<LangVersion>11</LangVersion>
8+
<LangVersion>12</LangVersion>
99
</PropertyGroup>
1010

1111
<PropertyGroup Condition=" '$(RunConfiguration)' == 'ScraperWorkerService' ">
1212
<ExternalConsole>true</ExternalConsole>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
16-
<PackageReference Include="Serilog" Version="3.0.1" />
17-
<PackageReference Include="serilog.aspnetcore" Version="7.0.0" />
18-
<PackageReference Include="Serilog.Enrichers.Environment" Version="2.2.0" />
19-
<PackageReference Include="Serilog.Enrichers.Process" Version="2.0.2" />
20-
<PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
21-
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
22-
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
23-
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
24-
<PackageReference Include="Serilog.Sinks.Seq" Version="5.2.2" />
15+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
16+
<PackageReference Include="Serilog" Version="4.0.2" />
17+
<PackageReference Include="serilog.aspnetcore" Version="8.0.3" />
18+
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
19+
<PackageReference Include="Serilog.Enrichers.Process" Version="3.0.0" />
20+
<PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
21+
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
22+
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
23+
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
24+
<PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎Misc/WebReaper.ProxyProviders/WebReaper.ProxyProviders.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<LangVersion>11</LangVersion>
7+
<LangVersion>12</LangVersion>
88
</PropertyGroup>
99

1010
<ItemGroup>

‎WebReaper.Tests/WebReaper.IntegrationTests/ScraperTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public async Task SimpleTestWithSPA()
108108
Path = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
109109
});
110110

111-
await browserFetcher.DownloadAsync(BrowserFetcher.DefaultChromiumRevision);
111+
await browserFetcher.DownloadAsync();
112112

113113
var result = new List<ParsedData>();
114114

@@ -127,7 +127,7 @@ public async Task SimpleTestWithSPA()
127127

128128
_ = engine.RunAsync();
129129

130-
await Task.Delay(20000);
130+
await Task.Delay(40000);
131131

132132
Assert.NotEmpty(result);
133133
}

‎WebReaper.Tests/WebReaper.IntegrationTests/WebReaper.IntegrationTests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99

10-
<LangVersion>11</LangVersion>
10+
<LangVersion>12</LangVersion>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
15-
<PackageReference Include="xunit" Version="2.5.0" />
16-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15+
<PackageReference Include="xunit" Version="2.9.2" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="coverlet.collector" Version="6.0.0">
20+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
<PrivateAssets>all</PrivateAssets>
2323
</PackageReference>

‎WebReaper.Tests/WebReaper.UnitTests/WebReaper.UnitTests.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

88
<IsPackable>false</IsPackable>
99

10-
<LangVersion>11</LangVersion>
10+
<LangVersion>12</LangVersion>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
15-
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
16-
<PackageReference Include="xunit" Version="2.5.0" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
14+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15+
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
16+
<PackageReference Include="xunit" Version="2.9.2" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
<PrivateAssets>all</PrivateAssets>
2020
</PackageReference>
21-
<PackageReference Include="coverlet.collector" Version="6.0.0">
21+
<PackageReference Include="coverlet.collector" Version="6.0.2">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>

‎WebReaper/Core/Loaders/Concrete/PuppeteerPageLoader.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Reflection;
22
using Microsoft.Extensions.Logging;
33
using PuppeteerSharp;
4+
using PuppeteerSharp.BrowserData;
45
using WebReaper.Core.CookieStorage.Abstract;
56
using WebReaper.Core.Loaders.Abstract;
67
using WebReaper.Domain.PageActions;
@@ -30,10 +31,13 @@ public async Task<string> Load(string url, List<PageAction>? pageActions = null,
3031
});
3132

3233
await _semaphore.WaitAsync();
34+
35+
InstalledBrowser installedBrowser;
36+
3337
try
3438
{
3539
Logger.LogInformation("{class}.{method}: Downloading browser...", nameof(PuppeteerPageLoader), nameof(Load));
36-
await browserFetcher.DownloadAsync(BrowserFetcher.DefaultChromiumRevision);
40+
installedBrowser = await browserFetcher.DownloadAsync();
3741
Logger.LogInformation("{class}.{method}: Browser is downloaded", nameof(PuppeteerPageLoader), nameof(Load));
3842
}
3943
finally
@@ -45,7 +49,8 @@ public async Task<string> Load(string url, List<PageAction>? pageActions = null,
4549
await using var browser = await Puppeteer.LaunchAsync(new LaunchOptions
4650
{
4751
Headless = headless,
48-
ExecutablePath = browserFetcher.RevisionInfo(BrowserFetcher.DefaultChromiumRevision).ExecutablePath
52+
ExecutablePath = browserFetcher.GetExecutablePath(installedBrowser.BuildId),
53+
Args = new[] { "--ignore-certificate-errors" }
4954
});
5055

5156
Logger.LogInformation("{class}.{method}: creating a new page", nameof(PuppeteerPageLoader), nameof(Load));

0 commit comments

Comments
 (0)