From 7ce2c3c9e02b42e2ef364f8d6ccfc4c243a64fe2 Mon Sep 17 00:00:00 2001
From: Amadeusz Wieczorek <amwieczo@microsoft.com>
Date: Mon, 2 Mar 2020 09:49:22 -0800
Subject: [PATCH 1/3] Update to .net 4.7 and use publicly available Editor
 packages

---
 AsyncCompletion/nuget.config                     |  2 +-
 AsyncCompletion/src/AsyncCompletionSample.csproj | 13 +++++++------
 AsyncCompletion/src/app.config                   |  8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/AsyncCompletion/nuget.config b/AsyncCompletion/nuget.config
index 871901bd..3f0e0034 100644
--- a/AsyncCompletion/nuget.config
+++ b/AsyncCompletion/nuget.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="vside.myget.org vssdk" value="https://vside.myget.org/F/vssdk/api/v3/index.json" />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
 </configuration>
\ No newline at end of file
diff --git a/AsyncCompletion/src/AsyncCompletionSample.csproj b/AsyncCompletion/src/AsyncCompletionSample.csproj
index f4378826..3bd3207a 100644
--- a/AsyncCompletion/src/AsyncCompletionSample.csproj
+++ b/AsyncCompletion/src/AsyncCompletionSample.csproj
@@ -10,6 +10,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <OldToolsVersion>15.0</OldToolsVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -22,7 +23,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AsyncCompletionSample</RootNamespace>
     <AssemblyName>AsyncCompletionSample</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <GeneratePkgDefFile>false</GeneratePkgDefFile>
     <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
     <IncludeDebugSymbolsInVSIXContainer>false</IncludeDebugSymbolsInVSIXContainer>
@@ -74,22 +75,22 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.CoreUtility">
-      <Version>16.0.127</Version>
+      <Version>16.0.467</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Language">
-      <Version>16.0.127</Version>
+      <Version>16.0.467</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.SDK.Analyzers">
       <Version>15.7.11</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Text.Data">
-      <Version>16.0.127</Version>
+      <Version>16.0.467</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Text.Logic">
-      <Version>16.0.127</Version>
+      <Version>16.0.467</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers">
-      <Version>15.7.21</Version>
+      <Version>15.8.192</Version>
     </PackageReference>
     <PackageReference Include="System.Collections.Immutable">
       <Version>1.3.1</Version>
diff --git a/AsyncCompletion/src/app.config b/AsyncCompletion/src/app.config
index 8460dd43..7d58b6f5 100644
--- a/AsyncCompletion/src/app.config
+++ b/AsyncCompletion/src/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>

From 745b0eb80eb01df240a6c08c56bcd30abada5deb Mon Sep 17 00:00:00 2001
From: Amadeusz Wieczorek <amwieczo@microsoft.com>
Date: Mon, 2 Mar 2020 09:58:20 -0800
Subject: [PATCH 2/3] Update the VSIX Manifest and package prerequisites

---
 AsyncCompletion/src/source.extension.vsixmanifest | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/AsyncCompletion/src/source.extension.vsixmanifest b/AsyncCompletion/src/source.extension.vsixmanifest
index 2da1de84..4dd71a00 100644
--- a/AsyncCompletion/src/source.extension.vsixmanifest
+++ b/AsyncCompletion/src/source.extension.vsixmanifest
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="AsyncCompletionSample.3d0d76e1-7922-4a19-8ad5-8ec046f68783" Version="1.0" Language="en-US" Publisher="Amadeusz Wieczorek" />
+        <Identity Id="AsyncCompletionSample.3d0d76e1-7922-4a19-8ad5-8ec046f68783" Version="1.0" Language="en-US" Publisher="Microsoft" />
         <DisplayName>AsyncCompletionSample</DisplayName>
-        <Description>Empty VSIX Project.</Description>
+        <Description xml:space="preserve">VSSDK AsyncCompletion sample</Description>
     </Metadata>
     <Installation>
-        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[15.0, 16.0)" />
+        <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[16.0, 17.0)" />
     </Installation>
     <Dependencies>
         <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
@@ -15,6 +15,6 @@
         <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%|" />
     </Assets>
     <Prerequisites>
-        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
+        <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[16.0,17.0)" DisplayName="Visual Studio core editor" />
     </Prerequisites>
 </PackageManifest>

From 7f43e01687518413f136ba1f34dc7e35cb114af6 Mon Sep 17 00:00:00 2001
From: Amadeusz Wieczorek <amwieczo@microsoft.com>
Date: Mon, 2 Mar 2020 14:17:53 -0800
Subject: [PATCH 3/3] removes nuget.config

---
 AsyncCompletion/nuget.config | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 AsyncCompletion/nuget.config

diff --git a/AsyncCompletion/nuget.config b/AsyncCompletion/nuget.config
deleted file mode 100644
index 3f0e0034..00000000
--- a/AsyncCompletion/nuget.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <packageSources>
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
-  </packageSources>
-</configuration>
\ No newline at end of file