diff --git a/samples/Algorithms/scenarios/scenario01/run.ps1 b/samples/Algorithms/scenarios/scenario01/run.ps1
index 7b467d7..93ccbcc 100644
--- a/samples/Algorithms/scenarios/scenario01/run.ps1
+++ b/samples/Algorithms/scenarios/scenario01/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Algorithms.Core.Tests
-dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
\ No newline at end of file
+dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
+Pop-Location
\ No newline at end of file
diff --git a/samples/Algorithms/scenarios/scenario02/run.ps1 b/samples/Algorithms/scenarios/scenario02/run.ps1
index 02b842f..27529fb 100644
--- a/samples/Algorithms/scenarios/scenario02/run.ps1
+++ b/samples/Algorithms/scenarios/scenario02/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Algorithms.Core.Tests
-dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura --coverage-settings $PSScriptRoot/coverage.config
\ No newline at end of file
+dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura --coverage-settings $PSScriptRoot/coverage.config
+Pop-Location
\ No newline at end of file
diff --git a/samples/Algorithms/scenarios/scenario03/run.ps1 b/samples/Algorithms/scenarios/scenario03/run.ps1
index c70c8fb..c892027 100644
--- a/samples/Algorithms/scenarios/scenario03/run.ps1
+++ b/samples/Algorithms/scenarios/scenario03/run.ps1
@@ -1,3 +1,5 @@
+Push-Location
cd $PSScriptRoot/../../tests/Algorithms.Core.Tests
dotnet build /p:MsCodeCoverageInstrumentation="true"
-dotnet run --no-build --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
\ No newline at end of file
+dotnet run --no-build --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
+Pop-Location
\ No newline at end of file
diff --git a/samples/Algorithms/scenarios/scenario04/run.ps1 b/samples/Algorithms/scenarios/scenario04/run.ps1
index 76230e8..e19c1fa 100644
--- a/samples/Algorithms/scenarios/scenario04/run.ps1
+++ b/samples/Algorithms/scenarios/scenario04/run.ps1
@@ -1,4 +1,6 @@
+Push-Location
cd $PSScriptRoot/../../tests/Algorithms.Core.Tests
dotnet build
dotnet tool install -g dotnet-coverage
-dotnet-coverage collect --output report.cobertura.xml --output-format cobertura "dotnet run --no-build"
\ No newline at end of file
+dotnet-coverage collect --output report.cobertura.xml --output-format cobertura "dotnet run --no-build"
+Pop-Location
\ No newline at end of file
diff --git a/samples/Algorithms/scenarios/scenario05/run.ps1 b/samples/Algorithms/scenarios/scenario05/run.ps1
index cd23666..829637a 100644
--- a/samples/Algorithms/scenarios/scenario05/run.ps1
+++ b/samples/Algorithms/scenarios/scenario05/run.ps1
@@ -1,4 +1,6 @@
+Push-Location
cd $PSScriptRoot/../../src/Algorithms.Console
dotnet publish -r win-x64 -c Release /p:AotMsCodeCoverageInstrumentation="true"
dotnet tool install -g dotnet-coverage
-dotnet-coverage collect --output report.cobertura.xml --output-format cobertura bin\Release\net8.0\win-x64\publish\Algorithms.Console.exe
\ No newline at end of file
+dotnet-coverage collect --output report.cobertura.xml --output-format cobertura bin\Release\net8.0\win-x64\publish\Algorithms.Console.exe
+Pop-Location
\ No newline at end of file
diff --git a/samples/Algorithms/scenarios/scenario06/run.ps1 b/samples/Algorithms/scenarios/scenario06/run.ps1
index cce98c2..da8c8a4 100644
--- a/samples/Algorithms/scenarios/scenario06/run.ps1
+++ b/samples/Algorithms/scenarios/scenario06/run.ps1
@@ -1,3 +1,5 @@
+Push-Location
cd $PSScriptRoot/../../tests/Algorithms.Core.NativeAot.Tests
dotnet publish -c Release -r win-x64 /p:AotMsCodeCoverageInstrumentation="true"
-.\bin\Release\net8.0\win-x64\publish\Algorithms.Core.NativeAot.Tests.exe --coverage --coverage-output-format cobertura --coverage-output report.cobertura.xml
\ No newline at end of file
+.\bin\Release\net8.0\win-x64\publish\Algorithms.Core.NativeAot.Tests.exe --coverage --coverage-output-format cobertura --coverage-output report.cobertura.xml
+Pop-Location
\ No newline at end of file
diff --git a/samples/Algorithms/scenarios/scenario07/run.ps1 b/samples/Algorithms/scenarios/scenario07/run.ps1
index 20273cf..90592b1 100644
--- a/samples/Algorithms/scenarios/scenario07/run.ps1
+++ b/samples/Algorithms/scenarios/scenario07/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Algorithms.Core.MSTest.Sdk.Tests
-dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
\ No newline at end of file
+dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
+Pop-Location
\ No newline at end of file
diff --git a/samples/Algorithms/src/Algorithms.Console/Algorithms.Console.csproj b/samples/Algorithms/src/Algorithms.Console/Algorithms.Console.csproj
index 8d8bc64..45404d5 100644
--- a/samples/Algorithms/src/Algorithms.Console/Algorithms.Console.csproj
+++ b/samples/Algorithms/src/Algorithms.Console/Algorithms.Console.csproj
@@ -13,6 +13,6 @@
-
+
diff --git a/samples/Algorithms/tests/Algorithms.Core.NativeAot.Tests/Algorithms.Core.NativeAot.Tests.csproj b/samples/Algorithms/tests/Algorithms.Core.NativeAot.Tests/Algorithms.Core.NativeAot.Tests.csproj
index 990107f..588f490 100644
--- a/samples/Algorithms/tests/Algorithms.Core.NativeAot.Tests/Algorithms.Core.NativeAot.Tests.csproj
+++ b/samples/Algorithms/tests/Algorithms.Core.NativeAot.Tests/Algorithms.Core.NativeAot.Tests.csproj
@@ -11,13 +11,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/samples/Algorithms/tests/Algorithms.Core.Tests/Algorithms.Core.Tests.csproj b/samples/Algorithms/tests/Algorithms.Core.Tests/Algorithms.Core.Tests.csproj
index 982931b..cc743b4 100644
--- a/samples/Algorithms/tests/Algorithms.Core.Tests/Algorithms.Core.Tests.csproj
+++ b/samples/Algorithms/tests/Algorithms.Core.Tests/Algorithms.Core.Tests.csproj
@@ -13,10 +13,10 @@
-
-
-
-
+
+
+
+
diff --git a/samples/Calculator/scenarios/scenario01/run.ps1 b/samples/Calculator/scenarios/scenario01/run.ps1
index 3be8e6e..ca094e9 100644
--- a/samples/Calculator/scenarios/scenario01/run.ps1
+++ b/samples/Calculator/scenarios/scenario01/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Calculator.Core.Tests
-dotnet test --collect "Code Coverage"
\ No newline at end of file
+dotnet test --collect "Code Coverage"
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario02/run.ps1 b/samples/Calculator/scenarios/scenario02/run.ps1
index 5c547b3..459f513 100644
--- a/samples/Calculator/scenarios/scenario02/run.ps1
+++ b/samples/Calculator/scenarios/scenario02/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Calculator.Core.Tests
-dotnet test --collect "Code Coverage;Format=cobertura"
\ No newline at end of file
+dotnet test --collect "Code Coverage;Format=cobertura"
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario03/run.ps1 b/samples/Calculator/scenarios/scenario03/run.ps1
index 33ca48c..5e39962 100644
--- a/samples/Calculator/scenarios/scenario03/run.ps1
+++ b/samples/Calculator/scenarios/scenario03/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Calculator.Core.Tests
-dotnet test --settings ../../scenarios/scenario03/coverage.runsettings
\ No newline at end of file
+dotnet test --settings ../../scenarios/scenario03/coverage.runsettings
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario04/run.ps1 b/samples/Calculator/scenarios/scenario04/run.ps1
index a785d6a..38bd52e 100644
--- a/samples/Calculator/scenarios/scenario04/run.ps1
+++ b/samples/Calculator/scenarios/scenario04/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Calculator.Core.Tests
-dotnet test --collect "Code Coverage;Format=xml"
\ No newline at end of file
+dotnet test --collect "Code Coverage;Format=xml"
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario05/run.ps1 b/samples/Calculator/scenarios/scenario05/run.ps1
index d030dd8..11ec9da 100644
--- a/samples/Calculator/scenarios/scenario05/run.ps1
+++ b/samples/Calculator/scenarios/scenario05/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Calculator.Core.Tests
-dotnet test --settings ../../scenarios/scenario05/coverage.runsettings
\ No newline at end of file
+dotnet test --settings ../../scenarios/scenario05/coverage.runsettings
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario06/run.ps1 b/samples/Calculator/scenarios/scenario06/run.ps1
index 916c963..b0d8641 100644
--- a/samples/Calculator/scenarios/scenario06/run.ps1
+++ b/samples/Calculator/scenarios/scenario06/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Calculator.Core.Tests
-dotnet test --settings ../../scenarios/scenario06/coverage.runsettings
\ No newline at end of file
+dotnet test --settings ../../scenarios/scenario06/coverage.runsettings
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario07/run.ps1 b/samples/Calculator/scenarios/scenario07/run.ps1
index 8813cc6..056d659 100644
--- a/samples/Calculator/scenarios/scenario07/run.ps1
+++ b/samples/Calculator/scenarios/scenario07/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Calculator.Core.Tests
-dotnet test --settings ../../scenarios/scenario07/coverage.runsettings
\ No newline at end of file
+dotnet test --settings ../../scenarios/scenario07/coverage.runsettings
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario08/run.ps1 b/samples/Calculator/scenarios/scenario08/run.ps1
index 63c40c4..71b88a5 100644
--- a/samples/Calculator/scenarios/scenario08/run.ps1
+++ b/samples/Calculator/scenarios/scenario08/run.ps1
@@ -1,4 +1,6 @@
+Push-Location
cd $PSScriptRoot/../../src/Calculator.Console
dotnet build
dotnet tool install -g dotnet-coverage
-dotnet-coverage collect -f cobertura "dotnet run --no-build add 10 24"
\ No newline at end of file
+dotnet-coverage collect -f cobertura "dotnet run --no-build add 10 24"
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario09/run.ps1 b/samples/Calculator/scenarios/scenario09/run.ps1
index 24c303f..0edc843 100644
--- a/samples/Calculator/scenarios/scenario09/run.ps1
+++ b/samples/Calculator/scenarios/scenario09/run.ps1
@@ -1,4 +1,6 @@
+Push-Location
cd $PSScriptRoot/../../src/Calculator.Console
dotnet build
dotnet tool install -g dotnet-coverage
-dotnet-coverage collect -f cobertura -s ../../scenarios/scenario09/coverage.runsettings --include-files "./bin/Debug/**/*.dll" "dotnet run --no-build add 10 24"
\ No newline at end of file
+dotnet-coverage collect -f cobertura -s ../../scenarios/scenario09/coverage.runsettings --include-files "./bin/Debug/**/*.dll" "dotnet run --no-build add 10 24"
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario10/run.ps1 b/samples/Calculator/scenarios/scenario10/run.ps1
index 0b18fae..1946647 100644
--- a/samples/Calculator/scenarios/scenario10/run.ps1
+++ b/samples/Calculator/scenarios/scenario10/run.ps1
@@ -1,3 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../src/Calculator.Console
dotnet build
dotnet tool install -g dotnet-coverage
@@ -6,4 +7,5 @@ dotnet-coverage instrument --session-id TagScenario10 "./bin/Debug/net8.0/Calcul
dotnet-coverage collect --session-id TagScenario10 --server-mode --background -f cobertura
dotnet run --no-build add 10 24
dotnet run --no-build multiply 10 24
-dotnet-coverage shutdown TagScenario10
\ No newline at end of file
+dotnet-coverage shutdown TagScenario10
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario11/run.ps1 b/samples/Calculator/scenarios/scenario11/run.ps1
index 0e0a605..3a57f33 100644
--- a/samples/Calculator/scenarios/scenario11/run.ps1
+++ b/samples/Calculator/scenarios/scenario11/run.ps1
@@ -1,4 +1,6 @@
+Push-Location
cd $PSScriptRoot/../../src/Calculator.Console
dotnet build
cd $PSScriptRoot/../../tests/Calculator.Console.Tests
-dotnet test --settings ../../scenarios/scenario11/coverage.runsettings
\ No newline at end of file
+dotnet test --settings ../../scenarios/scenario11/coverage.runsettings
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario12/run.ps1 b/samples/Calculator/scenarios/scenario12/run.ps1
index 68e428c..9c24da9 100644
--- a/samples/Calculator/scenarios/scenario12/run.ps1
+++ b/samples/Calculator/scenarios/scenario12/run.ps1
@@ -1,4 +1,6 @@
+Push-Location
cd $PSScriptRoot/../../src/Calculator.Console
dotnet build
cd $PSScriptRoot/../../tests/Calculator.Console.Tests
-dotnet test --settings ../../scenarios/scenario12/coverage.runsettings
\ No newline at end of file
+dotnet test --settings ../../scenarios/scenario12/coverage.runsettings
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario13/run.ps1 b/samples/Calculator/scenarios/scenario13/run.ps1
index d83e61a..728907c 100644
--- a/samples/Calculator/scenarios/scenario13/run.ps1
+++ b/samples/Calculator/scenarios/scenario13/run.ps1
@@ -1,2 +1,4 @@
+Push-Location
cd $PSScriptRoot/../../tests/Calculator.Server.Tests
-dotnet test --collect "Code Coverage"
\ No newline at end of file
+dotnet test --collect "Code Coverage"
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario14/run.ps1 b/samples/Calculator/scenarios/scenario14/run.ps1
index 131a229..73b022a 100644
--- a/samples/Calculator/scenarios/scenario14/run.ps1
+++ b/samples/Calculator/scenarios/scenario14/run.ps1
@@ -1,3 +1,4 @@
+Push-Location
cd $PSScriptRoot/../..
dotnet build
dotnet tool install -g dotnet-coverage
@@ -6,4 +7,5 @@ dotnet-coverage collect --output report.coverage --session-id TagScenario14 "dot
cd $PSScriptRoot/../../tests/Calculator.Server.IntegrationTests
dotnet test --collect "Code Coverage"
dotnet-coverage shutdown TagScenario14
-dotnet-coverage merge --output merged.coverage **/*.coverage $PSScriptRoot/../../src/Calculator.Server/report.coverage
\ No newline at end of file
+dotnet-coverage merge --output merged.coverage **/*.coverage $PSScriptRoot/../../src/Calculator.Server/report.coverage
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario15/run.ps1 b/samples/Calculator/scenarios/scenario15/run.ps1
index 46811d8..227ef45 100644
--- a/samples/Calculator/scenarios/scenario15/run.ps1
+++ b/samples/Calculator/scenarios/scenario15/run.ps1
@@ -1,3 +1,4 @@
+Push-Location
cd $PSScriptRoot/../..
dotnet build
dotnet tool install -g dotnet-coverage
@@ -7,4 +8,5 @@ dotnet-coverage connect --background TagScenario15 "dotnet run --no-build"
cd $PSScriptRoot/../../tests/Calculator.Server.IntegrationTests
dotnet-coverage connect TagScenario15 "dotnet test --no-build"
dotnet-coverage shutdown TagScenario15
-cd $PSScriptRoot/../..
\ No newline at end of file
+cd $PSScriptRoot/../..
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario16/run.ps1 b/samples/Calculator/scenarios/scenario16/run.ps1
index 588d54b..249672e 100644
--- a/samples/Calculator/scenarios/scenario16/run.ps1
+++ b/samples/Calculator/scenarios/scenario16/run.ps1
@@ -1,3 +1,4 @@
+Push-Location
cd $PSScriptRoot/../..
dotnet build
dotnet tool install -g dotnet-coverage
@@ -14,4 +15,5 @@ dotnet-coverage connect TagScenario16 "dotnet test --no-build --filter divide"
dotnet-coverage snapshot --reset --output ../../snapshot4.cobertura.xml TagScenario16
dotnet-coverage shutdown TagScenario16
cd $PSScriptRoot/../..
-dotnet-coverage merge --output-format cobertura --output report.cobertura.xml *.cobertura.xml
\ No newline at end of file
+dotnet-coverage merge --output-format cobertura --output report.cobertura.xml *.cobertura.xml
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario17/run.ps1 b/samples/Calculator/scenarios/scenario17/run.ps1
index 593114a..2b203a8 100644
--- a/samples/Calculator/scenarios/scenario17/run.ps1
+++ b/samples/Calculator/scenarios/scenario17/run.ps1
@@ -1,3 +1,4 @@
+Push-Location
cd $PSScriptRoot/../..
dotnet build
dotnet tool install -g dotnet-coverage
@@ -13,4 +14,5 @@ dotnet-coverage snapshot --output ../../snapshot3.cobertura.xml TagScenario17
dotnet-coverage connect TagScenario17 "dotnet test --no-build --filter divide"
dotnet-coverage snapshot --output ../../snapshot4.cobertura.xml TagScenario17
dotnet-coverage shutdown TagScenario17
-cd $PSScriptRoot/../..
\ No newline at end of file
+cd $PSScriptRoot/../..
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario18/run.ps1 b/samples/Calculator/scenarios/scenario18/run.ps1
index 9a37e14..26b32e8 100644
--- a/samples/Calculator/scenarios/scenario18/run.ps1
+++ b/samples/Calculator/scenarios/scenario18/run.ps1
@@ -1,3 +1,4 @@
+Push-Location
cd $PSScriptRoot/../..
dotnet build
dotnet tool install -g dotnet-coverage
@@ -6,4 +7,5 @@ dotnet-coverage collect --output report.coverage --session-id TagScenario18 "dot
cd $PSScriptRoot/../..
dotnet test --collect "Code Coverage" --results-directory "$PSScriptRoot/../../TestResults/"
dotnet-coverage shutdown TagScenario18
-dotnet-coverage merge --output-format cobertura --output merged.cobertura.xml $PSScriptRoot/../../TestResults/**/*.coverage $PSScriptRoot/../../src/Calculator.Server/report.coverage
\ No newline at end of file
+dotnet-coverage merge --output-format cobertura --output merged.cobertura.xml $PSScriptRoot/../../TestResults/**/*.coverage $PSScriptRoot/../../src/Calculator.Server/report.coverage
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario19/run.ps1 b/samples/Calculator/scenarios/scenario19/run.ps1
index a62889a..b447437 100644
--- a/samples/Calculator/scenarios/scenario19/run.ps1
+++ b/samples/Calculator/scenarios/scenario19/run.ps1
@@ -1,3 +1,4 @@
+Push-Location
cd $PSScriptRoot/../..
dotnet build
dotnet tool install -g dotnet-coverage
@@ -6,4 +7,5 @@ dotnet-coverage collect --output report.coverage --session-id TagScenario19 "dot
cd $PSScriptRoot/../..
dotnet test --settings ./scenarios/scenario19/coverage.runsettings --results-directory "$PSScriptRoot/../../TestResults/"
dotnet-coverage shutdown TagScenario19
-dotnet-coverage merge --output-format cobertura --output merged.cobertura.xml $PSScriptRoot/../../TestResults/**/*.coverage $PSScriptRoot/../../src/Calculator.Server/report.coverage
\ No newline at end of file
+dotnet-coverage merge --output-format cobertura --output merged.cobertura.xml $PSScriptRoot/../../TestResults/**/*.coverage $PSScriptRoot/../../src/Calculator.Server/report.coverage
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario20/run.ps1 b/samples/Calculator/scenarios/scenario20/run.ps1
index 5154584..8a4579e 100644
--- a/samples/Calculator/scenarios/scenario20/run.ps1
+++ b/samples/Calculator/scenarios/scenario20/run.ps1
@@ -1,3 +1,4 @@
+Push-Location
cd $PSScriptRoot/../..
dotnet build
dotnet tool install -g dotnet-coverage
@@ -7,4 +8,5 @@ dotnet-coverage collect -l $PSScriptRoot/../../logs/collect.log -ll Verbose --se
cd $PSScriptRoot/../..
dotnet test --settings ./scenarios/scenario20/coverage.runsettings --results-directory "$PSScriptRoot/../../TestResults/" --diag $PSScriptRoot/../../logs/log.txt
dotnet-coverage shutdown -l $PSScriptRoot/../../logs/shutdown.log -ll Verbose TagScenario20
-dotnet-coverage merge -l $PSScriptRoot/../../logs/merge.log -ll Verbose --output-format cobertura --output merged.cobertura.xml $PSScriptRoot/../../TestResults/**/*.coverage $PSScriptRoot/../../src/Calculator.Server/report.coverage
\ No newline at end of file
+dotnet-coverage merge -l $PSScriptRoot/../../logs/merge.log -ll Verbose --output-format cobertura --output merged.cobertura.xml $PSScriptRoot/../../TestResults/**/*.coverage $PSScriptRoot/../../src/Calculator.Server/report.coverage
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario22/run.ps1 b/samples/Calculator/scenarios/scenario22/run.ps1
index 44c13c9..5b4f905 100644
--- a/samples/Calculator/scenarios/scenario22/run.ps1
+++ b/samples/Calculator/scenarios/scenario22/run.ps1
@@ -1,5 +1,7 @@
+Push-Location
cd $PSScriptRoot/../../src/Calculator.Console
dotnet build
$env:STATIC_INSTRUMENTATION_DIR="$PSScriptRoot/../../src/Calculator.Console"
cd $PSScriptRoot/../../tests/Calculator.Console.Tests
-dotnet test --settings ../../scenarios/scenario22/coverage.runsettings
\ No newline at end of file
+dotnet test --settings ../../scenarios/scenario22/coverage.runsettings
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario23/run.ps1 b/samples/Calculator/scenarios/scenario23/run.ps1
index cf785a4..332944c 100644
--- a/samples/Calculator/scenarios/scenario23/run.ps1
+++ b/samples/Calculator/scenarios/scenario23/run.ps1
@@ -1,5 +1,7 @@
+Push-Location
cd $PSScriptRoot/../../src/Calculator.Console
dotnet build
$env:STATIC_INSTRUMENTATION_DIR="$PSScriptRoot/../../src/Calculator.Console"
cd $PSScriptRoot/../../tests/Calculator.Console.Tests
-dotnet test --settings ../../scenarios/scenario23/coverage.runsettings
\ No newline at end of file
+dotnet test --settings ../../scenarios/scenario23/coverage.runsettings
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario24/run.ps1 b/samples/Calculator/scenarios/scenario24/run.ps1
index f86feea..225bb51 100644
--- a/samples/Calculator/scenarios/scenario24/run.ps1
+++ b/samples/Calculator/scenarios/scenario24/run.ps1
@@ -1,3 +1,5 @@
+Push-Location
cd $PSScriptRoot/../..
dotnet build
-dotnet test --no-build --collect "Code Coverage"
\ No newline at end of file
+dotnet test --no-build --collect "Code Coverage"
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/scenarios/scenario25/run.ps1 b/samples/Calculator/scenarios/scenario25/run.ps1
index 78dff85..0ee4ba2 100644
--- a/samples/Calculator/scenarios/scenario25/run.ps1
+++ b/samples/Calculator/scenarios/scenario25/run.ps1
@@ -1,4 +1,6 @@
+Push-Location
cd $PSScriptRoot/../..
dotnet build
dotnet tool install -g dotnet-coverage
-dotnet-coverage collect -f cobertura -o report.cobertura.xml "dotnet test --no-build"
\ No newline at end of file
+dotnet-coverage collect -f cobertura -o report.cobertura.xml "dotnet test --no-build"
+Pop-Location
\ No newline at end of file
diff --git a/samples/Calculator/tests/Calculator.Console.Tests/Calculator.Console.Tests.csproj b/samples/Calculator/tests/Calculator.Console.Tests/Calculator.Console.Tests.csproj
index ea48478..dcacc81 100644
--- a/samples/Calculator/tests/Calculator.Console.Tests/Calculator.Console.Tests.csproj
+++ b/samples/Calculator/tests/Calculator.Console.Tests/Calculator.Console.Tests.csproj
@@ -10,9 +10,9 @@
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/samples/Calculator/tests/Calculator.Core.Tests/Calculator.Core.Tests.csproj b/samples/Calculator/tests/Calculator.Core.Tests/Calculator.Core.Tests.csproj
index e068db8..29d2c53 100644
--- a/samples/Calculator/tests/Calculator.Core.Tests/Calculator.Core.Tests.csproj
+++ b/samples/Calculator/tests/Calculator.Core.Tests/Calculator.Core.Tests.csproj
@@ -10,9 +10,9 @@
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/samples/Calculator/tests/Calculator.Server.IntegrationTests/Calculator.Server.IntegrationTests.csproj b/samples/Calculator/tests/Calculator.Server.IntegrationTests/Calculator.Server.IntegrationTests.csproj
index 897bb0e..4f8fdec 100644
--- a/samples/Calculator/tests/Calculator.Server.IntegrationTests/Calculator.Server.IntegrationTests.csproj
+++ b/samples/Calculator/tests/Calculator.Server.IntegrationTests/Calculator.Server.IntegrationTests.csproj
@@ -10,10 +10,10 @@
-
+
-
+
diff --git a/samples/Calculator/tests/Calculator.Server.Tests/Calculator.Server.Tests.csproj b/samples/Calculator/tests/Calculator.Server.Tests/Calculator.Server.Tests.csproj
index e0bd63d..968fbb5 100644
--- a/samples/Calculator/tests/Calculator.Server.Tests/Calculator.Server.Tests.csproj
+++ b/samples/Calculator/tests/Calculator.Server.Tests/Calculator.Server.Tests.csproj
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/samples/VisualStudio/src/CoverageStatus/CoverageStatus.csproj b/samples/VisualStudio/src/CoverageStatus/CoverageStatus.csproj
index 7c67ac0..5ee9fc5 100644
--- a/samples/VisualStudio/src/CoverageStatus/CoverageStatus.csproj
+++ b/samples/VisualStudio/src/CoverageStatus/CoverageStatus.csproj
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+
diff --git a/samples/VisualStudio/tests/ChangesetViewLibrary.Tests/ChangesetViewLibrary.Tests.csproj b/samples/VisualStudio/tests/ChangesetViewLibrary.Tests/ChangesetViewLibrary.Tests.csproj
index b4d4d36..b57950d 100644
--- a/samples/VisualStudio/tests/ChangesetViewLibrary.Tests/ChangesetViewLibrary.Tests.csproj
+++ b/samples/VisualStudio/tests/ChangesetViewLibrary.Tests/ChangesetViewLibrary.Tests.csproj
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+
diff --git a/samples/VisualStudio/tests/CoverageStatus.Tests/CoverageStatus.Tests.csproj b/samples/VisualStudio/tests/CoverageStatus.Tests/CoverageStatus.Tests.csproj
index 816bf8a..5139273 100644
--- a/samples/VisualStudio/tests/CoverageStatus.Tests/CoverageStatus.Tests.csproj
+++ b/samples/VisualStudio/tests/CoverageStatus.Tests/CoverageStatus.Tests.csproj
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+
diff --git a/samples/VisualStudio/tests/MultiTfmLibrary.Tests/MultiTfmLibrary.Tests.csproj b/samples/VisualStudio/tests/MultiTfmLibrary.Tests/MultiTfmLibrary.Tests.csproj
index 4f8e116..ebe7bd3 100644
--- a/samples/VisualStudio/tests/MultiTfmLibrary.Tests/MultiTfmLibrary.Tests.csproj
+++ b/samples/VisualStudio/tests/MultiTfmLibrary.Tests/MultiTfmLibrary.Tests.csproj
@@ -11,10 +11,10 @@
-
-
-
-
+
+
+
+
diff --git a/samples/VisualStudio/tests/SourceViewLibrary.Tests/SourceViewLibrary.Tests.csproj b/samples/VisualStudio/tests/SourceViewLibrary.Tests/SourceViewLibrary.Tests.csproj
index a6d7761..1443b3a 100644
--- a/samples/VisualStudio/tests/SourceViewLibrary.Tests/SourceViewLibrary.Tests.csproj
+++ b/samples/VisualStudio/tests/SourceViewLibrary.Tests/SourceViewLibrary.Tests.csproj
@@ -14,10 +14,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/CodeCoverageSample/SampleLibrary.Tests/SampleLibrary.Tests.csproj b/src/CodeCoverageSample/SampleLibrary.Tests/SampleLibrary.Tests.csproj
index 5a67353..4e68660 100644
--- a/src/CodeCoverageSample/SampleLibrary.Tests/SampleLibrary.Tests.csproj
+++ b/src/CodeCoverageSample/SampleLibrary.Tests/SampleLibrary.Tests.csproj
@@ -9,10 +9,10 @@
-
-
-
-
+
+
+
+
diff --git a/src/CodeCoverageSample/WpfApplication.Tests/WpfApplication.Tests.csproj b/src/CodeCoverageSample/WpfApplication.Tests/WpfApplication.Tests.csproj
index 3f4df08..e227e8b 100644
--- a/src/CodeCoverageSample/WpfApplication.Tests/WpfApplication.Tests.csproj
+++ b/src/CodeCoverageSample/WpfApplication.Tests/WpfApplication.Tests.csproj
@@ -9,9 +9,9 @@
-
-
-
+
+
+
diff --git a/src/Merging/TestProject/TestProject.csproj b/src/Merging/TestProject/TestProject.csproj
index d7a7bf9..a2dd291 100644
--- a/src/Merging/TestProject/TestProject.csproj
+++ b/src/Merging/TestProject/TestProject.csproj
@@ -10,10 +10,10 @@
-
-
-
-
+
+
+
+