Merge pull request #85 from jakubch1/main

Updates to newer version of TA packages
microsoft · Jan 19, 2024 · d1dc0bb · d1dc0bb
2 parents 0459cbd + 76c03dd
commit d1dc0bb
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/Algorithms_Scenario01.yml b/.github/workflows/Algorithms_Scenario01.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Build
       run: dotnet build --no-restore
     - name: Test
-      run: dotnet run --no-build --ms-coverage --ms-coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --ms-coverage-output-format cobertura
+      run: dotnet run --no-build --coverage --coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --coverage-output-format cobertura
     - name: ReportGenerator
       uses: danielpalme/ReportGenerator-GitHub-Action@5.2.0
       with:

diff --git a/.github/workflows/Algorithms_Scenario02.yml b/.github/workflows/Algorithms_Scenario02.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Build
       run: dotnet build --no-restore
     - name: Test
-      run: dotnet run --no-build --ms-coverage --ms-coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --ms-coverage-output-format cobertura --ms-coverage-settings ../../scenarios/scenario02/coverage.config
+      run: dotnet run --no-build --coverage --coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --coverage-output-format cobertura --coverage-settings ../../scenarios/scenario02/coverage.config
     - name: ReportGenerator
       uses: danielpalme/ReportGenerator-GitHub-Action@5.2.0
       with:

diff --git a/.github/workflows/Algorithms_Scenario03.yml b/.github/workflows/Algorithms_Scenario03.yml
@@ -26,7 +26,7 @@ jobs:
     - name: Build
       run: dotnet build --no-restore /p:MsCodeCoverageInstrumentation="true"
     - name: Test
-      run: dotnet run --no-build --ms-coverage --ms-coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --ms-coverage-output-format cobertura
+      run: dotnet run --no-build --coverage --coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --coverage-output-format cobertura
     - name: ReportGenerator
       uses: danielpalme/ReportGenerator-GitHub-Action@5.2.0
       with:

diff --git a/samples/Algorithms/scenarios/scenario01/README.md b/samples/Algorithms/scenarios/scenario01/README.md
@@ -9,7 +9,7 @@ Collect code coverage using dynamic instrumentation for MSTest runner project.
 ```shell
 git clone https://github.com/microsoft/codecoverage.git
 cd codecoverage/samples/Algorithms/tests/Algorithms.Core.Tests/
-dotnet run --ms-coverage --ms-coverage-output report.cobertura.xml --ms-coverage-output-format cobertura
+dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
 ```
 
 You can also use [run.ps1](run.ps1) to collect code coverage.
@@ -30,7 +30,7 @@ You can also use [run.ps1](run.ps1) to collect code coverage.
     - name: Build
       run: dotnet build --no-restore
     - name: Test
-      run: dotnet run --no-build --ms-coverage --ms-coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --ms-coverage-output-format cobertura
+      run: dotnet run --no-build --coverage --coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --coverage-output-format cobertura
     - name: ReportGenerator
       uses: danielpalme/ReportGenerator-GitHub-Action@5.2.0
       with:
@@ -70,7 +70,7 @@ steps:
 - task: DotNetCoreCLI@2
   inputs:
     command: 'run'
-    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --ms-coverage --ms-coverage-output $(Agent.TempDirectory)/report.cobertura.xml --ms-coverage-output-format cobertura --report-trx'
+    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --coverage --coverage-output $(Agent.TempDirectory)/report.cobertura.xml --coverage-output-format cobertura --report-trx'
     projects: '$(projectPath)' # this is specific to example - in most cases not needed
   displayName: 'test'
 

diff --git a/samples/Algorithms/scenarios/scenario01/azure-pipelines.yml b/samples/Algorithms/scenarios/scenario01/azure-pipelines.yml
@@ -24,7 +24,7 @@ steps:
 - task: DotNetCoreCLI@2
   inputs:
     command: 'run'
