From d2ff8cbe6976f300357d5fcf071a108d5734e5cc Mon Sep 17 00:00:00 2001 From: Ryan Shepherd Date: Thu, 17 Jun 2021 13:01:56 -0700 Subject: [PATCH 1/2] Update VSIX to work with Dev17 --- dev/VSIX/Directory.Build.props | 2 +- .../Extension/ProjectReunion.Extension.csproj | 6 ++--- .../Extension/source.extension.vsixmanifest | 26 ++++++++++++++----- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dev/VSIX/Directory.Build.props b/dev/VSIX/Directory.Build.props index 5a9598f467..3728bd7b75 100644 --- a/dev/VSIX/Directory.Build.props +++ b/dev/VSIX/Directory.Build.props @@ -7,7 +7,7 @@ https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json 2.0.210211.2 - 0.5.0-prerelease.20210304.5.ci + 0.5.7 diff --git a/dev/VSIX/Extension/ProjectReunion.Extension.csproj b/dev/VSIX/Extension/ProjectReunion.Extension.csproj index 6c5920ea86..8c6961a942 100644 --- a/dev/VSIX/Extension/ProjectReunion.Extension.csproj +++ b/dev/VSIX/Extension/ProjectReunion.Extension.csproj @@ -56,11 +56,11 @@ - + compile; build; native; contentfiles; analyzers; buildtransitive - + runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -301,7 +301,7 @@ Condition="'$(EnableExperimentalVSIXFeatures)'=='true'" XmlInputPath="$(VsixManifestSource)" Query="/ns:PackageManifest/ns:Metadata/ns:Identity/@Id" - Value="$(_OriginalVsixId).Preview" + Value="$(_OriginalVsixId).Preview" Namespaces="<Namespace Prefix='ns' Uri='http://schemas.microsoft.com/developer/vsx-schema/2011' />" /> false - - - + + x86 + + + amd64 + + + x86 + + + amd64 + + + x86 + + + amd64 + - - - + + NuGet Package Manager From c4ea44753c72f70e307de0d184b8693829356d63 Mon Sep 17 00:00:00 2001 From: Ryan Shepherd Date: Mon, 28 Jun 2021 10:14:04 -0700 Subject: [PATCH 2/2] Re-add Microsoft.VisualStudio.Component.CoreEditor prerequisite --- dev/VSIX/Extension/source.extension.vsixmanifest | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/VSIX/Extension/source.extension.vsixmanifest b/dev/VSIX/Extension/source.extension.vsixmanifest index 5b2d39f0fd..14a077f052 100644 --- a/dev/VSIX/Extension/source.extension.vsixmanifest +++ b/dev/VSIX/Extension/source.extension.vsixmanifest @@ -37,6 +37,7 @@ +