Enable codecov for windows (#777)

cleaning props/targets

updating to new version of codecov

adding env_vars

updating yml

adding env_vars

solving compilation issue

adding source root

adding source root

fixing wrong tag

commenting sourceroot

enabling deterministic for packs only

changing job titles

Co-authored-by: Cijo Thomas <cithomas@microsoft.com>

.github/workflows/dotnet-core-cov.yml

@@ -7,13 +7,15 @@ on:
     branches: [ master ]
 
 jobs:
-  build-test:
+  build-test-report:
     runs-on: ${{ matrix.os }}
 
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
+    env:
+      OS: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
@@ -36,8 +38,10 @@ jobs:
       run: dotnet tool install -g dotnet-reportgenerator-globaltool
     
     - name: Merging test results
-      run: reportgenerator -reports:TestResults/**/*.xml -targetdir:TestResults -reporttypes:Cobertura -verbosity:Verbose
+      run: reportgenerator -reports:TestResults/**/*.xml -targetdir:TestResults -reporttypes:Cobertura
 
-    - uses: codecov/codecov-action@v1
+    - uses: codecov/codecov-action@v1.0.10
       with:
         file: TestResults/Cobertura.xml
+        env_vars: OS
+        name: Code Coverage for ${{ matrix.os }}

.github/workflows/dotnet-core.yml

@@ -7,7 +7,7 @@ on:
     branches: [ master ]
 
 jobs:
-  build-test:
+  build-test-pack:
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -28,7 +28,7 @@ jobs:
       run: dotnet restore
 
     - name: dotnet build
-      run: dotnet build --configuration Release --no-restore
+      run: dotnet build --configuration Release --no-restore -p:Deterministic=true
 
     - name: dotnet test
       run: dotnet test -p:CollectCoverage=false --configuration Release --no-build --logger:"console;verbosity=detailed"

build/Common.prod.props

@@ -22,7 +22,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
-  <Target Name="AssemblyVersionTarget" AfterTargets="MinVer">
+  <Target Name="AssemblyVersionTarget" AfterTargets="MinVer" Condition="'$(Configuration)'=='Release'">
     <PropertyGroup>
       <RevisionNumber>$(MinVerVersion.Split(`.`)[3])</RevisionNumber>
       <AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).$(RevisionNumber)</AssemblyVersion>      
@@ -60,6 +60,14 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(Deterministic)'=='true'">
+    <SourceRoot Include="$(MSBuildThisFileDirectory)/"/>
+  </ItemGroup>
+
+  <PropertyGroup Condition="'$(Deterministic)'=='true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" Condition="'$(SkipAnalysis)'!='true'">
       <PrivateAssets>All</PrivateAssets>

build/Common.test.props

@@ -27,19 +27,6 @@
 
   <PropertyGroup Condition="$(MSBuildProjectName.Contains('.Tests'))">
     <IsTestProject>true</IsTestProject>
-    <CollectCoverage Condition="$(CollectCoverage) == '' AND $([MSBuild]::IsOSUnixLike())">true</CollectCoverage>
-  </PropertyGroup>
-
-  <PropertyGroup Label="CollectCodeCoverageResults" Condition="$(CollectCoverage) == 'true'">
-    <CoverletOutputFormat>cobertura</CoverletOutputFormat>
-    <_BaseDir>..\..\TestResults\</_BaseDir>
-    <CoverletBaseDir>$(_BaseDir)Coverage\</CoverletBaseDir>
-    <CoverletResultsDir>$(_BaseDir)Results\</CoverletResultsDir>
-    <CoverletBaseDir Condition="$([MSBuild]::IsOSUnixLike())">$(CoverletBaseDir.Replace('\', '/'))</CoverletBaseDir>
-    <CoverletResultsDir Condition="$([MSBuild]::IsOSUnixLike())">$(CoverletResultsDir.Replace('\', '/'))</CoverletResultsDir>
-    <CoverletOutput>$(CoverletBaseDir)$(MSBuildProjectName).xml</CoverletOutput>
-    <Exclude>[xunit*]*,[*.Tests]*</Exclude>
-    <DebugType>pdbonly</DebugType> <!-- Coverlet needs full debug symbols -->
   </PropertyGroup>
 
   <ItemGroup>

test/Directory.Build.targets

@@ -3,20 +3,9 @@
 
   <ItemGroup>
     <DotNetCliToolReference Include="dotnet-reportgenerator-cli" Version="4.1.10" />
-    <!-- <PackageReference Include="coverlet.msbuild" Version="2.9.0">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference> -->
     <PackageReference Include="coverlet.collector" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-
-  <Target Name="CovertReportResults" AfterTargets="GenerateCoverageResult" Condition="$(CollectCoverage)">
-    <!-- Merges the reports into one -->
-    <Exec Command="dotnet reportgenerator -reports:$(CoverletBaseDir)*.xml -targetdir:$(CoverletResultsDir) -reporttypes:Cobertura -verbosity:Verbose" WorkingDirectory="$(ProjectDir)" />
-    <!-- Gives the summary in an Azure Pipelines look & feel -->
-    <Exec Command="dotnet reportgenerator -reports:$(CoverletResultsDir)Cobertura.xml -targetdir:$(CoverletResultsDir) -reporttypes:'HtmlInline_AzurePipelines;Cobertura' -verbosity:Verbose" WorkingDirectory="$(ProjectDir)" />
-  </Target>
 </Project>