From 64ba82d3820f9f810084ba4f0950e4bbf98b08cb Mon Sep 17 00:00:00 2001
From: Shen Chen <shech@microsoft.com>
Date: Wed, 18 Jan 2023 01:17:31 +0000
Subject: [PATCH 1/2] Merged PR 28924: Updates VS Telemetry to 16.5.28

MSRC fix. According to the mail, we should update to 16.5.28.

The feature branch is based on https://github.com/dotnet/roslyn/pull/66423
The last checked in bug fix is https://github.com/dotnet/roslyn/pull/66359

Since QB doesn't want to approve https://github.com/dotnet/roslyn/pull/66398 now. I feel we shouldn't wait for that change to merge
---
 NuGet.config       | 2 ++
 eng/Versions.props | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index a26b4ca869d72..27a47f8efdde7 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -14,6 +14,8 @@
     <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
+    <!-- This is an internal feed contains the MSRC update packages, do not remove it until the package is open to public -->
+    <add key="dotnet-tools-internal" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />
diff --git a/eng/Versions.props b/eng/Versions.props
index f69881d486560..b23650f28e9ca 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -182,7 +182,7 @@
     <MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
     <MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
     <MicrosoftVisualStudioShellDesignVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellDesignVersion>
-    <MicrosoftVisualStudioTelemetryVersion>16.5.17</MicrosoftVisualStudioTelemetryVersion>
+    <MicrosoftVisualStudioTelemetryVersion>16.5.28</MicrosoftVisualStudioTelemetryVersion>
     <MicrosoftVisualStudioTemplateWizardInterfaceVersion>8.0.0.0-alpha</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
     <MicrosoftVisualStudioTextDataVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
     <MicrosoftVisualStudioTextInternalVersion>$(VisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextInternalVersion>

From fb91b7b6b4196061111f333f4f474db091b32e51 Mon Sep 17 00:00:00 2001
From: Shen Chen <shech@microsoft.com>
Date: Thu, 20 Apr 2023 16:00:41 -0700
Subject: [PATCH 2/2] Remove nuget feed

---
 NuGet.config | 2 --
 1 file changed, 2 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 27a47f8efdde7..a26b4ca869d72 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -14,8 +14,6 @@
     <add key="vssdk" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vssdk/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <add key="vs-buildservices" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
-    <!-- This is an internal feed contains the MSRC update packages, do not remove it until the package is open to public -->
-    <add key="dotnet-tools-internal" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />