Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into improve_mutation_of…
Browse files Browse the repository at this point in the history
…_directives

# Conflicts:
#	integrationtest/Validation/ValidationProject/ValidateStrykerResults.cs
  • Loading branch information
dupdob committed Dec 26, 2024
2 parents f7418b4 + e567ab3 commit 60a7a04
Showing 43 changed files with 523 additions and 320 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/integration-test.yaml
Original file line number Diff line number Diff line change
@@ -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
20 changes: 20 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -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:
@@ -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:
@@ -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:
@@ -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:
@@ -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:
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>

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, )",
@@ -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",
@@ -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, )"
}
}
Original file line number Diff line number Diff line change
@@ -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
@@ -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",
@@ -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",
@@ -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",
@@ -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",
Original file line number Diff line number Diff line change
@@ -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",
@@ -110,7 +110,7 @@
"library.fsharp": {
"type": "Project",
"dependencies": {
"FSharp.Core": "[8.0.403, )"
"FSharp.Core": "[9.0.100, )"
}
}
}
Original file line number Diff line number Diff line change
@@ -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=="
}
}
}
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>

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, )",
@@ -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",
@@ -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, )"
}
}
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>
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, )",
@@ -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",
@@ -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, )"
}
}
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>
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, )",
@@ -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",
@@ -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, )"
}
}
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@

namespace TargetProject.Constructs;

public class Csharp1
public class CSharp1
{
// string interpolation
public static void StringInterpolation()
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@

namespace TargetProject.Constructs;

public class Csharp10
public class CSharp10
{
// record structs
public record Person(string FirstName, string LastName);
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@

namespace TargetProject.Constructs;

public class Csharp11
public class CSharp11
{
// genergic attributes
public class GenericAttribute<T> : Attribute { }
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

namespace TargetProject.Constructs;

public class Csharp12
public class CSharp12
{
// collection expressions
public static void CollectionExpressions()
@@ -72,7 +72,6 @@ public static void TuplesInLambda()
// The set (2, 3, 4) doubled: (4, 6, 8)
}

#if NET8_0_OR_GREATER
// inline array
[System.Runtime.CompilerServices.InlineArray(10)]
public struct Buffer
@@ -93,5 +92,4 @@ public static void InlineArray()
Console.WriteLine(i);
}
}
#endif
}
Loading

0 comments on commit 60a7a04

Please sign in to comment.