Skip to content

Commit 9d0df35

Browse files
kenjiunokenjiuno
committed
installer supports DDEX2015
1 parent a8adfe4 commit 9d0df35

File tree

6 files changed

+167
-157
lines changed

6 files changed

+167
-157
lines changed

‎Npgsql2015.sln

+14-132
Large diffs are not rendered by default.

‎NpgsqlDdexProvider/NpgsqlDdexProvider2015.csproj

+68-16
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<UpgradeBackupLocation>
1010
</UpgradeBackupLocation>
1111
<OldToolsVersion>4.0</OldToolsVersion>
12-
<VsSDKInstall>..\Tools\vssdk12_tools</VsSDKInstall>
12+
<VsSDKInstall>..\Tools\vssdk14_tools</VsSDKInstall>
1313
<VsSDKIncludes>$(VsSDKInstall)\inc</VsSDKIncludes>
1414
<VsSDKToolsPath>$(VsSDKInstall)\bin</VsSDKToolsPath>
1515
<VsixSchemaPath>$(VsSDKInstall)\schemas\VSIXManifestSchema.xsd</VsixSchemaPath>
@@ -56,6 +56,11 @@
5656
<UseVSHostingProcess>true</UseVSHostingProcess>
5757
</PropertyGroup>
5858
<ItemGroup>
59+
<Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
60+
<EmbedInteropTypes>False</EmbedInteropTypes>
61+
<Private>True</Private>
62+
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\envdte.dll</HintPath>
63+
</Reference>
5964
<Reference Include="Microsoft.VisualStudio.Data.Core, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6065
<Private>False</Private>
6166
<HintPath>..\packages\VSSDK.Data.12.12.0.0\lib\net45\Microsoft.VisualStudio.Data.Core.dll</HintPath>
@@ -68,40 +73,87 @@
6873
<Private>False</Private>
6974
<HintPath>..\packages\VSSDK.Data.12.12.0.0\lib\net45\Microsoft.VisualStudio.Data.Services.dll</HintPath>
7075
</Reference>
76+
<Reference Include="Microsoft.VisualStudio.GraphModel, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
77+
<Private>False</Private>
78+
<HintPath>..\packages\VSSDK.GraphModel.14.0.4-preview\lib\net45\Microsoft.VisualStudio.GraphModel.dll</HintPath>
79+
</Reference>
7180
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
7281
<Private>False</Private>
73-
<HintPath>..\packages\VSSDK.OLE.Interop.10.10.0.0\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
82+
<HintPath>..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
83+
</Reference>
84+
<Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
85+
<Private>False</Private>
86+
<HintPath>..\packages\VSSDK.Shell.14.14.0.4-preview\lib\net45\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
87+
</Reference>
88+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
89+
<Private>False</Private>
90+
<HintPath>..\packages\VSSDK.Shell.Immutable.10.10.0.4\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
91+
</Reference>
92+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
93+
<Private>False</Private>
94+
<HintPath>..\packages\VSSDK.Shell.Immutable.11.11.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
95+
</Reference>
96+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
97+
<Private>False</Private>
98+
<HintPath>..\packages\VSSDK.Shell.Immutable.12.12.0.4\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
7499
</Reference>
75-
<Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
100+
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
76101
<Private>False</Private>
77-
<HintPath>..\packages\VSSDK.Shell.12.12.0.0\lib\net45\Microsoft.VisualStudio.Shell.12.0.dll</HintPath>
102+
<HintPath>..\packages\VSSDK.Shell.Immutable.14.14.0.4-preview\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
78103
</Reference>
79-
<Reference Include="Microsoft.VisualStudio.Shell.Interop">
104+
<Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
80105
<Private>False</Private>
81-
<HintPath>..\\packages\VSSDK.Shell.Interop.10.10.0.0\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
106+
<HintPath>..\packages\VSSDK.Shell.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
82107
</Reference>
83108
<Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84109
<EmbedInteropTypes>False</EmbedInteropTypes>
85110
<Private>False</Private>
86111
<HintPath>..\packages\VSSDK.Shell.Interop.11.11.0.0\lib\net20\Microsoft.VisualStudio.Shell.Interop.11.0.dll</HintPath>
87112
</Reference>
88-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0">
89-
<Private>False</Private>
90-
<HintPath>..\packages\VSSDK.Shell.Interop.10.10.0.0\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
91-
</Reference>
92-
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0">
113+
<Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
93114
<Private>False</Private>
94-
<HintPath>..\packages\VSSDK.Shell.Interop.10.10.0.0\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
115+
<HintPath>..\packages\VSSDK.Shell.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
95116
</Reference>
96117
<Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0">
97118
<Private>False</Private>
98119
<HintPath>..\packages\VSSDK.Shell.Interop.10.10.0.0\lib\net20\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
99120
</Reference>
100-
<Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0">
121+
<Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
101122
<Private>False</Private>
102-
<HintPath>..\packages\VSSDK.Shell.Immutable.10.10.0.0\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
123+
<HintPath>..\packages\VSSDK.Shell.Interop.9.9.0.4\lib\net20\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
124+
</Reference>
125+
<Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
126+
<Private>False</Private>
127+
<HintPath>..\packages\VSSDK.TextManager.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
128+
</Reference>
129+
<Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
130+
<Private>False</Private>
131+
<HintPath>..\packages\VSSDK.TextManager.Interop.8.8.0.4\lib\net20\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
132+
</Reference>
133+
<Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
134+
<Private>False</Private>
135+
<HintPath>..\packages\VSSDK.Threading.14.0.4-preview\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
136+
</Reference>
137+
<Reference Include="PresentationCore" />
138+
<Reference Include="PresentationFramework" />
139+
<Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
140+
<EmbedInteropTypes>False</EmbedInteropTypes>
141+
<Private>True</Private>
142+
<HintPath>..\packages\VSSDK.DTE.7.0.4\lib\net20\stdole.dll</HintPath>
103143
</Reference>
104144
<Reference Include="System" />
145+
<Reference Include="System.ComponentModel.Composition" />
146+
<Reference Include="System.Design" />
147+
<Reference Include="System.Drawing" />
148+
<Reference Include="System.Net.Http" />
149+
<Reference Include="System.Transactions" />
150+
<Reference Include="System.Windows.Forms" />
151+
<Reference Include="System.Xaml" />
152+
<Reference Include="System.Xml" />
153+
<Reference Include="System.Xml.Linq" />
154+
<Reference Include="UIAutomationProvider" />
155+
<Reference Include="UIAutomationTypes" />
156+
<Reference Include="WindowsBase" />
105157
</ItemGroup>
106158
<ItemGroup>
107159
<Compile Include="Guids.cs" />
@@ -152,7 +204,7 @@
152204
<UseCodebase>true</UseCodebase>
153205
</PropertyGroup>
154206
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
155-
<Import Project="..\Tools\vssdk12_tools\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
207+
<Import Project="..\Tools\vssdk14_tools\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
156208
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
157209
Other similar extension points exist, see Microsoft.Common.targets.
158210
<Target Name="BeforeBuild">
@@ -167,7 +219,7 @@
167219
</ParameterGroup>
168220
<Task>
169221
<Code Type="Fragment" Language="cs">
170-
System.Environment.SetEnvironmentVariable("VsSDKToolsPath", System.IO.Path.GetFullPath(ProjectDirectory + @"\..\Tools\vssdk12_tools\bin"));
222+
System.Environment.SetEnvironmentVariable("VsSDKToolsPath", System.IO.Path.GetFullPath(ProjectDirectory + @"\..\Tools\vssdk14_tools\bin"));
171223
</Code>
172224
</Task>
173225
</UsingTask>