-    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --ms-coverage --ms-coverage-output $(Agent.TempDirectory)/report.cobertura.xml --ms-coverage-output-format cobertura --report-trx'
+    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --coverage --coverage-output $(Agent.TempDirectory)/report.cobertura.xml --coverage-output-format cobertura --report-trx'
     projects: '$(projectPath)' # this is specific to example - in most cases not needed
   displayName: 'test'
 

diff --git a/samples/Algorithms/scenarios/scenario01/run.ps1 b/samples/Algorithms/scenarios/scenario01/run.ps1
@@ -1,2 +1,2 @@
 cd $PSScriptRoot/../../tests/Algorithms.Core.Tests
-dotnet run --ms-coverage --ms-coverage-output report.cobertura.xml --ms-coverage-output-format cobertura
+dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
diff --git a/samples/Algorithms/scenarios/scenario02/README.md b/samples/Algorithms/scenarios/scenario02/README.md
@@ -22,7 +22,7 @@ Collect code coverage using static instrumentation for MSTest runner project. As
 ```shell
 git clone https://github.com/microsoft/codecoverage.git
 cd codecoverage/samples/Algorithms/tests/Algorithms.Core.Tests/
-dotnet run --ms-coverage --ms-coverage-output report.cobertura.xml --ms-coverage-output-format cobertura --ms-coverage-settings ../../scenarios/scenario02/coverage.config
+dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura --coverage-settings ../../scenarios/scenario02/coverage.config
 ```
 
 You can also use [run.ps1](run.ps1) to collect code coverage.
@@ -43,7 +43,7 @@ You can also use [run.ps1](run.ps1) to collect code coverage.
     - name: Build
       run: dotnet build --no-restore
     - name: Test
-      run: dotnet run --no-build --ms-coverage --ms-coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --ms-coverage-output-format cobertura --ms-coverage-settings ../../scenarios/scenario02/coverage.config
+      run: dotnet run --no-build --coverage --coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --coverage-output-format cobertura --coverage-settings ../../scenarios/scenario02/coverage.config
     - name: ReportGenerator
       uses: danielpalme/ReportGenerator-GitHub-Action@5.2.0
       with:
@@ -83,7 +83,7 @@ steps:
 - task: DotNetCoreCLI@2
   inputs:
     command: 'run'
-    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --ms-coverage --ms-coverage-output $(Agent.TempDirectory)/report.cobertura.xml --ms-coverage-output-format cobertura --report-trx'
+    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --coverage --coverage-output $(Agent.TempDirectory)/report.cobertura.xml --coverage-output-format cobertura --report-trx'
     projects: '$(projectPath)' # this is specific to example - in most cases not needed
   displayName: 'test'
 

diff --git a/samples/Algorithms/scenarios/scenario02/azure-pipelines.yml b/samples/Algorithms/scenarios/scenario02/azure-pipelines.yml
@@ -24,7 +24,7 @@ steps:
 - task: DotNetCoreCLI@2
   inputs:
     command: 'run'
-    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --ms-coverage --ms-coverage-output $(Agent.TempDirectory)/report.cobertura.xml --ms-coverage-output-format cobertura --ms-coverage-settings $(Build.SourcesDirectory)/samples/Algorithms/scenarios/scenario02/coverage.config --report-trx'
+    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --coverage --coverage-output $(Agent.TempDirectory)/report.cobertura.xml --coverage-output-format cobertura --coverage-settings $(Build.SourcesDirectory)/samples/Algorithms/scenarios/scenario02/coverage.config --report-trx'
     projects: '$(projectPath)' # this is specific to example - in most cases not needed
   displayName: 'test'
 

diff --git a/samples/Algorithms/scenarios/scenario02/run.ps1 b/samples/Algorithms/scenarios/scenario02/run.ps1
@@ -1,2 +1,2 @@
 cd $PSScriptRoot/../../tests/Algorithms.Core.Tests
