From ca6e48cd81afa137609eb8a0be55b3070c322197 Mon Sep 17 00:00:00 2001
From: Gen Lu <gel@microsoft.com>
Date: Tue, 20 Apr 2021 15:39:34 -0700
Subject: [PATCH] Use signed packages and remove internal feed

---
 .vsts-ci.yml       |  4 ----
 NuGet.config       |  1 -
 eng/Versions.props | 24 ++++++++++--------------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 3fbdf7537..23eac359e 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -36,10 +36,6 @@ stages:
     - task: ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
       displayName: Install Swix Plugin
 
-    # otherwise it'll complain about accessing an internal feed.
-    - task: NuGetAuthenticate@0
-      displayName: 'Authenticate to AzDO Feeds'
-
     - script: eng\common\CIBuild.cmd
                 -configuration $(BuildConfiguration)
                 /p:OfficialBuildId=$(Build.BuildNumber)
diff --git a/NuGet.config b/NuGet.config
index ecc226ea9..712e69220 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -8,7 +8,6 @@
     <add key="dotnet5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json" />
     <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="vssdk-unifiedPIAs" value="https://pkgs.dev.azure.com/devdiv/DevDiv/_packaging/vssdk-unifiedPIAs/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>
diff --git a/eng/Versions.props b/eng/Versions.props
index 86f96bdf9..9c36d2a94 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,7 +18,8 @@
   <PropertyGroup>
     <!-- Versions used by several individual references below -->  
     <MicrosoftCodeAnalysisPackagesVersion>4.0.0-1.21215.26</MicrosoftCodeAnalysisPackagesVersion>
-    <MicrosoftVisualStudioShellPackagesVersion>17.0.0-preview-1-31214-1111</MicrosoftVisualStudioShellPackagesVersion>   
+    <MicrosoftVisualStudioShellPackagesVersion>17.0.0-preview-1-31216-036</MicrosoftVisualStudioShellPackagesVersion> 
+    <MicrosoftVisualStudioEditorPackagesVersion>17.0.30-g62d2639511</MicrosoftVisualStudioEditorPackagesVersion>  
     <!-- Roslyn -->
     <MicrosoftCodeAnalysisAnalyzersVersion>3.3.2</MicrosoftCodeAnalysisAnalyzersVersion>
     <MicrosoftCodeAnalysisCommonVersion>$(MicrosoftCodeAnalysisPackagesVersion)</MicrosoftCodeAnalysisCommonVersion>
@@ -31,28 +32,28 @@
     <EnvDTEVersion>$(MicrosoftVisualStudioShellPackagesVersion)</EnvDTEVersion>
     <MicrosoftServiceHubFrameworkVersion>2.7.2466</MicrosoftServiceHubFrameworkVersion>
     <MicrosoftVisualStudioCompositionVersion>16.9.6-alpha</MicrosoftVisualStudioCompositionVersion>
-    <MicrosoftVisualStudioComponentModelHostVersion>17.0.30-g62d2639511</MicrosoftVisualStudioComponentModelHostVersion>
-    <MicrosoftVisualStudioCoreUtilityVersion>17.0.30-g62d2639511</MicrosoftVisualStudioCoreUtilityVersion>
-    <MicrosoftVisualStudioEditorVersion>17.0.30-g62d2639511</MicrosoftVisualStudioEditorVersion>
+    <MicrosoftVisualStudioComponentModelHostVersion>$(MicrosoftVisualStudioEditorPackagesVersion)</MicrosoftVisualStudioComponentModelHostVersion>
+    <MicrosoftVisualStudioCoreUtilityVersion>$(MicrosoftVisualStudioEditorPackagesVersion)</MicrosoftVisualStudioCoreUtilityVersion>
+    <MicrosoftVisualStudioEditorVersion>$(MicrosoftVisualStudioEditorPackagesVersion)</MicrosoftVisualStudioEditorVersion>
     <MicrosoftVisualStudioImageCatalogVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImageCatalogVersion>
     <MicrosoftVisualStudioImagingInterop140DesignTimeVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImagingInterop140DesignTimeVersion>
     <MicrosoftVisualStudioImagingVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioImagingVersion>
