Skip to content

Commit

Permalink
feat: Support csharp 13 (#3137)
Browse files Browse the repository at this point in the history
* chore(deps): update roslyn to 4.12.0

* Update package lock files

* Rename files and classes to CSharp

* Allow CSharp 13 language version

* chore(deps): update roslyn to 4.12.0

* Update package lock files

* Add csharp13 language constructs

* update package lock files

* Use dotnet 9 in pipelines

* Update integration test results

* Use dotnet 9

* Update package lock files

* We need both dotnet 8 and dotnet 9

* more dotnet 9

* Add more logging on missing node type

* Delete unused solution file

* More debug info

* net 8 or greater compiler directive does not make sense here

* Update ValidateStrykerResults counts

* Update ValidateStrykerResults count

---------

Co-authored-by: Renovatebot <[email protected]>
Co-authored-by: Rouke Broersma <[email protected]>
Co-authored-by: Rouke Broersma <[email protected]>
  • Loading branch information
4 people authored Dec 24, 2024
1 parent 67dd00d commit e567ab3
Show file tree
Hide file tree
Showing 43 changed files with 344 additions and 251 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ jobs:
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.x
- uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.x
- name: Pack integration test package
run: dotnet pack ${{ github.workspace }}/src/Stryker.CLI/Stryker.CLI/Stryker.CLI.csproj -p:PackageVersion=$VERSION --output ${{ github.workspace }}/publish
- name: Publish integration test package
Expand Down
20 changes: 20 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ stages:
displayName: 'Use dotnet'
inputs:
version: 8.x
- task: UseDotNet@2
displayName: 'Use dotnet'
inputs:
version: 9.x
- template: pipeline-templates/populate-cache-steps.yml
- task: SonarCloudPrepare@3
inputs:
Expand Down Expand Up @@ -81,6 +85,10 @@ stages:
displayName: 'Use dotnet'
inputs:
version: 8.x
- task: UseDotNet@2
displayName: 'Use dotnet'
inputs:
version: 9.x
- task: DotNetCoreCLI@2
displayName: 'Install dotnet-stryker'
inputs:
Expand All @@ -101,6 +109,10 @@ stages:
displayName: 'Use dotnet'
inputs:
version: 8.x
- task: UseDotNet@2
displayName: 'Use dotnet'
inputs:
version: 9.x
- task: DotNetCoreCLI@2
displayName: 'Install dotnet-stryker'
inputs:
Expand Down Expand Up @@ -133,6 +145,10 @@ stages:
displayName: 'Use dotnet'
inputs:
version: 8.x
- task: UseDotNet@2
displayName: 'Use dotnet'
inputs:
version: 9.x
- task: DotNetCoreCLI@2
displayName: 'Pack integrationtest packages'
inputs:
Expand Down Expand Up @@ -269,6 +285,10 @@ stages:
displayName: 'Use dotnet'
inputs:
version: 8.x
- task: UseDotNet@2
displayName: 'Use dotnet'
inputs:
version: 9.x
- task: DotNetCoreCLI@2
displayName: 'Pack Stryker.CLI'
inputs:
Expand Down
66 changes: 0 additions & 66 deletions integrationtest/TargetProjects/IntegrationTestApp.sln

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net8.0": {
"net9.0": {
"coverlet.collector": {
"type": "Direct",
"requested": "[6.0.2, )",
Expand Down Expand Up @@ -42,8 +42,8 @@
},
"Microsoft.CodeAnalysis.Common": {
"type": "Transitive",
"resolved": "4.11.0",
"contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
"resolved": "4.12.0",
"contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==",
"dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "8.0.0",
Expand Down Expand Up @@ -142,7 +142,7 @@
"type": "Project",
"dependencies": {
"Library": "[4.4.1, )",
"Microsoft.CodeAnalysis.Common": "[4.11.0, )",
"Microsoft.CodeAnalysis.Common": "[4.12.0, )",
"Serilog": "[4.2.0, )"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces"
Version="4.11.0"
Version="4.12.0"
PrivateAssets="all" />
</ItemGroup>
</Project>
28 changes: 14 additions & 14 deletions integrationtest/TargetProjects/NetCore/Generator/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
".NETStandard,Version=v2.0": {
"Microsoft.CodeAnalysis.CSharp.Workspaces": {
"type": "Direct",
"requested": "[4.11.0, )",
"resolved": "4.11.0",
"contentHash": "/oRJPIMvzOfiunIegSF6FEa4VvBAUSXlbLDKxyzXuOZN9nLHg3fHuX6Mr9JZLNIupbe2xqQZEmfsPxgB01vCmg==",
"requested": "[4.12.0, )",
"resolved": "4.12.0",
"contentHash": "ZZ08UBgL3f3VeVvRA1k+PGZYbCIy2EBX4nBld/1ndsaoUZcwqkUaXbljjpoJ5reozpRrBPMUJ0E34REaVgYKjw==",
"dependencies": {
"Humanizer.Core": "2.14.1",
"Microsoft.Bcl.AsyncInterfaces": "8.0.0",
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"Microsoft.CodeAnalysis.CSharp": "[4.11.0]",
"Microsoft.CodeAnalysis.Common": "[4.11.0]",
"Microsoft.CodeAnalysis.Workspaces.Common": "[4.11.0]",
"Microsoft.CodeAnalysis.CSharp": "[4.12.0]",
"Microsoft.CodeAnalysis.Common": "[4.12.0]",
"Microsoft.CodeAnalysis.Workspaces.Common": "[4.12.0]",
"System.Buffers": "4.5.1",
"System.Collections.Immutable": "8.0.0",
"System.Composition": "8.0.0",
Expand Down Expand Up @@ -56,8 +56,8 @@
},
"Microsoft.CodeAnalysis.Common": {
"type": "Transitive",
"resolved": "4.11.0",
"contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
"resolved": "4.12.0",
"contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==",
"dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Buffers": "4.5.1",
Expand All @@ -72,11 +72,11 @@
},
"Microsoft.CodeAnalysis.CSharp": {
"type": "Transitive",
"resolved": "4.11.0",
"contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==",
"resolved": "4.12.0",
"contentHash": "30vVQ1MizeC22iEdEvI2w0eTIYG43/L20yBzuQH01xKzJgHAoWehzI2F8u07o4mXh4DGMOjQF7aEm0zzvsG3Mg==",
"dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"Microsoft.CodeAnalysis.Common": "[4.11.0]",
"Microsoft.CodeAnalysis.Common": "[4.12.0]",
"System.Buffers": "4.5.1",
"System.Collections.Immutable": "8.0.0",
"System.Memory": "4.5.5",
Expand All @@ -89,13 +89,13 @@
},
"Microsoft.CodeAnalysis.Workspaces.Common": {
"type": "Transitive",
"resolved": "4.11.0",
"contentHash": "UtwEt42V7/LnvAcschSlmUXRLEj0poX1H7QeFbY5bezcS+tJBCssAq8C7GfisgIA0qZPo2xzOrwKGBbg51CetA==",
"resolved": "4.12.0",
"contentHash": "9WFrMPm/k72qo7pxn6hPIS/UIAFVS/2yKBWJAW+kkmcY8PCsuBgp5ms+pmRI3mjAf7J1SmpdgHpRj2x1Gqc+9A==",
"dependencies": {
"Humanizer.Core": "2.14.1",
"Microsoft.Bcl.AsyncInterfaces": "8.0.0",
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"Microsoft.CodeAnalysis.Common": "[4.11.0]",
"Microsoft.CodeAnalysis.Common": "[4.12.0]",
"System.Buffers": "4.5.1",
"System.Collections.Immutable": "8.0.0",
"System.Composition": "8.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"net6.0": {
"FSharp.Core": {
"type": "Direct",
"requested": "[8.0.403, )",
"resolved": "8.0.403",
"contentHash": "t1Pvv2++3zMQKKNuiQc1Lz4TCdaBajgG4mLhOE8AoFzborHQ/JbjIaJr6Mrq8m2z15KLu4r6Qz7E3oeACpljTg=="
"requested": "[9.0.100, )",
"resolved": "9.0.100",
"contentHash": "ye8yagHGsH08H2Twno5GRWkSbrMtxK/SWiHuPcF+3nODpW65/VJ8RO0aWxp8n9+KQbmahg90wAEL3TEXjF0r6A=="
},
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
Expand Down Expand Up @@ -110,7 +110,7 @@
"library.fsharp": {
"type": "Project",
"dependencies": {
"FSharp.Core": "[8.0.403, )"
"FSharp.Core": "[9.0.100, )"
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"net6.0": {
"FSharp.Core": {
"type": "Direct",
"requested": "[8.0.403, )",
"resolved": "8.0.403",
"contentHash": "t1Pvv2++3zMQKKNuiQc1Lz4TCdaBajgG4mLhOE8AoFzborHQ/JbjIaJr6Mrq8m2z15KLu4r6Qz7E3oeACpljTg=="
"requested": "[9.0.100, )",
"resolved": "9.0.100",
"contentHash": "ye8yagHGsH08H2Twno5GRWkSbrMtxK/SWiHuPcF+3nODpW65/VJ8RO0aWxp8n9+KQbmahg90wAEL3TEXjF0r6A=="
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net8.0": {
"net9.0": {
"coverlet.collector": {
"type": "Direct",
"requested": "[6.0.2, )",
Expand Down Expand Up @@ -52,8 +52,8 @@
},
"Microsoft.CodeAnalysis.Common": {
"type": "Transitive",
"resolved": "4.11.0",
"contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
"resolved": "4.12.0",
"contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==",
"dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "8.0.0",
Expand Down Expand Up @@ -164,7 +164,7 @@
"type": "Project",
"dependencies": {
"Library": "[4.4.1, )",
"Microsoft.CodeAnalysis.Common": "[4.11.0, )",
"Microsoft.CodeAnalysis.Common": "[4.12.0, )",
"Serilog": "[4.2.0, )"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net8.0": {
"net9.0": {
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
"requested": "[17.12.0, )",
Expand Down Expand Up @@ -31,8 +31,8 @@
},
"Microsoft.CodeAnalysis.Common": {
"type": "Transitive",
"resolved": "4.11.0",
"contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
"resolved": "4.12.0",
"contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==",
"dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "8.0.0",
Expand Down Expand Up @@ -91,7 +91,7 @@
"type": "Project",
"dependencies": {
"Library": "[4.4.1, )",
"Microsoft.CodeAnalysis.Common": "[4.11.0, )",
"Microsoft.CodeAnalysis.Common": "[4.12.0, )",
"Serilog": "[4.2.0, )"
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net8.0": {
"net9.0": {
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
"requested": "[17.12.0, )",
Expand Down Expand Up @@ -36,8 +36,8 @@
},
"Microsoft.CodeAnalysis.Common": {
"type": "Transitive",
"resolved": "4.11.0",
"contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==",
"resolved": "4.12.0",
"contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==",
"dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "8.0.0",
Expand Down Expand Up @@ -136,7 +136,7 @@
"type": "Project",
"dependencies": {
"Library": "[4.4.1, )",
"Microsoft.CodeAnalysis.Common": "[4.11.0, )",
"Microsoft.CodeAnalysis.Common": "[4.12.0, )",
"Serilog": "[4.2.0, )"
}
}
Expand Down
Loading

0 comments on commit e567ab3

Please sign in to comment.