From fab9246e637e863a1c4311eff462035168ce7907 Mon Sep 17 00:00:00 2001
From: Codrin-Victor Poienaru <codrin.poienaru@microsoft.com>
Date: Fri, 14 Jul 2023 09:00:20 +0200
Subject: [PATCH] Fix yml to generate RTM/stable version & fix symbol check
 issues (#4600)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [main] Update dependencies from devdiv/DevDiv/vs-code-coverage (#4594)

* Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage build 20230712.2

Microsoft.Internal.CodeCoverage
 From Version 17.8.0-beta.23360.1 -> To Version 17.8.0-beta.23362.2

* Mire

* Update dependencies from https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage build 20230712.5

Microsoft.Internal.CodeCoverage
 From Version 17.8.0-beta.23360.1 -> To Version 17.8.1-beta.23362.5

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jakub Chocholowicz <jachocho@microsoft.com>

* Fix yml to generate RTM/stable version

---------

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jakub Chocholowicz <jachocho@microsoft.com>
Co-authored-by: Amaury Levé <amauryleve@microsoft.com>
---
 azure-pipelines.yml     | 7 +++++++
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 962d9395c5..89748bab71 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -58,12 +58,18 @@ variables:
     value: False
   - name: _InternalBuildArgs
     value: ' '
+  - name: _ReleaseVersionKind
+    value: ''
   # Arcade is using global cache of nugets in non-windows build
   # under some circumstances, but we don't respect that in our code and try to find them
   # in .packages. Force the location of packages to that folder.
   - name: NUGET_PACKAGES
     value: '$(Build.SourcesDirectory)/.packages/'
 
+  - ${{ if eq(parameters.isRTM, True) }}:
+    - name: _ReleaseVersionKind
+      value: release
+
   # Produce real signed binaries for Internal builds
   - ${{ if eq(variables._RunAsInternal, True) }}:
     # Group gives access to $microsoft-symbol-server-pat and $symweb-symbol-server-pat
@@ -83,6 +89,7 @@ variables:
     - name: _InternalBuildArgs
       value: /p:DotNetSignType=$(_SignType)
         /p:TeamName=$(_TeamName)
+        /p:DotNetFinalVersionKind=$(_ReleaseVersionKind)
         /p:DotNetPublishUsingPipelines=true
         /p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
         /p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index ad9f67856c..8135541fd7 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.7.3">
+    <Dependency Name="Microsoft.Internal.CodeCoverage" Version="17.8.1-beta.23362.5">
       <Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>
-      <Sha>8e1aa0711f4efac22e1f1b977cffc517a54ab8af</Sha>
+      <Sha>2e244945f4192cc5e96aa2e9e6a62f1e47a09ad0</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Diagnostics.NETCore.Client" Version="0.2.0-preview.23211.1">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index f0974fa676..363982d608 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -30,9 +30,9 @@
     <MicrosoftExtensionsDependencyModelPackageVersion>3.0.0</MicrosoftExtensionsDependencyModelPackageVersion>
     <MicrosoftExtensionsFileSystemGlobbingVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
     <MicrosoftFakesVersion>17.4.0-beta.22478.3</MicrosoftFakesVersion>
-    <MicrosoftInternalCodeCoverageVersion>17.7.3</MicrosoftInternalCodeCoverageVersion>
+    <MicrosoftInternalCodeCoverageVersion>17.8.1-beta.23362.5</MicrosoftInternalCodeCoverageVersion>
     <MicrosoftNetCompilersToolsetVersion>4.6.0-1.23107.10</MicrosoftNetCompilersToolsetVersion>
-    <MicrosoftVisualStudioDiagnosticsUtilitiesVersion>17.6.33617.297</MicrosoftVisualStudioDiagnosticsUtilitiesVersion>
+    <MicrosoftVisualStudioDiagnosticsUtilitiesVersion>17.6.33910.51</MicrosoftVisualStudioDiagnosticsUtilitiesVersion>
     <MicrosoftVisualStudioEnterpriseAspNetHelper>$(MicrosoftVisualStudioDiagnosticsUtilitiesVersion)</MicrosoftVisualStudioEnterpriseAspNetHelper>
     <MicrosoftVisualStudioInteropVersion>17.3.32622.426</MicrosoftVisualStudioInteropVersion>
     <MicrosoftVSSDKBuildToolsVersion>17.4.2116</MicrosoftVSSDKBuildToolsVersion>