Skip to content

Commit 5ab158d

Browse files
trejjamtrejjam
authored
Add net 10 target (#212)
* Bump * Add net10 actions SDK * Add net10 target * Update dependencies * Add global.json * Fix test step * Disable VS test adapter * Enable RestorePackagesWithLockFile * Add Microsoft.Testing.Extensions.TrxReport * Add packages.lock.json * Update NonBlockingFileSystem * Add missing OutputType * Update Microsoft.Bcl.TimeProvider * Update packages.lock.json
1 parent 148a99c commit 5ab158d

File tree

12 files changed

+3174
-142
lines changed

12 files changed

+3174
-142
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,25 @@ jobs:
2020
dotnet-version: |
2121
8.0.x
2222
9.0.x
23+
10.0.x
2324
- uses: actions/checkout@v5
2425
- name: Restore
2526
run: dotnet restore --nologo
2627
- name: Build
2728
run: dotnet build --no-restore --nologo --configuration Release
2829
- name: Test
29-
run: dotnet test --nologo --no-build --configuration Release
30+
run: dotnet test --no-build --configuration Release
3031

3132
code-style:
3233
runs-on: ubuntu-latest
3334
env:
3435
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
3536
steps:
3637
- uses: actions/checkout@v5
37-
- name: Setup .Net 9.0.x
38+
- name: Setup .Net 10.0.x
3839
uses: actions/setup-dotnet@v5
3940
with:
40-
dotnet-version: '9.0.x'
41+
dotnet-version: '10.0.x'
4142
- name: Retore
4243
run: dotnet restore --nologo
4344
- name: .Net Format

‎.github/workflows/nightly-release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ jobs:
1717
dotnet-version: |
1818
8.0.x
1919
9.0.x
20+
10.0.x
2021
- uses: actions/checkout@v5
2122
- name: Fetch all history for all tags and branches
2223
run: git fetch --prune --unshallow

‎.github/workflows/pr-build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@ jobs:
2020
dotnet-version: |
2121
8.0.x
2222
9.0.x
23+
10.0.x
2324
- uses: actions/checkout@v5
2425
- name: Restore
2526
run: dotnet restore --nologo
2627
- name: Build
2728
run: dotnet build --no-restore --nologo --configuration Release
2829
- name: Test
29-
run: dotnet test --nologo --no-build --configuration Release
30+
run: dotnet test --no-build --configuration Release
3031
- name: Pack
3132
run: dotnet pack --nologo --no-build --configuration Release --output nuget-packages src/GitReader.SourceGenerator/GitReader.SourceGenerator.csproj
3233

@@ -36,10 +37,10 @@ jobs:
3637
DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
3738
steps:
3839
- uses: actions/checkout@v5
39-
- name: Setup .Net 9.0.x
40+
- name: Setup .Net 10.0.x
4041
uses: actions/setup-dotnet@v5
4142
with:
42-
dotnet-version: '9.0.x'
43+
dotnet-version: '10.0.x'
4344
- name: Retore
4445
run: dotnet restore --nologo
4546
- name: .Net Format

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ jobs:
1919
dotnet-version: |
2020
8.0.x
2121
9.0.x
22+
10.0.x
2223
- uses: actions/checkout@v5
2324
- name: Fetch all history for all tags and branches
2425
run: git fetch --prune --unshallow

‎GitReader.SourceGenerator.sln.DotSettings‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2-
<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=Testing_0020Platform/@EntryIndexedValue">False</s:Boolean></wpf:ResourceDictionary>
2+
<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=Testing_0020Platform/@EntryIndexedValue">False</s:Boolean>
3+
<s:Boolean x:Key="/Default/Environment/UnitTesting/DisabledProviders/=VsTest/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎global.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"test": {
3+
"runner": "Microsoft.Testing.Platform"
4+
}
5+
}

