Skip to content

Commit dfcc022

Browse files
debugthingsdebugthings
committed
Added Installer executables
1 parent 0956be5 commit dfcc022

File tree

2 files changed

+10
-79
lines changed

2 files changed

+10
-79
lines changed

‎MySQLUDFInstaller x64/Product.wxs‎

Lines changed: 9 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
<Product Id="*" Name="MySQL .NET UDF" Language="1033" Version="1.0.0.0" Manufacturer="James Davis, www.debugthings.com"
66
UpgradeCode="a4d9eaa0-947d-4442-a124-78a7f3ed4815" >
7-
<Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine"
7+
<Package InstallerVersion="405" Compressed="yes" InstallScope="perMachine"
88
Platform="x64" Description="MySQL .NET UDF" Manufacturer="www.debugthings.com" />
99
<Property Id="ARPURLINFOABOUT" Value="https://github.com/jldgit/mysql_udf_dotnet" />
1010
<Property Id="ARPURLUPDATEINFO" Value="http://www.debugthings.com/mysql" />
1111
<Property Id="ARPSIZE" Value="1024" />
12-
12+
1313

1414
<?define CustomText="Use this to install MySQL .NET UDF to a custom location. Use the browse button below to select the directory." ?>
1515
<?define InstallText50="Installs the MySQL .NET UDF plugin to the MySQL 5.0 installation directory and the .NET Assemblies into the GAC." ?>
@@ -108,7 +108,7 @@
108108
<Feature Id="VCRedist12x64" Title="Visual C++ 12.0 Runtime (64-bit)" AllowAdvertise="no" Display="hidden" Level="1">
109109
<MergeRef Id="VCRedistx64"/>
110110
</Feature>
111-
111+
112112
<Feature Id="ProductFeature" Title="MySQL .NET UDF" Level="1" Display="expand" Description="$(var.MainDesc)">
113113
<Feature Id="DotNet20Assemblies" Level="0" Display="hidden" >
114114
<Component Id="cmp_MySQLHostManager20" Guid="{F158CF0A-C7D3-4521-A376-2E71A0B9A8EB}" Directory="GAC35">
@@ -194,17 +194,6 @@
194194
<Condition Level="1"> <![CDATA[NOT MYSQLVERSION OR NOT MYSQLVERSION64]]></Condition>
195195
</Feature>
196196
</Feature>
197-
198-
<!--<Feature Id="ProductSamples" Title="Samples" Level="1">
199-
<Feature Id="SimpleExample" Title="Simple .NET Example" Level="2" >
200-
<ComponentGroupRef Id="cmpgrp_Default" />
201-
<ComponentGroupRef Id="cmpgrp_Default" />
202-
</Feature>
203-
<Feature Id="CompledExample" Title="Complex .NET Example" Level="2">
204-
<ComponentGroupRef Id="cmpgrp_Default" />
205-
<ComponentGroupRef Id="cmpgrp_Default" />
206-
</Feature>
207-
</Feature>-->
208197
</Product>
209198

210199

@@ -317,66 +306,11 @@
317306
</Directory>
318307
</Directory>
319308
</Directory>
309+
<Directory Id="MYSQLUDF" Name="MySQL .NET UDF"></Directory>
320310
</Directory>
321311
</Directory>
322312
</Fragment>
323313

324-
<!--<Fragment>
325-
<Directory Id="TARGETDIR" Name="SourceDir">
326-
<Directory Id="ProgramFiles64Folder">
327-
<Directory Id="MYSQLFOLDER_64" Name="MySQL">
328-
<Directory Id="MYSQLVER50_64" Name="MySQL Server 5.0">
329-
<Directory Id="BIN50_64" Name="bin" />
330-
<Directory Id="LIB50_64" Name="lib">
331-
<Directory Id="PLUGIN50_64" Name="plugin" />
332-
</Directory>
333-
</Directory>
334-
<Directory Id="MYSQLVER51_64" Name="MySQL Server 5.1">
335-
<Directory Id="BIN51_64" Name="bin" />
336-
<Directory Id="LIB51_64" Name="lib">
337-
<Directory Id="PLUGIN51_64" Name="plugin" />
338-
</Directory>
339-
</Directory>
340-
<Directory Id="MYSQLVER52_64" Name="MySQL Server 5.2">
341-
<Directory Id="BIN52_64" Name="bin" />
342-
<Directory Id="LIB52_64" Name="lib">
343-
<Directory Id="PLUGIN52_64" Name="plugin" />
344-
</Directory>
345-
</Directory>
346-
<Directory Id="MYSQLVER53_64" Name="MySQL Server 5.3">
347-
<Directory Id="BIN53_64" Name="bin" />
348-
<Directory Id="LIB53_64" Name="lib">
349-
<Directory Id="PLUGIN53_64" Name="plugin" />
350-
</Directory>
351-
</Directory>
352-
<Directory Id="MYSQLVER54_64" Name="MySQL Server 5.4">
353-
<Directory Id="BIN54_64" Name="bin" />
354-
<Directory Id="LIB54_64" Name="lib">
355-
<Directory Id="PLUGIN54_64" Name="plugin" />
356-
</Directory>
357-
</Directory>
358-
<Directory Id="MYSQLVER55_64" Name="MySQL Server 5.5">
359-
<Directory Id="BIN55_64" Name="bin" />
360-
<Directory Id="LIB55_64" Name="lib">
361-
<Directory Id="PLUGIN55_64" Name="plugin" />
362-
</Directory>
363-
</Directory>
364-
<Directory Id="MYSQLVER56_64" Name="MySQL Server 5.6">
365-
<Directory Id="BIN56_64" Name="bin" />
366-
<Directory Id="LIB56_64" Name="lib">
367-
<Directory Id="PLUGIN56_64" Name="plugin" />
368-
</Directory>
369-
</Directory>
370-
<Directory Id="MYSQLVER57_64" Name="MySQL Server 5.7">
371-
<Directory Id="BIN57_64" Name="bin" />
372-
<Directory Id="LIB57_64" Name="lib">
373-
<Directory Id="PLUGIN57_64" Name="plugin" />
374-
</Directory>
375-
</Directory>
376-
</Directory>
377-
</Directory>
378-
</Directory>
379-
</Fragment>-->
380314

