Skip to content

Commit 1c688fc

Browse files
poppastringpoppastring
authored
Merge pull request #691 from poppastring/upgrade-dotnet-8
Upgrade to dotnet 8
2 parents 2e450a9 + 6b84658 commit 1c688fc

File tree

10 files changed

+66
-66
lines changed

10 files changed

+66
-66
lines changed

‎azure-pipelines.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ pool:
1010

1111
variables:
1212
buildConfiguration: 'Release'
13-
version: 3.4
13+
version: 8.0
1414

1515
steps:
1616
- task: UseDotNet@2
17-
displayName: Installing .NET 6
17+
displayName: Installing .NET 8
1818
inputs:
1919
packageType: 'sdk'
20-
version: '6.0.x'
20+
version: '8.x'
2121
installationPath: $(Agent.ToolsDirectory)/dotnet
2222

2323
- task: PowerShell@2
@@ -65,7 +65,7 @@ steps:
6565
publishWebProjects: True
6666
zipAfterPublish: false
6767
modifyOutputPath: false
68-
arguments: '--configuration $(BuildConfiguration) --output $(Build.ArtifactStagingDirectory)/$(System.TeamProject)_$(Build.BuildNumber) --self-contained --no-build --no-restore'
68+
arguments: '--configuration $(BuildConfiguration) --output $(Build.ArtifactStagingDirectory)/$(System.TeamProject)_$(Build.BuildNumber) '
6969

7070
- task: ArchiveFiles@2
7171
inputs:

‎source/DasBlog.CLI/DasBlog.CLI.csproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<AssemblyName>dasblog-core</AssemblyName>
7-
<Version>3.0.0</Version>
7+
<Version>8.0.0</Version>
88
<PublishRepositoryUrl>true</PublishRepositoryUrl>
99
<EmbedUntrackedSources>true</EmbedUntrackedSources>
1010
<IncludeSymbols>true</IncludeSymbols>
@@ -22,14 +22,14 @@
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="ConsoleTables" Version="2.4.2" />
26-
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="3.1.0" />
27-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
28-
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="6.0.0" />
29-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
30-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
31-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
32-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
25+
<PackageReference Include="ConsoleTables" Version="2.6.1" />
26+
<PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="4.1.0" />
27+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
28+
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="8.0.0" />
29+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
30+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
31+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
32+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3333
</ItemGroup>
3434

3535
<ItemGroup>

‎source/DasBlog.Services/DasBlog.Services.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<Version>3.0.0</Version>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Version>8.0.0</Version>
66
<PublishRepositoryUrl>true</PublishRepositoryUrl>
77
<EmbedUntrackedSources>true</EmbedUntrackedSources>
88
<IncludeSymbols>true</IncludeSymbols>
@@ -12,14 +12,14 @@
1212
<ProjectReference Include="..\DasBlog.Web.Core\DasBlog.Core.csproj" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<PackageReference Include="Coravel" Version="4.1.2" />
16-
<PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
17-
<PackageReference Include="Kveer.XmlRPC" Version="1.2.0" />
18-
<PackageReference Include="MailKit" Version="2.15.0" />
19-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
20-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
21-
<PackageReference Include="Quartz.AspNetCore" Version="3.3.3" />
22-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
15+
<PackageReference Include="Coravel" Version="5.0.2" />
16+
<PackageReference Include="HtmlAgilityPack" Version="1.11.54" />
17+
<PackageReference Include="Kveer.XmlRPC" Version="1.2.1" />
18+
<PackageReference Include="MailKit" Version="4.3.0" />
19+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
20+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
21+
<PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
22+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
2323
</ItemGroup>
2424
<ItemGroup>
2525
<FrameworkReference Include="Microsoft.AspNetCore.App" />

‎source/DasBlog.Tests/DasBlog.Test.Integration/DasBlog.Test.Integration.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
12-
<PackageReference Include="Selenium.Support" Version="4.0.1" />
13-
<PackageReference Include="Selenium.WebDriver" Version="4.0.1" />
14-
<PackageReference Include="xunit" Version="2.4.1" />
15-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
10+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
12+
<PackageReference Include="Selenium.Support" Version="4.15.0" />
13+
<PackageReference Include="Selenium.WebDriver" Version="4.15.0" />
14+
<PackageReference Include="xunit" Version="2.6.2" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="coverlet.collector" Version="3.1.0">
19+
<PackageReference Include="coverlet.collector" Version="6.0.0">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2222
</PackageReference>

‎source/DasBlog.Tests/UnitTests/DasBlog.Tests.UnitTests.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<IsPackable>false</IsPackable>
55
<Configurations>Debug;Release</Configurations>
66
<Platforms>AnyCPU</Platforms>
@@ -59,10 +59,10 @@
5959
<ItemGroup>
6060
<!--<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" />-->
6161
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
62-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
63-
<PackageReference Include="Moq" Version="4.16.1" />
64-
<PackageReference Include="xunit" Version="2.4.1" />
65-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
62+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
63+
<PackageReference Include="Moq" Version="4.20.69" />
64+
<PackageReference Include="xunit" Version="2.6.2" />
65+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
6666
<PrivateAssets>all</PrivateAssets>
6767
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
6868
</PackageReference>