‎src/GitReader.SourceGenerator.Tests/GitReader.SourceGenerator.Tests.csproj‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,76 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5-
<LangVersion>13.0</LangVersion>
6-
<Nullable>enable</Nullable>
7-
<IsPackable>false</IsPackable>
8-
</PropertyGroup>
9-
10-
<PropertyGroup>
11-
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
12-
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
13-
</PropertyGroup>
14-
15-
<Import Project="..\WarningConfiguration.targets" />
16-
17-
<ItemGroup>
18-
<PackageReference Include="GitReader" Version="1.10.0" />
19-
<PackageReference Include="H.Generators.Extensions" Version="1.24.2" />
20-
<PackageReference Include="H.Generators.Tests.Extensions" Version="1.24.2" />
21-
<PackageReference Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
22-
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" PrivateAssets="all" />
23-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" PrivateAssets="all" />
24-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
25-
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
26-
<PackageReference Include="Verify.XUnitV3" Version="30.5.0" />
27-
<PackageReference Include="Verify.SourceGenerators" Version="2.5.0" />
28-
<PackageReference Include="xunit.v3" Version="3.0.0" />
29-
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
30-
<PrivateAssets>all</PrivateAssets>
31-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
32-
</PackageReference>
33-
</ItemGroup>
34-
35-
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
36-
<PackageReference Include="System.Text.Json" Version="8.0.6" />
37-
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
38-
</ItemGroup>
39-
40-
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
41-
<PackageReference Include="System.Text.Json" Version="9.0.8" />
42-
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.7.0" />
43-
</ItemGroup>
44-
45-
<ItemGroup>
46-
<ProjectReference Include="..\GitReader.SourceGenerator\GitReader.SourceGenerator.csproj" />
47-
</ItemGroup>
48-
49-
<ItemGroup>
50-
<None Update="GitReaderSnapshotTests.*.g.verified.cs">
51-
<DependentUpon>GitReaderSnapshotTests.cs</DependentUpon>
52-
</None>
53-
</ItemGroup>
54-
55-
<Target Name="ExtractSnapshots" BeforeTargets="Restore;_GenerateRestoreProjectSpec">
56-
<Message Importance="High" Text="Extracting $(MSBuildProjectDirectory)/../../v-tag-repository.zip to the $(MSBuildProjectDirectory)/../../repository-snapshots" />
57-
<Message Importance="High" Text="Extracting $(MSBuildProjectDirectory)/../../tag-repository.zip to the $(MSBuildProjectDirectory)/../../repository-snapshots" />
58-
<Message Importance="High" Text="Extracting $(MSBuildProjectDirectory)/../../no-tag-repository.zip to the $(MSBuildProjectDirectory)/../../repository-snapshots" />
59-
60-
<Unzip SourceFiles="$(MSBuildProjectDirectory)/../../repository-snapshots/v-tag-repository.zip"
61-
DestinationFolder="$(MSBuildProjectDirectory)/../../repository-snapshots"
62-
Condition="!Exists('$(MSBuildProjectDirectory)/../../repository-snapshots/v-tag-repository')"
63-
OverwriteReadOnlyFiles="true" />
64-
65-
<Unzip SourceFiles="$(MSBuildProjectDirectory)/../../repository-snapshots/tag-repository.zip"
66-
DestinationFolder="$(MSBuildProjectDirectory)/../../repository-snapshots"
67-
Condition="!Exists('$(MSBuildProjectDirectory)/../../repository-snapshots/tag-repository')"
68-
OverwriteReadOnlyFiles="true" />
69-
70-
<Unzip SourceFiles="$(MSBuildProjectDirectory)/../../repository-snapshots/no-tag-repository.zip"
71-
DestinationFolder="$(MSBuildProjectDirectory)/../../repository-snapshots"
72-
Condition="!Exists('$(MSBuildProjectDirectory)/../../repository-snapshots/no-tag-repository')"
73-
OverwriteReadOnlyFiles="true" />
74-
</Target>
75-
76-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<OutputType>Exe</OutputType>
5+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
6+
<LangVersion>14.0</LangVersion>
7+
<Nullable>enable</Nullable>
8+
<IsPackable>false</IsPackable>
9+
</PropertyGroup>
10+
11+
<PropertyGroup>
12+
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
13+
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
14+
</PropertyGroup>
15+
16+
<Import Project="..\WarningConfiguration.targets" />
17+
18+
<ItemGroup>
19+
<PackageReference Include="GitReader" Version="1.16.0" />
20+
<PackageReference Include="H.Generators.Extensions" Version="1.24.2" />
21+
<PackageReference Include="H.Generators.Tests.Extensions" Version="1.24.2" />
22+
<PackageReference Include="Microsoft.Bcl.TimeProvider" Version="10.0.0" />
23+
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="4.14.0" PrivateAssets="all" />
24+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" PrivateAssets="all" />
25+
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0" />
26+
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
27+
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
28+
<PackageReference Include="Verify.XUnitV3" Version="31.6.0" />
29+
<PackageReference Include="Verify.SourceGenerators" Version="2.5.0" />
30+
<PackageReference Include="xunit.v3.mtp-v2" Version="3.2.0" />
31+
</ItemGroup>
32+
33+
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
34+
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.10.0" />
35+
</ItemGroup>
36+
37+
<ItemGroup Condition=" '$(TargetFramework)' == 'net9.0' ">
38+
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.10.0" />
39+
</ItemGroup>
40+
41+
<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
42+
<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.0.0" />
43+
</ItemGroup>
44+
45+
<ItemGroup>
46+
<ProjectReference Include="..\GitReader.SourceGenerator\GitReader.SourceGenerator.csproj" />
47+
</ItemGroup>
48+
49+
<ItemGroup>
50+
<None Update="GitReaderSnapshotTests.*.g.verified.cs">
51+
<DependentUpon>GitReaderSnapshotTests.cs</DependentUpon>
52+
</None>
53+
</ItemGroup>
54+
55+
<Target Name="ExtractSnapshots" BeforeTargets="Restore;_GenerateRestoreProjectSpec">
56+
<Message Importance="High" Text="Extracting $(MSBuildProjectDirectory)/../../v-tag-repository.zip to the $(MSBuildProjectDirectory)/../../repository-snapshots" />
57+
<Message Importance="High" Text="Extracting $(MSBuildProjectDirectory)/../../tag-repository.zip to the $(MSBuildProjectDirectory)/../../repository-snapshots" />
58+
<Message Importance="High" Text="Extracting $(MSBuildProjectDirectory)/../../no-tag-repository.zip to the $(MSBuildProjectDirectory)/../../repository-snapshots" />
59+
60+
<Unzip SourceFiles="$(MSBuildProjectDirectory)/../../repository-snapshots/v-tag-repository.zip"
61+
DestinationFolder="$(MSBuildProjectDirectory)/../../repository-snapshots"
62+
Condition="!Exists('$(MSBuildProjectDirectory)/../../repository-snapshots/v-tag-repository')"
63+
OverwriteReadOnlyFiles="true" />
64+
65+
<Unzip SourceFiles="$(MSBuildProjectDirectory)/../../repository-snapshots/tag-repository.zip"
66+
DestinationFolder="$(MSBuildProjectDirectory)/../../repository-snapshots"
67+
Condition="!Exists('$(MSBuildProjectDirectory)/../../repository-snapshots/tag-repository')"
68+
OverwriteReadOnlyFiles="true" />
69+
70+
<Unzip SourceFiles="$(MSBuildProjectDirectory)/../../repository-snapshots/no-tag-repository.zip"
71+
DestinationFolder="$(MSBuildProjectDirectory)/../../repository-snapshots"
72+
Condition="!Exists('$(MSBuildProjectDirectory)/../../repository-snapshots/no-tag-repository')"
73+
OverwriteReadOnlyFiles="true" />
74+
</Target>
75+
76+
</Project>

0 commit comments

Comments
 (0)