‎NpgsqlDdexProvider/packages.config

+22-7
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,34 @@
55
<package id="VSSDK.Data.10" version="10.0.0" targetFramework="net40" />
66
<package id="VSSDK.Data.12" version="12.0.0" targetFramework="net45" />
77
<package id="VSSDK.Designer.10" version="10.0.0" targetFramework="net40" />
8+
<package id="VSSDK.DTE" version="7.0.4" targetFramework="net45" />
89
<package id="VSSDK.DTE.10" version="10.0.0" targetFramework="net40" />
9-
<package id="VSSDK.GraphModel.11" version="11.0.0" targetFramework="net45" />
10-
<package id="VSSDK.IDE.10" version="10.0.0" targetFramework="net40" />
11-
<package id="VSSDK.IDE.11" version="11.0.0" targetFramework="net45" />
12-
<package id="VSSDK.IDE.12" version="12.0.0" targetFramework="net45" />
10+
<package id="VSSDK.GraphModel" version="14.0.4-preview" targetFramework="net45" />
11+
<package id="VSSDK.IDE" version="7.0.4" targetFramework="net45" />
12+
<package id="VSSDK.IDE.10" version="10.0.4" targetFramework="net45" />
13+
<package id="VSSDK.IDE.11" version="11.0.4" targetFramework="net45" />
14+
<package id="VSSDK.IDE.12" version="12.0.4" targetFramework="net45" />
15+
<package id="VSSDK.IDE.14" version="14.0.4-preview" targetFramework="net45" />
16+
<package id="VSSDK.IDE.8" version="8.0.4" targetFramework="net45" />
17+
<package id="VSSDK.IDE.9" version="9.0.4" targetFramework="net45" />
18+
<package id="VSSDK.OLE.Interop" version="7.0.4" targetFramework="net45" />
1319
<package id="VSSDK.OLE.Interop.10" version="10.0.0" targetFramework="net40" />
1420
<package id="VSSDK.Shell.10" version="10.0.0" targetFramework="net40" />
1521
<package id="VSSDK.Shell.12" version="12.0.0" targetFramework="net45" />
16-
<package id="VSSDK.Shell.Immutable.10" version="10.0.0" targetFramework="net40" />
17-
<package id="VSSDK.Shell.Immutable.11" version="11.0.0" targetFramework="net45" />
18-
<package id="VSSDK.Shell.Immutable.12" version="12.0.0" targetFramework="net45" />
22+
<package id="VSSDK.Shell.14" version="14.0.4-preview" targetFramework="net45" />
23+
<package id="VSSDK.Shell.Immutable.10" version="10.0.4" targetFramework="net45" />
24+
<package id="VSSDK.Shell.Immutable.11" version="11.0.4" targetFramework="net45" />
25+
<package id="VSSDK.Shell.Immutable.12" version="12.0.4" targetFramework="net45" />
26+
<package id="VSSDK.Shell.Immutable.14" version="14.0.4-preview" targetFramework="net45" />
27+
<package id="VSSDK.Shell.Interop" version="7.0.4" targetFramework="net45" />
1928
<package id="VSSDK.Shell.Interop.10" version="10.0.0" targetFramework="net40" />
2029
<package id="VSSDK.Shell.Interop.11" version="11.0.0" targetFramework="net45" />
30+
<package id="VSSDK.Shell.Interop.8" version="8.0.4" targetFramework="net45" />
31+
<package id="VSSDK.Shell.Interop.9" version="9.0.4" targetFramework="net45" />
32+
<package id="VSSDK.TextManager.Interop" version="7.0.4" targetFramework="net45" />
2133
<package id="VSSDK.TextManager.Interop.10" version="10.0.0" targetFramework="net40" />
34+
<package id="VSSDK.TextManager.Interop.8" version="8.0.4" targetFramework="net45" />
35+
<package id="VSSDK.Threading" version="14.0.4-preview" targetFramework="net45" />
36+
<package id="VSSDK.Threading.14" version="14.0.4-preview" targetFramework="net45" />
2237
<package id="VSSDK.VSLangProj.10" version="10.0.0" targetFramework="net40" />
2338
</packages>