-    <MicrosoftVisualStudioLanguageStandardClassificationVersion>17.0.30-g62d2639511</MicrosoftVisualStudioLanguageStandardClassificationVersion>
+    <MicrosoftVisualStudioLanguageStandardClassificationVersion>$(MicrosoftVisualStudioEditorPackagesVersion)</MicrosoftVisualStudioLanguageStandardClassificationVersion>
     <MicrosoftVisualStudioSDKAnalyzersVersion>16.9.2-alpha</MicrosoftVisualStudioSDKAnalyzersVersion>
     <MicrosoftVisualStudioShell150Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShell150Version>
     <MicrosoftVisualStudioShellFrameworkVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellFrameworkVersion>
     <MicrosoftVisualStudioShellInteropVersion>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioShellInteropVersion>
-    <MicrosoftVisualStudioTextDataVersion>17.0.30-g62d2639511</MicrosoftVisualStudioTextDataVersion>
-    <MicrosoftVisualStudioTextLogicVersion>17.0.30-g62d2639511</MicrosoftVisualStudioTextLogicVersion>
+    <MicrosoftVisualStudioTextDataVersion>$(MicrosoftVisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextDataVersion>
+    <MicrosoftVisualStudioTextLogicVersion>$(MicrosoftVisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextLogicVersion>
     <MicrosoftVisualStudioTextManagerInterop80Version>$(MicrosoftVisualStudioShellPackagesVersion)</MicrosoftVisualStudioTextManagerInterop80Version>
-    <MicrosoftVisualStudioTextUIWpfVersion>17.0.30-g62d2639511</MicrosoftVisualStudioTextUIWpfVersion>
+    <MicrosoftVisualStudioTextUIWpfVersion>$(MicrosoftVisualStudioEditorPackagesVersion)</MicrosoftVisualStudioTextUIWpfVersion>
     <MicrosoftVisualStudioThreadingVersion>16.10.53-alpha</MicrosoftVisualStudioThreadingVersion>
     <MicrosoftVisualStudioUtilitiesInternalVersion>16.3.23</MicrosoftVisualStudioUtilitiesInternalVersion>
     <MicrosoftVisualStudioValidationVersion>16.9.32</MicrosoftVisualStudioValidationVersion>
     <NuGetSolutionRestoreManagerInteropVersion>5.6.0</NuGetSolutionRestoreManagerInteropVersion>
     <StreamJsonRpcVersion>2.7.67</StreamJsonRpcVersion>
     <VSLangProjVersion>17.0.0-preview-1-31214-1111</VSLangProjVersion>
-    <MicrosoftVisualStudioTemplateWizardInterfaceVersion>17.0.0-preview-1-31209-1111</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
+    <MicrosoftVisualStudioTemplateWizardInterfaceVersion>17.0.0-preview-1-30928-1111</MicrosoftVisualStudioTemplateWizardInterfaceVersion>
     <MicrosoftVSSDKBuildToolsVersion>17.0.63-dev17-g3f11f5ab</MicrosoftVSSDKBuildToolsVersion>
     <MicroBuildPluginsSwixBuildVersion>1.1.33</MicroBuildPluginsSwixBuildVersion>    
     <SystemThreadingTasksDataflowVersion>5.0.0</SystemThreadingTasksDataflowVersion>
@@ -71,9 +72,4 @@
     <RoslynDiagnosticsAnalyzersVersion>2.9.8</RoslynDiagnosticsAnalyzersVersion>
     <StyleCopAnalyzersVersion>1.2.0-beta.164</StyleCopAnalyzersVersion>
   </PropertyGroup>
-  
- <!-- We are using unsigned VS pacakges temporarily -->
-  <PropertyGroup>
-    <NoWarn>$(NoWarn);NU3027;NU3018</NoWarn>
-  </PropertyGroup>
 </Project>