‎source/DasBlog.Tests/UnitTests/UnitTestsConstants.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ public class UnitTestsConstants
66
{
77
private static readonly DirectoryInfo root = new DirectoryInfo(GetProjectBinaryDirectory());
88

9-
public static string TestContentLocation { get { return new DirectoryInfo(Path.Combine(root.Parent.FullName, "net6.0/TestContent")).FullName; } }
9+
public static string TestContentLocation { get { return new DirectoryInfo(Path.Combine(root.Parent.FullName, "net8.0/TestContent")).FullName; } }
1010

11-
public static string TestLoggingLocation { get { return new DirectoryInfo(Path.Combine(root.Parent.FullName, "net6.0/logs")).FullName; } }
11+
public static string TestLoggingLocation { get { return new DirectoryInfo(Path.Combine(root.Parent.FullName, "net8.0/logs")).FullName; } }
1212

1313
public static string GetProjectBinaryDirectory()
1414
{

‎source/DasBlog.Web.Core/DasBlog.Core.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<Configurations>Debug;Release</Configurations>
55
<Platforms>AnyCPU</Platforms>
6-
<Version>3.0.0</Version>
6+
<Version>8.0.0</Version>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
88
<EmbedUntrackedSources>true</EmbedUntrackedSources>
99
<IncludeSymbols>true</IncludeSymbols>
@@ -21,10 +21,10 @@
2121
<ProjectReference Include="..\newtelligence.DasBlog.Runtime\newtelligence.DasBlog.Runtime.csproj" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
25-
<PackageReference Include="NodaTime" Version="3.0.9" />
26-
<PackageReference Include="NetEscapades.Extensions.Logging.RollingFile" Version="2.4.1" />
27-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
24+
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
25+
<PackageReference Include="NodaTime" Version="3.1.9" />
26+
<PackageReference Include="NetEscapades.Extensions.Logging.RollingFile" Version="2.5.0" />
27+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
2828
</ItemGroup>
2929
<ItemGroup>
3030
<FrameworkReference Include="Microsoft.AspNetCore.App" />

‎source/DasBlog.Web.Repositories/DasBlog.Managers.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<Configurations>Debug;Release</Configurations>
55
<Platforms>AnyCPU</Platforms>
6-
<Version>3.0.0</Version>
6+
<Version>8.0.0</Version>
77
<PublishRepositoryUrl>true</PublishRepositoryUrl>
88
<EmbedUntrackedSources>true</EmbedUntrackedSources>
99
<IncludeSymbols>true</IncludeSymbols>
1010
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1111
</PropertyGroup>
1212
<ItemGroup>
13-
<PackageReference Include="NodaTime" Version="3.0.9" />
14-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
13+
<PackageReference Include="NodaTime" Version="3.1.9" />
14+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<FrameworkReference Include="Microsoft.AspNetCore.App" />

‎source/DasBlog.Web.UI/DasBlog.Web.csproj

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<CopyRefAssembliesToPublishDirectory>true</CopyRefAssembliesToPublishDirectory>
55
<CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
66
<AssemblyName>DasBlog.Web</AssemblyName>
@@ -14,26 +14,26 @@
1414
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
1515
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
1616
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
17-
<Version>3.0.0</Version>
17+
<Version>8.0.0</Version>
1818
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1919
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2020
<IncludeSymbols>true</IncludeSymbols>
2121
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
2222
</PropertyGroup>
2323
<ItemGroup>
24-
<PackageReference Include="AutoMapper" Version="10.1.1" />
25-
<PackageReference Include="Coravel" Version="4.1.2" />
26-
<PackageReference Include="Markdig" Version="0.30.4" />
27-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.19.0" />
28-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.0" />
29-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.0" />
30-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.11.1" />
31-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.0" />
32-
<PackageReference Include="NetEscapades.Extensions.Logging.RollingFile" Version="2.4.1" />
24+
<PackageReference Include="AutoMapper" Version="12.0.1" />
25+
<PackageReference Include="Coravel" Version="5.0.2" />
26+
<PackageReference Include="Markdig" Version="0.33.0" />
27+
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
28+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.25" />
29+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.0" />
30+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
31+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.0" />
32+
<PackageReference Include="NetEscapades.Extensions.Logging.RollingFile" Version="2.5.0" />
3333
<PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
3434
<PackageReference Include="reCAPTCHA.AspNetCore" Version="3.0.10" />
35-
<PackageReference Include="Quartz.AspNetCore" Version="3.3.3" />
36-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
35+
<PackageReference Include="Quartz.AspNetCore" Version="3.8.0" />
36+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
3737
</ItemGroup>
3838
<ItemGroup>
3939
<ProjectReference Include="..\DasBlog.CLI\DasBlog.CLI.csproj" />

‎source/newtelligence.DasBlog.Runtime/newtelligence.DasBlog.Runtime.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<Version>3.0.0</Version>
4+
<TargetFramework>net8.0</TargetFramework>
5+
<Version>8.0.0</Version>
66
<PublishRepositoryUrl>true</PublishRepositoryUrl>
77
<EmbedUntrackedSources>true</EmbedUntrackedSources>
88
<IncludeSymbols>true</IncludeSymbols>
99
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="NodaTime" Version="3.0.9" />
14-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
13+
<PackageReference Include="NodaTime" Version="3.1.9" />
14+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
1515
</ItemGroup>
1616
<ItemGroup>
1717
<FrameworkReference Include="Microsoft.AspNetCore.App" />

0 commit comments

Comments
 (0)