‎installer/License.rtf

-8 Bytes
Binary file not shown.

‎installer/Setup_Npgsql.nsi

+59
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
; !define DDEX2010
2121
; !define DDEX2012
2222
; !define DDEX2013
23+
; !define DDEX2015
2324

2425
!define APP "Npgsql"
2526
!define COM "The Npgsql Development Team"
@@ -107,6 +108,13 @@ Section ""
107108

108109
SectionEnd
109110

111+
!ifdef DDEX2015
112+
Section ""
113+
SetOutPath "$INSTDIR\Npgsql-${VER}-net45-vs2015"
114+
File "..\NpgsqlDdexProvider\bin\Release-net45-vs2015\NpgsqlDdexProvider.vsix" ;Vs2013
115+
SectionEnd
116+
!endif
117+
110118
!ifdef DDEX2013
111119
Section ""
112120
SetOutPath "$INSTDIR\Npgsql-${VER}-net45-vs2013"
@@ -334,6 +342,26 @@ SectionEnd
334342

335343
!endif
336344

345+
!ifdef DDEX2015
346+
347+
Section "NpgsqlDdexProvider(Vs2015)" SecDdex2015
348+
SetOutPath "$INSTDIR"
349+
350+
StrCpy $1 "$INSTDIR\VSIXInstaller.exe"
351+
${IfNot} ${FileExists} $1
352+
StrCpy $0 ""
353+
ReadRegStr $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0" "InstallDir"
354+
StrCpy $1 "$0VSIXInstaller.exe"
355+
${EndIf}
356+
357+
${If} ${FileExists} $1
358+
ExecWait '"$1" "$INSTDIR\Npgsql-${VER}-net45-vs2015\NpgsqlDdexProvider.vsix"' $0
359+
DetailPrint "RetCode: $0"
360+
${EndIf}
361+
SectionEnd
362+
363+
!endif
364+
337365
!ifdef DDEX2013
338366

339367
Section "NpgsqlDdexProvider(Vs2013)" SecDdex2013
@@ -414,6 +442,24 @@ SectionEnd
414442
;--------------------------------
415443
;Uninstaller Section
416444

