Merge main

Author: DerekGn

RfmOta.UnitTests/RfmOta.UnitTests.csproj

@@ -20,7 +20,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector" Version="3.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

RfmOta.UnitTests/Tests.runsettings

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RunSettings>
+	<DataCollectionRunSettings>
+		<DataCollectors>
+			<DataCollector friendlyName="XPlat code coverage">
+				<Configuration>
+					<Format>json,cobertura,lcov,teamcity,opencover</Format>
+					<Exclude>[coverlet.*.tests?]*,[*]Coverlet.Core*</Exclude>
+					<!-- [Assembly-Filter]Type-Filter -->
+					<Include></Include>
+					<!-- [Assembly-Filter]Type-Filter -->
+					<ExcludeByAttribute>Obsolete,GeneratedCodeAttribute,CompilerGeneratedAttribute</ExcludeByAttribute>
+					<ExcludeByFile></ExcludeByFile>
+					<!-- Globbing filter -->
+					<IncludeDirectory></IncludeDirectory>
+					<SingleHit>false</SingleHit>
+					<UseSourceLink>true</UseSourceLink>
+					<IncludeTestAssembly>false</IncludeTestAssembly>
+					<SkipAutoProps>true</SkipAutoProps>
+					<DeterministicReport>false</DeterministicReport>
+				</Configuration>
+			</DataCollector>
+		</DataCollectors>
+	</DataCollectionRunSettings>
+</RunSettings>

RfmOta.sln

@@ -9,6 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RfmOta.UnitTests", "RfmOta.
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{62523B01-834B-4DAF-84E7-B6202DDDFB27}"
 	ProjectSection(SolutionItems) = preProject
+		azure-pipelines.yml = azure-pipelines.yml
 		README.md = README.md
 	EndProjectSection
 EndProject

azure-pipelines.yml

@@ -4,7 +4,7 @@ variables:
 - name: TestProject
   value: '**/*UnitTests.csproj'
 
-name: v$(Major).$(Minor).$(Patch)
+name: $(Major).$(Minor).$(Patch).$(Build)
 
 trigger:
 - main
@@ -24,19 +24,25 @@ steps:
     inputs:
       command: 'test'
       projects: $(TestProject)
-      arguments: '--configuration $(buildConfiguration) --collect "Code coverage"'
-  - task: PublishTestResults@2
-    displayName: "Publish Test Results"
+      arguments: '--configuration $(buildConfiguration) --collect:"XPlat Code Coverage"'
+  - task: PublishCodeCoverageResults@1
     inputs:
-      testRunner: VSTest
-      testResultsFiles: '**\*.trx'
+      codeCoverageTool: 'Cobertura'
+      summaryFileLocation: $(Agent.TempDirectory)/*/coverage.cobertura.xml # using ** instead of * finds duplicate coverage files
+# Workaraound for the pack command not accepting arguments
+# https://github.com/microsoft/azure-pipelines-tasks/issues/11640
   - task: DotNetCoreCLI@2
-    displayName: "Pack Project"
+    displayName: Pack
     inputs:
-      command: 'pack'
-      packagesToPack: '**/*.csproj'
-      versioningScheme: byEnvVar
-      versionEnvVar: PackageVersion
+      command: custom
+      custom: pack
+      arguments: >
+        RfmOta.sln
+        --output $(Build.ArtifactStagingDirectory)
+        -p:PackageVersion=$(PackageVersion)
+        -p:Configuration=$(BuildConfiguration)
+        -p:Version=$(PackageVersion)
+        -p:AssemblyVersion=$(Build.BuildNumber)
   - task: GitHubRelease@1
     displayName: "Publish Relase To GitHub"
     inputs:
@@ -45,7 +51,7 @@ steps:
       action: 'create'
       target: '$(Build.SourceVersion)'
       tagSource: 'userSpecifiedTag'
-      tag: '$(Build.BuildNumber)'
-      title: '$(Build.BuildNumber) - $(BuildConfiguration) - $(Build.SourceBranchName)'
+      tag: 'v$(Build.BuildNumber)'
+      title: 'v$(Build.BuildNumber) - $(BuildConfiguration) - $(Build.SourceBranchName)'
       changeLogCompareToRelease: 'lastFullRelease'
       changeLogType: 'commitBased'