-dotnet run --ms-coverage --ms-coverage-output report.cobertura.xml --ms-coverage-output-format cobertura --ms-coverage-settings $PSScriptRoot/coverage.config
+dotnet run --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura --coverage-settings $PSScriptRoot/coverage.config
diff --git a/samples/Algorithms/scenarios/scenario03/README.md b/samples/Algorithms/scenarios/scenario03/README.md
@@ -10,7 +10,7 @@ Collect code coverage using compile-time instrumentation for MSTest runner proje
 git clone https://github.com/microsoft/codecoverage.git
 cd codecoverage/samples/Algorithms/tests/Algorithms.Core.Tests/
 dotnet build /p:MsCodeCoverageInstrumentation="true"
-dotnet run --no-build --ms-coverage --ms-coverage-output report.cobertura.xml --ms-coverage-output-format cobertura
+dotnet run --no-build --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
 ```
 
 You can also use [run.ps1](run.ps1) to collect code coverage.
@@ -31,7 +31,7 @@ You can also use [run.ps1](run.ps1) to collect code coverage.
     - name: Build
       run: dotnet build --no-restore /p:MsCodeCoverageInstrumentation="true"
     - name: Test
-      run: dotnet run --no-build --ms-coverage --ms-coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --ms-coverage-output-format cobertura
+      run: dotnet run --no-build --coverage --coverage-output $GITHUB_WORKSPACE/report.cobertura.xml --coverage-output-format cobertura
     - name: ReportGenerator
       uses: danielpalme/ReportGenerator-GitHub-Action@5.2.0
       with:
@@ -71,7 +71,7 @@ steps:
 - task: DotNetCoreCLI@2
   inputs:
     command: 'run'
-    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --ms-coverage --report-trx'
+    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --coverage --report-trx'
     projects: '$(projectPath)' # this is specific to example - in most cases not needed
   displayName: 'test'
 

diff --git a/samples/Algorithms/scenarios/scenario03/azure-pipelines.yml b/samples/Algorithms/scenarios/scenario03/azure-pipelines.yml
@@ -24,7 +24,7 @@ steps:
 - task: DotNetCoreCLI@2
   inputs:
     command: 'run'
-    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --ms-coverage --report-trx'
+    arguments: '--no-build --configuration $(buildConfiguration) --results-directory $(Agent.TempDirectory) --coverage --report-trx'
     projects: '$(projectPath)' # this is specific to example - in most cases not needed
   displayName: 'test'
 

diff --git a/samples/Algorithms/scenarios/scenario03/run.ps1 b/samples/Algorithms/scenarios/scenario03/run.ps1
@@ -1,3 +1,3 @@
 cd $PSScriptRoot/../../tests/Algorithms.Core.Tests
 dotnet build /p:MsCodeCoverageInstrumentation="true"
-dotnet run --no-build --ms-coverage --ms-coverage-output report.cobertura.xml --ms-coverage-output-format cobertura
+dotnet run --no-build --coverage --coverage-output report.cobertura.xml --coverage-output-format cobertura
diff --git 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 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSTest" Version="3.2.0-preview.23623.1" />
-    <PackageReference Include="Microsoft.Testing.Platform.Extensions" Version="1.0.0-preview.23622.9" />
-    <PackageReference Include="Microsoft.Testing.Platform.Extensions.CodeCoverage" Version="17.10.0-preview.23622.1" />
-    <PackageReference Include="Microsoft.CodeCoverage.MSBuild" Version="17.10.0-preview.23622.1" />
+    <PackageReference Include="MSTest" Version="3.2.0-preview.24069.3" />
+    <PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.0.0-preview.24068.6" />
+    <PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.10.1-preview.24069.1" />
+    <PackageReference Include="Microsoft.CodeCoverage.MSBuild" Version="17.10.1-preview.24069.1" />
   </ItemGroup>
 
   <ItemGroup>