Skip to content

Commit fafafd2

Browse files
authored
chore: add .net10 supports for nightly build (#10561)
1 parent 1cd5881 commit fafafd2

File tree

9 files changed

+10
-19
lines changed

9 files changed

+10
-19
lines changed

.github/workflows/nightly.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ jobs:
1515
permissions:
1616
packages: write
1717
steps:
18+
- uses: actions/setup-dotnet@v4
19+
with:
20+
dotnet-version: |
21+
10.x
22+
1823
- uses: actions/checkout@v4
1924
with:
2025
fetch-depth: 0
@@ -27,12 +32,10 @@ jobs:
2732
- uses: ./.github/actions/build
2833

2934
- name: dotnet test
30-
id: test-net90
31-
run: dotnet test -c Release -f net9.0 --no-build
35+
run: dotnet test -c Release -f net8.0 --no-build
3236

33-
- name: Report failed tests
34-
if: ${{ failure() && steps.test-net90.outcome == 'failure' }}
35-
uses: ./.github/actions/report-failed-tests
37+
- name: dotnet test
38+
run: dotnet test -c Release -f net10.0 --no-build
3639

3740
- name: dotnet pack
3841
run: dotnet pack -c Release /p:Version=${{ steps.version.outputs.version }} /p:ApiCompatGenerateSuppressionFile=true -o drop/nuget

.github/workflows/reports.yml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
workflow_run:
55
workflows:
66
- ci
7+
- nightly
78
types:
89
- completed
910

Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
44
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(DOCFX_PREVIEW_BUILD)' == 'true'">net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks Condition="'$(DOCFX_PREVIEW_BUILD)' == 'true'">net8.0;net10.0</TargetFrameworks>
66
<LangVersion>Preview</LangVersion>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>

Directory.Packages.props

-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@
1818
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
1919
<PackageVersion Include="Spectre.Console.Cli" Version="0.49.1" />
2020
<PackageVersion Include="Stubble.Core" Version="1.10.8" />
21-
<PackageVersion Include="System.Collections.Immutable" Version="9.0.2" />
2221
<PackageVersion Include="System.Composition" Version="9.0.2" />
23-
<PackageVersion Include="System.Formats.Asn1" Version="9.0.2" />
24-
<PackageVersion Include="System.Text.Json" Version="9.0.2" />
2522
<PackageVersion Include="YamlDotNet" Version="16.3.0" />
2623
</ItemGroup>
2724

src/Docfx.Common/Docfx.Common.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
33
<PackageReference Include="Spectre.Console" />
4-
<PackageReference Include="System.Text.Json" />
54
</ItemGroup>
65

76
<ItemGroup>

src/Docfx.Dotnet/Docfx.Dotnet.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="System.Formats.Asn1" />
2928
<PackageReference Include="HtmlAgilityPack" />
3029
<PackageReference Include="ICSharpCode.Decompiler" />
3130
<PackageReference Include="OneOf" />

src/Docfx.MarkdigEngine/Docfx.MarkdigEngine.csproj

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<ItemGroup>
33
<PackageReference Include="Markdig" />
44
<PackageReference Include="Newtonsoft.Json" />
5-
<PackageReference Include="System.Collections.Immutable" />
65
</ItemGroup>
76

87
<ItemGroup>
-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="System.Collections.Immutable" />
43
<PackageReference Include="Newtonsoft.Json" />
54
</ItemGroup>
65
</Project>

test/Directory.Build.props

-6
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,6 @@
2828
<ProjectReference Include="$(MSBuildThisFileDirectory)Docfx.Tests.Common/Docfx.Tests.Common.csproj" />
2929
</ItemGroup>
3030

31-
<!-- Set additional PackagesReferences to suppress warning MSB3277 (Assembly version conflict) -->
32-
<ItemGroup>
33-
<PackageReference Include="System.Collections.Immutable" />
34-
<PackageReference Include="System.Text.Json" />
35-
</ItemGroup>
36-
3731
<ItemGroup>
3832
<PackageReference Include="AwesomeAssertions" />
3933
<PackageReference Include="Microsoft.NET.Test.Sdk" />

0 commit comments

Comments
 (0)