Skip to content

Commit

Permalink
Merge branch 'master' into add_alias_support
Browse files Browse the repository at this point in the history
  • Loading branch information
dupdob authored Dec 20, 2024
2 parents 3441e42 + 05c74d4 commit ad5ad8a
Show file tree
Hide file tree
Showing 13 changed files with 173 additions and 173 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.3" />
<PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
<PackageReference Include="MSTest.TestFramework" Version="3.6.4" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@
},
"MSTest.TestAdapter": {
"type": "Direct",
"requested": "[3.6.3, )",
"resolved": "3.6.3",
"contentHash": "i3KbdAjLO0W9xlvbhZa9u0wh6X+VZ1yTBsUVlVKtx8B9CXa4rFXPcx3yPysB9gbALmhgAjFza4RRoNyXY9IoXQ==",
"requested": "[3.6.4, )",
"resolved": "3.6.4",
"contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==",
"dependencies": {
"Microsoft.Testing.Extensions.VSTestBridge": "1.4.3",
"Microsoft.Testing.Platform.MSBuild": "1.4.3"
}
},
"MSTest.TestFramework": {
"type": "Direct",
"requested": "[3.6.3, )",
"resolved": "3.6.3",
"contentHash": "jockRcUoLJMeHzLqFcMnZBrWy7tS32JP7shlepDDJuf5A6HO2PwAefXzhvprcWNkfpEwmR0KihSO2HRXwNbTng=="
"requested": "[3.6.4, )",
"resolved": "3.6.4",
"contentHash": "3nV+2CJluKmiJpCSqQfXu5idCq35+vqFywjScyauTIz0Zk7KJw7Qpzv8gtwow0To7pxIlIvwkq9rbMB+V6eOow=="
},
"Microsoft.ApplicationInsights": {
"type": "Transitive",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
<PackageReference Include="nunit" Version="4.2.2" />
<PackageReference Include="nunit" Version="4.3.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
},
"NUnit": {
"type": "Direct",
"requested": "[4.2.2, )",
"resolved": "4.2.2",
"contentHash": "mon0OPko28yZ/foVXrhiUvq1LReaGsBdziumyyYGxV/pOE4q92fuYeN+AF+gEU5pCjzykcdBt5l7xobTaiBjsg=="
"requested": "[4.3.0, )",
"resolved": "4.3.0",
"contentHash": "dPClyF8aAmN8w/a7csFXUUbj0sivFVmSfX9CplV+dVeVUqnzoNFsLf7TjAPaxlrwbqHsr+F/pLd7ZEV4Sw9YHg=="
},
"NUnit3TestAdapter": {
"type": "Direct",
Expand Down
16 changes: 8 additions & 8 deletions prepare-release.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ rl.question('What should the new package version be? ', (newVersionNumber) => {
replaceVersionNumber('./package.json', `"versionPrefix": "${oldVersionPrefix}",`, `"versionPrefix": "${versionPrefix}",`);
replaceVersionNumber('./package.json', `"versionSuffix": "${oldVersionSuffix}",`, `"versionSuffix": "${versionSuffix}",`);

packages.forEach(package => {
console.log(`Updating version numbers in ${package.csproj}`);
replaceVersionNumber(package.csproj, `<VersionPrefix>${oldVersionPrefix}</VersionPrefix>`, `<VersionPrefix>${versionPrefix}</VersionPrefix>`);
replaceVersionNumber(package.csproj, `<VersionSuffix>${oldVersionSuffix}</VersionSuffix>`, `<VersionSuffix>${versionSuffix}</VersionSuffix>`);
packages.forEach(pckg => {
console.log(`Updating version numbers in ${pckg.csproj}`);
replaceVersionNumber(pckg.csproj, `<VersionPrefix>${oldVersionPrefix}</VersionPrefix>`, `<VersionPrefix>${versionPrefix}</VersionPrefix>`);
replaceVersionNumber(pckg.csproj, `<VersionSuffix>${oldVersionSuffix}</VersionSuffix>`, `<VersionSuffix>${versionSuffix}</VersionSuffix>`);

if (!versionSuffix) {
console.log(`Updating changelog for ${package.name}`);
commitMessageLines.push(`- ${package.name}@${newVersionNumber}`);
exec(`npx conventional-changelog-cli -p angular --infile "${package.path}/CHANGELOG.md" --same-file --commit-path ${package.path} --tag-prefix "${package.name}@"`);
console.log(`Updating changelog for ${pckg.name}`);
commitMessageLines.push(`- ${pckg.name}@${newVersionNumber}`);
exec(`npx conventional-changelog-cli -p angular --infile "${pckg.path}/CHANGELOG.md" --same-file --commit-path ${pckg.path} --tag-prefix "${pckg.name}@"`);
}
});

Expand All @@ -62,7 +62,7 @@ rl.question('What should the new package version be? ', (newVersionNumber) => {

if (!versionSuffix) {
console.log('Tagging commit');
packages.forEach(package => exec(`git tag -a ${package.name}@${newVersionNumber} -m "${package.name}@${newVersionNumber}"`));
packages.forEach(pckg => exec(`git tag -a ${pckg.name}@${newVersionNumber} -m "${pckg.name}@${newVersionNumber}"`));
}

console.log(`Creating commit`);
Expand Down
10 changes: 5 additions & 5 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.25" />
<PackageVersion Include="LaunchDarkly.EventSource" Version="5.1.0" />
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.1.1" />
<PackageVersion Include="MSTest" Version="3.6.3" />
<PackageVersion Include="MSTest.TestFramework" Version="3.6.3" />
<PackageVersion Include="MSTest" Version="3.6.4" />
<PackageVersion Include="MSTest.TestFramework" Version="3.6.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.11.0" />
Expand All @@ -20,7 +20,7 @@
<PackageVersion Include="Microsoft.Web.LibraryManager.Build" Version="2.1.175" />
<PackageVersion Include="Mono.Cecil" Version="0.11.6" />
<PackageVersion Include="NuGet.Frameworks" Version="6.12.1" />
<PackageVersion Include="Serilog" Version="4.1.0" />
<PackageVersion Include="Serilog" Version="4.2.0" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageVersion Include="Serilog.Extensions.Logging.File" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
Expand All @@ -32,7 +32,7 @@
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.12.0" />
<PackageVersion Include="Microsoft.TestPlatform.Portable" Version="17.12.0" />
<PackageVersion Include="Microsoft.TestPlatform.TranslationLayer" Version="17.12.0" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.1.3" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="21.1.7" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
</ItemGroup>
Expand All @@ -44,6 +44,6 @@
<PackageVersion Include="Stryker.Regex.Parser" Version="1.0.0" />
<PackageVersion Include="Shouldly" Version="4.2.1" />
<PackageVersion Include="Spectre.Console.Testing" Version="0.49.1" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.1.3" />
<PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="21.1.7" />
</ItemGroup>
</Project>
18 changes: 9 additions & 9 deletions src/Stryker.Abstractions/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,17 @@
},
"Serilog": {
"type": "Direct",
"requested": "[4.1.0, )",
"resolved": "4.1.0",
"contentHash": "u1aZI8HZ62LWlq5dZLFwm6jMax/sUwnWZSw5lkPsCt518cJBxFKoNmc7oSxe5aA5BgSkzy9rzwFGR/i/acnSPw=="
"requested": "[4.2.0, )",
"resolved": "4.2.0",
"contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
},
"TestableIO.System.IO.Abstractions.Wrappers": {
"type": "Direct",
"requested": "[21.1.3, )",
"resolved": "21.1.3",
"contentHash": "5LEVwt5+K5TnL1ekfCbQszlgRnO77plpgQAgkXL7wXKGd0PQWE01eSss0+L7E8GGLGbtD7mzYJVq/bd79ZDBlQ==",
"requested": "[21.1.7, )",
"resolved": "21.1.7",
"contentHash": "UcQ+kdN0Ibqbhp6uAMAbc06ri7FeQskQFJX+xZD6siVI5Dg7GaeY4dQYqSfbDA5ZPITtXX9Si4E8XhE6Hhufhg==",
"dependencies": {
"TestableIO.System.IO.Abstractions": "21.1.3"
"TestableIO.System.IO.Abstractions": "21.1.7"
}
},
"Buildalyzer.Logger": {
Expand Down Expand Up @@ -277,8 +277,8 @@
},
"TestableIO.System.IO.Abstractions": {
"type": "Transitive",
"resolved": "21.1.3",
"contentHash": "qe/gIjOPCoyiSCToouJx/vCvcTQXVGj/eJVRK/7s2F8yIv0zvEpjByfXZvS3yqmcpg0/S6x6w7DvNyPrLe/RRw=="
"resolved": "21.1.7",
"contentHash": "qsaIAF06PJiFUp1jH2y5NP3IcJILUYtcdGgx25p3D9G4QrFz4Cs3frGp8njX+zQWeb/tHBS+CTMHZtU7Nqa1lg=="
},
"stryker.utilities": {
"type": "Project",
Expand Down
78 changes: 39 additions & 39 deletions src/Stryker.CLI/Stryker.CLI.UnitTest/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@
},
"MSTest": {
"type": "Direct",
"requested": "[3.6.3, )",
"resolved": "3.6.3",
"contentHash": "1W6UIJK6RJMIDHWVZ+TlEnzGG0TwhKgY6qlPIo1dc/qvHPKOL3XpN8lv1+VHspibv+7gq/76dYlT2y0S44aopg==",
"requested": "[3.6.4, )",
"resolved": "3.6.4",
"contentHash": "PDBqb7FT15DBD/LQtAr2Eq/UY9YVTgsY7CD7ZiDnamc/RI+/2VSak6qotTV+x2oyhcRJxE4USRgyqXIRlyU3kw==",
"dependencies": {
"MSTest.Analyzers": "[3.6.3]",
"MSTest.TestAdapter": "[3.6.3]",
"MSTest.TestFramework": "[3.6.3]",
"MSTest.Analyzers": "[3.6.4]",
"MSTest.TestAdapter": "[3.6.4]",
"MSTest.TestFramework": "[3.6.4]",
"Microsoft.NET.Test.Sdk": "17.11.1"
}
},
Expand All @@ -73,12 +73,12 @@
},
"TestableIO.System.IO.Abstractions.TestingHelpers": {
"type": "Direct",
"requested": "[21.1.3, )",
"resolved": "21.1.3",
"contentHash": "sMRPFcqvmSeocHtb5JVf7heBqvBsaFGiodEOoysIB0KneV4+3Yg0ka1421kzBLjRW+itU3FVjjqAAa9fqvUmhA==",
"requested": "[21.1.7, )",
"resolved": "21.1.7",
"contentHash": "2ul9Dpl7GF7OAQUZUWWqjU0tug5h+yMQXRhtcqeFm0oCPtbhMBaBczWu/majJoRAq3ZGbRmPj1+9zLmldjzA5w==",
"dependencies": {
"TestableIO.System.IO.Abstractions": "21.1.3",
"TestableIO.System.IO.Abstractions.Wrappers": "21.1.3"
"TestableIO.System.IO.Abstractions": "21.1.7",
"TestableIO.System.IO.Abstractions.Wrappers": "21.1.7"
}
},
"Azure.Core": {
Expand Down Expand Up @@ -330,13 +330,13 @@
},
"MSTest.Analyzers": {
"type": "Transitive",
"resolved": "3.6.3",
"contentHash": "TfM4wkpgJ9YKqQp3BjDGLCAckRwEuRvcE6Nw4Ge3r8dw6GOCpFKavyigTyD+IjV3SoMd0LvUDdjh5MGW0Oe8Wg=="
"resolved": "3.6.4",
"contentHash": "4gU/VdItLebmE2+UkOaqffVmVa/in0VeIF9fmN/fG0tj5AHAasjasJcZa9U2uXBNX03cKCWlgWenlhKLz343NQ=="
},
"MSTest.TestAdapter": {
"type": "Transitive",
"resolved": "3.6.3",
"contentHash": "i3KbdAjLO0W9xlvbhZa9u0wh6X+VZ1yTBsUVlVKtx8B9CXa4rFXPcx3yPysB9gbALmhgAjFza4RRoNyXY9IoXQ==",
"resolved": "3.6.4",
"contentHash": "YdwseRA+nDhRqD2oPHjCE4KzLEN5B10A61lOslE3N3OvUwHJ6ezyZZjYWf7mrZ8jckCcx/UlBclTzgWUpMpPQw==",
"dependencies": {
"Microsoft.Testing.Extensions.VSTestBridge": "1.4.3",
"Microsoft.Testing.Platform.MSBuild": "1.4.3"
Expand Down Expand Up @@ -828,8 +828,8 @@
},
"TestableIO.System.IO.Abstractions": {
"type": "Transitive",
"resolved": "21.1.3",
"contentHash": "qe/gIjOPCoyiSCToouJx/vCvcTQXVGj/eJVRK/7s2F8yIv0zvEpjByfXZvS3yqmcpg0/S6x6w7DvNyPrLe/RRw=="
"resolved": "21.1.7",
"contentHash": "qsaIAF06PJiFUp1jH2y5NP3IcJILUYtcdGgx25p3D9G4QrFz4Cs3frGp8njX+zQWeb/tHBS+CTMHZtU7Nqa1lg=="
},
"dotnet-stryker": {
"type": "Project",
Expand Down Expand Up @@ -859,18 +859,18 @@
"Mono.Cecil": "[0.11.6, )",
"NuGet.Frameworks": "[6.12.1, )",
"ResXResourceReader.NetStandard": "[1.3.0, )",
"Serilog": "[4.1.0, )",
"Serilog": "[4.2.0, )",
"Serilog.Extensions.Logging": "[8.0.0, )",
"Serilog.Extensions.Logging.File": "[3.0.0, )",
"Serilog.Sinks.Console": "[6.0.0, )",
"ShellProgressBar": "[5.2.0, )",
"Spectre.Console": "[0.49.1, )",
"Stryker.Abstractions": "[1.0.0, )",
"Stryker.Configuration": "[1.0.0, )",
"Stryker.DataCollector": "[1.0.0, )",
"Stryker.Abstractions": "[4.4.1, )",
"Stryker.Configuration": "[4.4.1, )",
"Stryker.DataCollector": "[4.4.1, )",
"Stryker.Regex.Parser": "[1.0.0, )",
"Stryker.RegexMutators": "[1.0.0, )",
"TestableIO.System.IO.Abstractions.Wrappers": "[21.1.3, )"
"Stryker.RegexMutators": "[4.4.1, )",
"TestableIO.System.IO.Abstractions.Wrappers": "[21.1.7, )"
}
},
"stryker.abstractions": {
Expand All @@ -881,9 +881,9 @@
"Microsoft.CodeAnalysis.CSharp": "[4.11.0, )",
"Microsoft.CodeAnalysis.Common": "[4.11.0, )",
"Microsoft.TestPlatform.ObjectModel": "[17.12.0, )",
"Serilog": "[4.1.0, )",
"Stryker.Utilities": "[1.0.0, )",
"TestableIO.System.IO.Abstractions.Wrappers": "[21.1.3, )"
"Serilog": "[4.2.0, )",
"Stryker.Utilities": "[4.4.1, )",
"TestableIO.System.IO.Abstractions.Wrappers": "[21.1.7, )"
}
},
"stryker.configuration": {
Expand All @@ -892,9 +892,9 @@
"DotNet.Glob": "[3.1.3, )",
"Microsoft.CodeAnalysis.CSharp": "[4.11.0, )",
"Microsoft.CodeAnalysis.Common": "[4.11.0, )",
"Serilog": "[4.1.0, )",
"Stryker.Abstractions": "[1.0.0, )",
"Stryker.Utilities": "[1.0.0, )"
"Serilog": "[4.2.0, )",
"Stryker.Abstractions": "[4.4.1, )",
"Stryker.Utilities": "[4.4.1, )"
}
},
"stryker.datacollector": {
Expand Down Expand Up @@ -1074,9 +1074,9 @@
},
"MSTest.TestFramework": {
"type": "CentralTransitive",
"requested": "[3.6.3, )",
"resolved": "3.6.3",
"contentHash": "jockRcUoLJMeHzLqFcMnZBrWy7tS32JP7shlepDDJuf5A6HO2PwAefXzhvprcWNkfpEwmR0KihSO2HRXwNbTng=="
"requested": "[3.6.4, )",
"resolved": "3.6.4",
"contentHash": "3nV+2CJluKmiJpCSqQfXu5idCq35+vqFywjScyauTIz0Zk7KJw7Qpzv8gtwow0To7pxIlIvwkq9rbMB+V6eOow=="
},
"NuGet.Frameworks": {
"type": "CentralTransitive",
Expand All @@ -1101,9 +1101,9 @@
},
"Serilog": {
"type": "CentralTransitive",
"requested": "[4.1.0, )",
"resolved": "4.1.0",
"contentHash": "u1aZI8HZ62LWlq5dZLFwm6jMax/sUwnWZSw5lkPsCt518cJBxFKoNmc7oSxe5aA5BgSkzy9rzwFGR/i/acnSPw=="
"requested": "[4.2.0, )",
"resolved": "4.2.0",
"contentHash": "gmoWVOvKgbME8TYR+gwMf7osROiWAURterc6Rt2dQyX7wtjZYpqFiA/pY6ztjGQKKV62GGCyOcmtP1UKMHgSmA=="
},
"Serilog.Extensions.Logging": {
"type": "CentralTransitive",
Expand Down Expand Up @@ -1163,11 +1163,11 @@
},
"TestableIO.System.IO.Abstractions.Wrappers": {
"type": "CentralTransitive",
"requested": "[21.1.3, )",
"resolved": "21.1.3",
"contentHash": "5LEVwt5+K5TnL1ekfCbQszlgRnO77plpgQAgkXL7wXKGd0PQWE01eSss0+L7E8GGLGbtD7mzYJVq/bd79ZDBlQ==",
"requested": "[21.1.7, )",
"resolved": "21.1.7",
"contentHash": "UcQ+kdN0Ibqbhp6uAMAbc06ri7FeQskQFJX+xZD6siVI5Dg7GaeY4dQYqSfbDA5ZPITtXX9Si4E8XhE6Hhufhg==",
"dependencies": {
"TestableIO.System.IO.Abstractions": "21.1.3"
"TestableIO.System.IO.Abstractions": "21.1.7"
}
},
"YamlDotNet": {
Expand Down
Loading

0 comments on commit ad5ad8a

Please sign in to comment.