445+
!ifdef DDEX2015
446+
447+
Section "un.Remove NpgsqlDdexProvider(Vs2015)" UnDdex2015
448+
StrCpy $1 "$INSTDIR\VSIXInstaller.exe"
449+
${IfNot} ${FileExists} $1
450+
StrCpy $0 ""
451+
ReadRegStr $0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0" "InstallDir"
452+
StrCpy $1 "$0VSIXInstaller.exe"
453+
${EndIf}
454+
455+
${If} ${FileExists} $1
456+
ExecWait '"$1" /u:958b9481-2712-4670-9a62-8fe65e5beea7' $0
457+
DetailPrint "RetCode: $0"
458+
${EndIf}
459+
SectionEnd
460+
461+
!endif
462+
417463
!ifdef DDEX2013
418464

419465
Section "un.Remove NpgsqlDdexProvider(Vs2013)" UnDdex2013
@@ -548,8 +594,16 @@ Section "un."
548594
Delete "$INSTDIR\PrintAssemblyName.*"
549595

550596
Delete "$INSTDIR\Npgsql-${VER}-net45\*.dll"
597+
Delete "$INSTDIR\Npgsql-${VER}-net45\*.dll.config"
551598
RMDir "$INSTDIR\Npgsql-${VER}-net45"
552599

600+
Delete "$INSTDIR\Npgsql-${VER}-net40\*.dll"
601+
Delete "$INSTDIR\Npgsql-${VER}-net40\*.dll.config"
602+
RMDir "$INSTDIR\Npgsql-${VER}-net40"
603+
604+
Delete "$INSTDIR\Npgsql-${VER}-net45-vs2015\NpgsqlDdexProvider.vsix"
605+
RMDir "$INSTDIR\Npgsql-${VER}-net45-vs2015"
606+
553607
Delete "$INSTDIR\Npgsql-${VER}-net45-vs2013\NpgsqlDdexProvider.vsix"
554608
RMDir "$INSTDIR\Npgsql-${VER}-net45-vs2013"
555609

@@ -580,6 +634,7 @@ SectionEnd
580634
LangString DESC_SecMonoSecurity ${LANG_ENGLISH} "Install Mono.Security.dll (required by Npgsql.dll) into your GAC. "
581635
LangString DESC_SecCommonLogging ${LANG_ENGLISH} "Install Common.Logging (required by Npgsql.dll) into your GAC. "
582636
LangString DESC_SecMachineConfig ${LANG_ENGLISH} "Install Npgsql DbProviderFactory to machine.config. $\nIt is useful for example: $\n- Npgsql DDEX provider for Visual Studio $\n- Microsoft Power Query for Excel"
637+
LangString DESC_SecDdex2015 ${LANG_ENGLISH} "Install Npgsql DDEX provider for Visual Studio 2015"
583638
LangString DESC_SecDdex2013 ${LANG_ENGLISH} "Install Npgsql DDEX provider for Visual Studio 2013"
584639
LangString DESC_SecDdex2012 ${LANG_ENGLISH} "Install Npgsql DDEX provider for Visual Studio 2012"
585640
LangString DESC_SecDdex2010 ${LANG_ENGLISH} "Install Npgsql DDEX provider for Visual Studio 2010"
@@ -588,6 +643,7 @@ SectionEnd
588643
LangString DESC_UnMonoSecurity ${LANG_ENGLISH} "Uninstall Mono.Security.dll from your GAC."
589644
LangString DESC_UnCommonLogging ${LANG_ENGLISH} "Uninstall Common.Logging from your GAC."
590645
LangString DESC_UnMachineConfig ${LANG_ENGLISH} "Uninstall Npgsql DbProviderFactory from machine.config."
646+
LangString DESC_UnDdex2015 ${LANG_ENGLISH} "Uninstall Npgsql DDEX provider for Visual Studio 2015"
591647
LangString DESC_UnDdex2013 ${LANG_ENGLISH} "Uninstall Npgsql DDEX provider for Visual Studio 2013"
592648
LangString DESC_UnDdex2012 ${LANG_ENGLISH} "Uninstall Npgsql DDEX provider for Visual Studio 2012"
593649
LangString DESC_UnDdex2010 ${LANG_ENGLISH} "Uninstall Npgsql DDEX provider for Visual Studio 2010"
@@ -605,6 +661,9 @@ SectionEnd
605661
!endif
606662
!insertmacro XPUI_DESCRIPTION_TEXT ${SecMachineConfig} $(DESC_SecMachineConfig)
607663
!endif
664+
!ifdef DDEX2015
665+
!insertmacro XPUI_DESCRIPTION_TEXT ${SecDdex2015} $(DESC_SecDdex2015)
666+
!endif
608667
!ifdef DDEX2013
609668
!insertmacro XPUI_DESCRIPTION_TEXT ${SecDdex2013} $(DESC_SecDdex2013)
610669
!endif

0 commit comments

Comments
 (0)