From caa9e27790f45a7f10649614508887793373c792 Mon Sep 17 00:00:00 2001
From: Andy Jordan <2226434+andyleejordan@users.noreply.github.com>
Date: Thu, 2 May 2024 09:36:46 -0700
Subject: [PATCH] Enable `dotnet` telemetry in CI

---
 .github/workflows/ci-test.yml                    | 3 ---
 .github/workflows/codeql-analysis.yml            | 1 -
 .github/workflows/emacs-test.yml                 | 1 -
 .github/workflows/vim-test.yml                   | 1 -
 .pipelines/PowerShellEditorServices-Official.yml | 5 ++---
 5 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index df7032bbc..ceec61b37 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -4,9 +4,7 @@ on:
   push:
     branches: [ main ]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [ main ]
-    paths-ignore: [ '**/*.md' ]
   merge_group:
     types: [ checks_requested ]
   schedule:
@@ -22,7 +20,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     env:
       DOTNET_NOLOGO: true
-      DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_GENERATE_ASPNET_CERTIFICATE: false
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 9475151aa..81deb8c41 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -24,7 +24,6 @@ jobs:
       security-events: write
     env:
       DOTNET_NOLOGO: true
-      DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_GENERATE_ASPNET_CERTIFICATE: false
     steps:
     - name: Checkout repository
diff --git a/.github/workflows/emacs-test.yml b/.github/workflows/emacs-test.yml
index 3f3ec37a9..351b233f9 100644
--- a/.github/workflows/emacs-test.yml
+++ b/.github/workflows/emacs-test.yml
@@ -16,7 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOTNET_NOLOGO: true
-      DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_GENERATE_ASPNET_CERTIFICATE: false
     steps:
       - name: Checkout repository
diff --git a/.github/workflows/vim-test.yml b/.github/workflows/vim-test.yml
index 88e0d4f03..90898830d 100644
--- a/.github/workflows/vim-test.yml
+++ b/.github/workflows/vim-test.yml
@@ -16,7 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOTNET_NOLOGO: true
-      DOTNET_CLI_TELEMETRY_OPTOUT: true
       DOTNET_GENERATE_ASPNET_CERTIFICATE: false
     steps:
       - name: Checkout repository
diff --git a/.pipelines/PowerShellEditorServices-Official.yml b/.pipelines/PowerShellEditorServices-Official.yml
index f37bc0239..d90e2694c 100644
--- a/.pipelines/PowerShellEditorServices-Official.yml
+++ b/.pipelines/PowerShellEditorServices-Official.yml
@@ -21,7 +21,6 @@ variables:
   BuildConfiguration: Release
   WindowsContainerImage: onebranch.azurecr.io/windows/ltsc2019/vse2022:latest
   DOTNET_NOLOGO: true
-  DOTNET_CLI_TELEMETRY_OPTOUT: true
   DOTNET_GENERATE_ASPNET_CERTIFICATE: false
 
 resources:
@@ -64,10 +63,10 @@ extends:
               system: Custom
               customVersion: $(package.version)
           - task: UseDotNet@2
-            displayName: Use .NET 8.x SDK
+            displayName: Use .NET SDK
             inputs:
               packageType: sdk
-              version: 8.x
+              useGlobalJson: true
           - task: UseDotNet@2
             displayName: Use .NET 7.x runtime (for tests)
             inputs: