Skip to content
This repository was archived by the owner on Jan 12, 2024. It is now read-only.

Commit 94a434a

Browse files
kzuadalon
authored andcommitted
Fix dependency versions so the right Prerequisite can be injected
The previous behavior would add a Dependency, which is only applicable if the VSIX you're depending on (i.e. Merq) is NOT a product component. Since Merq ships with Xamarin, this caused an error saying you had to install Xamarin instead. The updated VsixDependency will properly inject a Prerequisite instead, and do the right thing via Willow automatically, installing only the Merq component that Xamarin workload also consumes.
1 parent b37b506 commit 94a434a

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

src/VisualStudio/NuGet.Packaging.VisualStudio.15/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Clide": "3.0.107-pre",
55
"Clide.Installer": "3.0.107-pre",
66
"GitInfo": "1.1.32",
7-
"Merq": "1.1.17-rc",
7+
"Merq": "1.0.0-rc",
88
"Merq.Async": "1.1.17-rc",
99
"Merq.VisualStudio": "1.1.17-rc",
1010
"Microsoft.Build": "15.1.548",
@@ -16,7 +16,7 @@
1616
"MSBuilder.DumpItems": "0.2.1",
1717
"MSBuilder.Introspect": "0.1.5",
1818
"MSBuilder.ThisAssembly.Project": "0.3.3",
19-
"MSBuilder.VsixDependency": "0.2.8",
19+
"MSBuilder.VsixDependency": "0.2.11",
2020
"MSBuilder.VsixInstaller": "0.2.13",
2121
"VSLangProj150": "1.0.0",
2222
"VSSDK.ComponentModelHost.11": "11.0.4"

src/VisualStudio/NuGet.Packaging.VisualStudio.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26403.3
4+
VisualStudioVersion = 15.0.26510.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Packaging.VisualStudio", "NuGet.Packaging.VisualStudio\NuGet.Packaging.VisualStudio.csproj", "{9617EDCD-23BB-41EA-827D-F5729D45B0AF}"
77
EndProject

src/VisualStudio/NuGet.Packaging.VisualStudio/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"dependencies": {
33
"Clide": "3.0.107-pre",
44
"GitInfo": "1.1.32",
5-
"Merq": "1.1.17-rc",
5+
"Merq": "1.0.0-rc",
66
"Microsoft.VisualStudio.Shell.14.0": "14.3.25407",
77
"Microsoft.VisualStudio.Shell.Interop.11.0": "11.0.61030",
88
"MSBuilder.ThisAssembly.Project": "0.3.3",
99
"NuGet.VisualStudio": "4.0.0",
10-
"PropertyChanged.Fody": "1.52.1",
10+
"PropertyChanged.Fody": "1.53.0",
1111
"VSSDK.ComponentModelHost.11": "11.0.4",
1212
"VSSDK.DTE.8": "8.0.4",
1313
"VSSDK.TemplateWizardInterface": "12.0.4",

0 commit comments

Comments
 (0)