Update add exercise

[no important files changed]

Author: ErikSchierboom

bin/add-practice-exercise.ps1

@@ -38,25 +38,28 @@ $project = "${exerciseDir}/${ExerciseName}.csproj"
 # Update project packages
 & dotnet remove $project package coverlet.collector
 & dotnet add $project package Exercism.Tests --version 0.1.0-beta1
-& dotnet add $project package xunit.runner.visualstudio --version 2.4.3
-& dotnet add $project package xunit --version 2.4.1
-& dotnet add $project package Microsoft.NET.Test.Sdk --version 16.8.3
+& dotnet add $project package xunit.runner.visualstudio --version 3.0.1
+& dotnet add $project package xunit --version 2.8.1
+& dotnet add $project package Microsoft.NET.Test.Sdk --version 17.12.0
 
 # Remove and update files
 Remove-Item -Path "${exerciseDir}/UnitTest1.cs"
 (Get-Content -Path ".editorconfig") -Replace "\[\*\.cs\]", "[${exerciseName}.cs]" | Set-Content -Path "${exerciseDir}/.editorconfig"
 
 # Add and run generator (this will update the tests file)
-$generator = "generators/Exercises/Generators/${ExerciseName}.cs"
+$generator = "${exerciseDir}/.meta/Generator.tpl"
 Add-Content -Path $generator -Value @"
-using System;
+using Xunit;
 
-using Exercism.CSharp.Output;
-
-namespace Exercism.CSharp.Exercises.Generators;
-
-internal class ${exerciseName} : ExerciseGenerator
+public class ${exerciseName}Tests
 {
+    {{#test_cases}}
+    [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
+    public void {{test_method_name}}()
+    {
+        // TODO: implement the test
+    }
+    {{/test_cases}}
 }
 "@
 & dotnet run --project generators --exercise $Exercise

bin/generate-tests.ps1

@@ -24,7 +24,7 @@ $ErrorActionPreference = "Stop"
 $PSNativeCommandUseErrorActionPreference = $true
 
 if ($Exercise) {
-    dotnet run --project generators -- --exercise $Exercise
+    dotnet run --project generators --exercise $Exercise
 } else {
     dotnet run --project generators
 }

bin/test.ps1

@@ -130,7 +130,7 @@ function Parse-Exercises {
 function Build-Generators {
     Write-Output "Build generators"
     & dotnet build generators
-    & dotnet build generators.new
+    & dotnet build generators.deprecated
 }
 
 function Test-Refactoring-Exercise-Default-Implementations {

exercises/concept/roll-the-die/RollTheDie.csproj

@@ -7,7 +7,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1" />
     <PackageReference Include="Exercism.Tests" Version="0.1.0-beta1" />
   </ItemGroup>

exercises/practice/sieve/.meta/Generator.tpl

@@ -6,7 +6,8 @@ public class SieveTests
     [Fact{{#unless @first}}(Skip = "Remove this Skip property to run this test"){{/unless}}]
     public void {{test_method_name}}()
     {
-        Assert.Equal([{{expected}}], Sieve.Primes({{input.limit}}));
+        int[] expected = [{{expected}}];
+        Assert.Equal(expected, Sieve.Primes({{input.limit}}));
     }
     {{/test_cases}}
 }

exercises/practice/sieve/SieveTests.cs

@@ -5,30 +5,35 @@ public class SieveTests
     [Fact]
     public void No_primes_under_two()
     {
-        Assert.Equal([], Sieve.Primes(1));
+        int[] expected = [];
+        Assert.Equal(expected, Sieve.Primes(1));
     }
 
     [Fact(Skip = "Remove this Skip property to run this test")]
     public void Find_first_prime()
     {
-        Assert.Equal([2], Sieve.Primes(2));
+        int[] expected = [2];
+        Assert.Equal(expected, Sieve.Primes(2));
     }
 
     [Fact(Skip = "Remove this Skip property to run this test")]
     public void Find_primes_up_to_10()
     {
-        Assert.Equal([2, 3, 5, 7], Sieve.Primes(10));
+        int[] expected = [2, 3, 5, 7];
+        Assert.Equal(expected, Sieve.Primes(10));
     }
 
     [Fact(Skip = "Remove this Skip property to run this test")]
     public void Limit_is_prime()
     {
-        Assert.Equal([2, 3, 5, 7, 11, 13], Sieve.Primes(13));
+        int[] expected = [2, 3, 5, 7, 11, 13];
+        Assert.Equal(expected, Sieve.Primes(13));
     }
 
     [Fact(Skip = "Remove this Skip property to run this test")]
     public void Find_primes_up_to_1000()
     {
-        Assert.Equal([2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997], Sieve.Primes(1000));
+        int[] expected = [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947, 953, 967, 971, 977, 983, 991, 997];
+        Assert.Equal(expected, Sieve.Primes(1000));
     }
 }