From 4d9f0fbc10ed88e449e7ea09d43da5d4a1d66a70 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 14 Dec 2021 15:52:43 +0100
Subject: [PATCH] [rel/17.1] Update dependencies from
 devdiv/DevDiv/vs-code-coverage (#3221)

* Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage build 20211214.1
* Change nuget structure

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jakub Chocholowicz <jachocho@microsoft.com>
---
 eng/Version.Details.xml                          | 4 ++--
 eng/Versions.props                               | 2 +-
 scripts/build.ps1                                | 3 +++
 scripts/verify-nupkgs.ps1                        | 2 +-
 src/package/nuspec/Microsoft.CodeCoverage.nuspec | 4 ++++
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 587a68d53a..f46b8f3433 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.1.2-beta.21609.3">
+    <Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.1.2-beta.21614.1">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
-      <Sha>ec4e4222e21668f7c475802ef48881c71c62ca79</Sha>
+      <Sha>0e03e541780ab2d28c6ba20828f51a467e75826c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.21508.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index c09afd0569..3ad0a81379 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,7 +80,7 @@
          JS etc.) is risky. This can break setup authoring and cause runtime failures in workloads
          where Rolsyn is not installed. -->
     <MicrosoftCodeAnalysisVersion>3.8.0-3.20427.2</MicrosoftCodeAnalysisVersion>
-    <MicrosoftInternalCodeCoverageVersion>17.1.2-beta.21609.3</MicrosoftInternalCodeCoverageVersion>
+    <MicrosoftInternalCodeCoverageVersion>17.1.2-beta.21614.1</MicrosoftInternalCodeCoverageVersion>
     <MicrosoftDiagnosticsNETCoreClientVersion>0.2.0-preview.21508.1</MicrosoftDiagnosticsNETCoreClientVersion>
     <MicrosoftSourceBuildIntermediatediagnosticsVersion>5.0.0-preview.21508.1</MicrosoftSourceBuildIntermediatediagnosticsVersion>
   </PropertyGroup>
diff --git a/scripts/build.ps1 b/scripts/build.ps1
index d3e527a5b4..465f781cc9 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -875,6 +875,7 @@ function Copy-CodeCoverage-Package-Artifacts
     $codeCoverageInstrumentationPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.visualstudio.coverage.instrumentation\$codeCoverageExternalsVersion\lib\$TPB_TargetFrameworkNS20"
     $codeCoverageImUbuntuPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\ubuntu"
     $codeCoverageImAlpinePackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\alpine"
+    $codeCoverageImMacosPackagesDir = Join-Path $env:TP_PACKAGES_DIR "microsoft.internal.codecoverage\$codeCoverageExternalsVersion\contentFiles\any\any\InstrumentationEngine\macos"
 
     $microsoftCodeCoveragePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.CodeCoverage\")
 
@@ -895,6 +896,8 @@ function Copy-CodeCoverage-Package-Artifacts
     Copy-Item $codeCoverageImUbuntuPackagesDir\x64 $microsoftCodeCoveragePackageDir\InstrumentationEngine\ubuntu\ -Force -Recurse
     New-Item -ItemType directory -Path $microsoftCodeCoveragePackageDir\InstrumentationEngine\alpine\ -Force | Out-Null
     Copy-Item $codeCoverageImAlpinePackagesDir\x64 $microsoftCodeCoveragePackageDir\InstrumentationEngine\alpine\ -Force -Recurse
+    New-Item -ItemType directory -Path $microsoftCodeCoveragePackageDir\InstrumentationEngine\macos\ -Force | Out-Null
+    Copy-Item $codeCoverageImMacosPackagesDir\x64 $microsoftCodeCoveragePackageDir\InstrumentationEngine\macos\ -Force -Recurse
 
     # Copy TraceDataCollector resource dlls
     if($TPB_LocalizedBuild) {
diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
index ab04abc63b..3f654cd39b 100644
--- a/scripts/verify-nupkgs.ps1
+++ b/scripts/verify-nupkgs.ps1
@@ -12,7 +12,7 @@ function Verify-Nuget-Packages($packageDirectory, $version)
 {
     Write-Log "Starting Verify-Nuget-Packages."
     $expectedNumOfFiles = @{
-        "Microsoft.CodeCoverage" = 59;
+        "Microsoft.CodeCoverage" = 62;
         "Microsoft.NET.Test.Sdk" = 27;
         "Microsoft.TestPlatform" = 599;
         "Microsoft.TestPlatform.Build" = 21;
diff --git a/src/package/nuspec/Microsoft.CodeCoverage.nuspec b/src/package/nuspec/Microsoft.CodeCoverage.nuspec
index ce06b0f4e2..f2008f6d88 100644
--- a/src/package/nuspec/Microsoft.CodeCoverage.nuspec
+++ b/src/package/nuspec/Microsoft.CodeCoverage.nuspec
@@ -73,6 +73,10 @@
     <file src="Microsoft.CodeCoverage\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so"	target="build\netstandard1.0\InstrumentationEngine\alpine\x64\libInstrumentationEngine.so" />
     <file src="Microsoft.CodeCoverage\InstrumentationEngine\alpine\x64\VanguardInstrumentationProfiler_x64.config"	target="build\netstandard1.0\InstrumentationEngine\alpine\x64\VanguardInstrumentationProfiler_x64.config" />
 
+    <file src="Microsoft.CodeCoverage\InstrumentationEngine\macos\x64\libCoverageInstrumentationMethod.dylib"	target="build\netstandard1.0\InstrumentationEngine\macos\x64\libCoverageInstrumentationMethod.dylib" />
+    <file src="Microsoft.CodeCoverage\InstrumentationEngine\macos\x64\libInstrumentationEngine.dylib"	target="build\netstandard1.0\InstrumentationEngine\macos\x64\libInstrumentationEngine.dylib" />
+    <file src="Microsoft.CodeCoverage\InstrumentationEngine\macos\x64\VanguardInstrumentationProfiler_x64.config"	target="build\netstandard1.0\InstrumentationEngine\macos\x64\VanguardInstrumentationProfiler_x64.config" />
+
     <file src="Microsoft.CodeCoverage\Shim\netcoreapp1.0\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\netcoreapp1.0\" />
     <file src="Microsoft.CodeCoverage\Shim\net45\Microsoft.VisualStudio.CodeCoverage.Shim.dll" target="lib\net45\" />