381315
<Fragment>
382316
<Component Id="cmp_MySQLConfig" Guid="*" Directory="BIN50">
@@ -394,7 +328,7 @@
394328
<ComponentGroup Id="cmpgrp_MySQL50" Directory="PLUGIN50">
395329
<ComponentRef Id="cmp_MySQLPlugin" />
396330
</ComponentGroup>
397-
<ComponentGroup Id="cmpgrp_MySQL50_64" Directory="PLUGIN50">
331+
<ComponentGroup Id="cmpgrp_MySQL50_64" Directory="PLUGIN50_64">
398332
<ComponentRef Id="cmp_MySQLPlugin_64" />
399333
</ComponentGroup>
400334

@@ -408,7 +342,7 @@
408342
<ComponentGroup Id="cmpgrp_MySQL51" Directory="PLUGIN51">
409343
<ComponentRef Id="cmp_MySQLPlugin" />
410344
</ComponentGroup>
411-
<ComponentGroup Id="cmpgrp_MySQL51_64" Directory="PLUGIN51">
345+
<ComponentGroup Id="cmpgrp_MySQL51_64" Directory="PLUGIN51_64">
412346
<ComponentRef Id="cmp_MySQLPlugin_64" />
413347
</ComponentGroup>
414348

@@ -422,7 +356,7 @@
422356
<ComponentGroup Id="cmpgrp_MySQL55" Directory="PLUGIN55">
423357
<ComponentRef Id="cmp_MySQLPlugin" />
424358
</ComponentGroup>
425-
<ComponentGroup Id="cmpgrp_MySQL55_64" Directory="PLUGIN55">
359+
<ComponentGroup Id="cmpgrp_MySQL55_64" Directory="PLUGIN55_64">
426360
<ComponentRef Id="cmp_MySQLPlugin_64" />
427361
</ComponentGroup>
428362

@@ -437,7 +371,7 @@
437371
<ComponentGroup Id="cmpgrp_MySQL56" Directory="PLUGIN56">
438372
<ComponentRef Id="cmp_MySQLPlugin" />
439373
</ComponentGroup>
440-
<ComponentGroup Id="cmpgrp_MySQL56_64" Directory="PLUGIN56">
374+
<ComponentGroup Id="cmpgrp_MySQL56_64" Directory="PLUGIN56_64">
441375
<ComponentRef Id="cmp_MySQLPlugin_64" />
442376
</ComponentGroup>
443377

@@ -452,7 +386,7 @@
452386
<ComponentGroup Id="cmpgrp_MySQL57" Directory="PLUGIN57">
453387
<ComponentRef Id="cmp_MySQLPlugin" />
454388
</ComponentGroup>
455-
<ComponentGroup Id="cmpgrp_MySQL57_64" Directory="PLUGIN57">
389+
<ComponentGroup Id="cmpgrp_MySQL57_64" Directory="PLUGIN57_64">
456390
<ComponentRef Id="cmp_MySQLPlugin_64" />
457391
</ComponentGroup>
458392

@@ -463,8 +397,5 @@
463397
<ComponentRef Id="cmp_MySQLConfig" />
464398
</ComponentGroup>
465399

466-
467-
468-
469400
</Fragment>
470401
</Wix>

‎mysqldotnet_custom/MySQLCustomClass.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<DefineConstants>TRACE</DefineConstants>
7171
<Optimize>true</Optimize>
7272
<DebugType>pdbonly</DebugType>
73-
<PlatformTarget>x86</PlatformTarget>
73+
<PlatformTarget>AnyCPU</PlatformTarget>
7474
<ErrorReport>prompt</ErrorReport>
7575
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
7676
</PropertyGroup>

0 commit comments

Comments
 (0)