Skip to content

Commit 9f9678a

Browse files
tomashercegtomasherceg
authored
Merge pull request #1917 from riganti/bump-net8
Bump .NET Core dependency to net8.0 (and net9.0 in aspnetcorelatest)
2 parents e7b9c2b + e0790d4 commit 9f9678a

File tree

34 files changed

+69
-83
lines changed

34 files changed

+69
-83
lines changed

‎.github/setup/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ runs:
3636
with:
3737
dotnet-version: |
3838
8.0.x
39-
6.0.x
39+
9.0.x
4040
- if: ${{ runner.os == 'Windows' }}
4141
uses: microsoft/setup-msbuild@v1.1
4242

‎.github/workflows/main.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,43 +37,43 @@ jobs:
3737

3838
# framework
3939
- name: Core
40-
run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
40+
run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
4141
- name: Framework
42-
run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
42+
run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
4343
- name: Testing
44-
run: dotnet build src/Framework/Testing --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
44+
run: dotnet build src/Framework/Testing --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
4545

4646
# hosting
4747
- name: Hosting.AspNetCore
48-
run: dotnet build src/Framework/Hosting.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
48+
run: dotnet build src/Framework/Hosting.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
4949

5050
# command-line
5151
- name: CommandLine
52-
run: dotnet build src/Tools/CommandLine --configuration ${{ matrix.configuration }} --no-restore --framework net6.0 /WarnAsError
52+
run: dotnet build src/Tools/CommandLine --configuration ${{ matrix.configuration }} --no-restore --framework net8.0 /WarnAsError
5353

5454
# swashbuckle
5555
- name: Api.Swashbuckle.AspNetCore
56-
run: dotnet build src/Api/Swashbuckle.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
56+
run: dotnet build src/Api/Swashbuckle.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
5757

5858
# hot reload
5959
- name: HotReload.Common
60-
run: dotnet build src/Tools/HotReload/Common --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
60+
run: dotnet build src/Tools/HotReload/Common --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
6161
- name: HotReload.AspNetCore
62-
run: dotnet build src/Tools/HotReload/AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
62+
run: dotnet build src/Tools/HotReload/AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
6363

6464
# application insights
6565
- name: Tracing.ApplicationInsights
66-
run: dotnet build src/Tracing/ApplicationInsights --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
66+
run: dotnet build src/Tracing/ApplicationInsights --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
6767
- name: Tracing.ApplicationInsights.AspNetCore
68-
run: dotnet build src/Tracing/ApplicationInsights.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
68+
run: dotnet build src/Tracing/ApplicationInsights.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
6969

7070
# miniprofiler
7171
- name: Tracing.MiniProfiler.AspNetCore
72-
run: dotnet build src/Tracing/MiniProfiler.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
72+
run: dotnet build src/Tracing/MiniProfiler.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
7373

7474
# dynamic data
7575
- name: DynamicData
76-
run: dotnet build src/DynamicData/DynamicData --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
76+
run: dotnet build src/DynamicData/DynamicData --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
7777

7878
build-all:
7979
name: Build all projects without errors
@@ -125,15 +125,15 @@ jobs:
125125
title: Framework Tests
126126
github-token: ${{ secrets.GITHUB_TOKEN }}
127127
target-framework: net472
128-
- name: Analyzers.Tests (net6.0)
128+
- name: Analyzers.Tests (net8.0)
129129
uses: ./.github/unittest
130130
if: ${{ success() || failure() }}
131131
with:
132132
project: src/Analyzers/Analyzers.Tests
133133
name: analyzers-tests
134134
title: Analyzer Tests
135135
github-token: ${{ secrets.GITHUB_TOKEN }}
136-
target-framework: net6.0
136+
target-framework: net8.0
137137
# - name: Analyzers.Tests (net7.0)
138138
# uses: ./.github/unittest
139139
# with:

‎src/Analyzers/Analyzers.Tests/DotVVM.Analyzers.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
55
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
66
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
77
<Nullable>enable</Nullable>

‎src/Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

‎src/Api/Swashbuckle.AspNetCore/DotVVM.Framework.Api.Swashbuckle.AspNetCore.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks>$(DotnetCoreTargetVersion)</TargetFrameworks>
55
<PackageId>DotVVM.Api.Swashbuckle.AspNetCore</PackageId>
66
<Description>Swashbuckle.AspNetCore extensions for DotVVM.</Description>
77
</PropertyGroup>

‎src/Directory.Build.props‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,12 @@
2525
<NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
2626
<Deterministic>true</Deterministic>
2727
<PreserveCompilationContext>true</PreserveCompilationContext>
28-
<DefaultTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.1;net6.0;net472</DefaultTargetFrameworks>
29-
<DefaultTargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.1;net6.0</DefaultTargetFrameworks>
28+
<OldFrameworkTargetVersion>net472</OldFrameworkTargetVersion>
29+
<DotnetCoreTargetVersion>net8.0</DotnetCoreTargetVersion>
30+
<DotnetCoreLatestTargetVersion>net9.0</DotnetCoreLatestTargetVersion>
31+
<!-- we keep netstandard2.1 target, because it quite reliably disallows using new .NET Core APIs which would other only fail on Windows -->
32+
<DefaultTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.1;$(DotnetCoreTargetVersion);$(OldFrameworkTargetVersion)</DefaultTargetFrameworks>
33+
<DefaultTargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.1;$(DotnetCoreTargetVersion);</DefaultTargetFrameworks>
3034
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
3135
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
3236
</PropertyGroup>

‎src/Framework/Core/DotVVM.Core.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
<EmbeddedResource Include="compiler\resources\**\*" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
2019
</ItemGroup>
2120
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
2221
<PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
22+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
2323
</ItemGroup>
2424
<ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
2525
<Reference Include="System" />
@@ -28,6 +28,7 @@
2828
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
2929
<PrivateAssets>all</PrivateAssets>
3030
</PackageReference>
31+
<PackageReference Include="System.Text.Json" Version="8.0.5" />
3132
</ItemGroup>
3233
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
3334
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>

‎src/Framework/Framework/Compilation/DotvvmCompilationException.cs‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ public DotvvmCompilationException(DotvvmCompilationDiagnostic primaryError, IEnu
9191
}
9292

9393
public DotvvmCompilationException(string message, IEnumerable<TokenBase>? tokens) : this(message, null, tokens) { }
94-
protected DotvvmCompilationException(
95-
SerializationInfo info,
96-
StreamingContext context) : base(info, context)
97-
{
98-
CompilationError = new DotvvmCompilationDiagnostic(this.Message, DiagnosticSeverity.Error, null, innerException: this.InnerException);
99-
}
10094

10195
/// <summary> Creates a compilation error if the provided list of diagnostics contains an error. </summary>
10296
public static DotvvmCompilationException? TryCreateFromDiagnostics(IEnumerable<DotvvmCompilationDiagnostic> diagnostics)

‎src/Framework/Framework/Configuration/DotvvmConfigurationException.cs‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,5 @@ private static void BuildControlsMessage(List<DotvvmConfigurationAssertResult<Do
102102
}
103103
}
104104
}
105-
106-
protected DotvvmConfigurationException(SerializationInfo info, StreamingContext context) : base(info, context)
107-
{
108-
}
109105
}
110106
}

‎src/Framework/Framework/DotVVM.Framework.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<AssemblyTitle>DotVVM</AssemblyTitle>
4-
<TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
4+
<TargetFrameworks>$(DefaultTargetFrameworks);$(DotnetCoreLatestTargetVersion)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
77
<SignAssembly>true</SignAssembly>

0 commit comments

Comments
 (0)