Skip to content

Commit b11a7ae

Browse files
graham22graham22
committed
Updated setup to include Pull request changes
1 parent fe4fb83 commit b11a7ae

File tree

12 files changed

+1059
-11537
lines changed

12 files changed

+1059
-11537
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ $RECYCLE.BIN/
223223

224224
# Windows Installer files
225225
*.cab
226-
*.msi
227226
*.msm
228227
*.msp
229228

‎ModbusMaster/ModbusMaster.csproj‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,21 @@
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
1515
<FileAlignment>512</FileAlignment>
16+
<PublishUrl>publish\</PublishUrl>
17+
<Install>true</Install>
18+
<InstallFrom>Disk</InstallFrom>
19+
<UpdateEnabled>false</UpdateEnabled>
20+
<UpdateMode>Foreground</UpdateMode>
21+
<UpdateInterval>7</UpdateInterval>
22+
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
23+
<UpdatePeriodically>false</UpdatePeriodically>
24+
<UpdateRequired>false</UpdateRequired>
25+
<MapFileExtensions>true</MapFileExtensions>
26+
<ApplicationRevision>0</ApplicationRevision>
27+
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
28+
<IsWebBootstrapper>false</IsWebBootstrapper>
29+
<UseApplicationTrust>false</UseApplicationTrust>
30+
<BootstrapperEnabled>true</BootstrapperEnabled>
1631
</PropertyGroup>
1732
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
1833
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -58,6 +73,9 @@
5873
<CodeAnalysisIgnoreBuiltInRules>false</CodeAnalysisIgnoreBuiltInRules>
5974
<CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
6075
</PropertyGroup>
76+
<PropertyGroup>
77+
<SignAssembly>false</SignAssembly>
78+
</PropertyGroup>
6179
<ItemGroup>
6280
<Reference Include="System" />
6381
<Reference Include="System.Core" />
@@ -116,6 +134,23 @@
116134
<Name>ModbusLib</Name>
117135
</ProjectReference>
118136
</ItemGroup>
137+
<ItemGroup>
138+
<BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
139+
<Visible>False</Visible>
140+
<ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
141+
<Install>true</Install>
142+
</BootstrapperPackage>
143+
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
144+
<Visible>False</Visible>
145+
<ProductName>.NET Framework 3.5 SP1</ProductName>
146+
<Install>false</Install>
147+
</BootstrapperPackage>
148+
<BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
149+
<Visible>False</Visible>
150+
<ProductName>Windows Installer 4.5</ProductName>
151+
<Install>true</Install>
152+
</BootstrapperPackage>
153+
</ItemGroup>
119154
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
120155
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
121156
Other similar extension points exist, see Microsoft.Common.targets.

‎ModbusMasterSetup/ModbusMasterSetup.isl‎

Lines changed: 0 additions & 5696 deletions
This file was deleted.

‎ModbusMasterSetup/ModbusMasterSetup.isproj‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎ModbusSlaveSetup/ModbusSlaveSetup.isl‎

Lines changed: 0 additions & 5698 deletions
This file was deleted.

‎ModbusSlaveSetup/ModbusSlaveSetup.isproj‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎ModbusTool.sln‎

Lines changed: 35 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Modbus.Common", "CommonCont
1111
EndProject
1212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModbusSlave", "ModbusSlave\ModbusSlave.csproj", "{BB022D22-F720-4E96-BD12-583F8DC3A9C2}"
1313
EndProject
14-
Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "ModbusSlaveSetup", "ModbusSlaveSetup\ModbusSlaveSetup.isproj", "{EEA83B38-E424-4666-9BB5-B5C61678D881}"
15-
ProjectSection(ProjectDependencies) = postProject
16-
{BB022D22-F720-4E96-BD12-583F8DC3A9C2} = {BB022D22-F720-4E96-BD12-583F8DC3A9C2}
17-
EndProjectSection
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Setup", "Setup", "{5654844F-0A76-449C-AF38-82E0797DC188}"
1815
EndProject
19-
Project("{6141683F-8A12-4E36-9623-2EB02B2C2303}") = "ModbusMasterSetup", "ModbusMasterSetup\ModbusMasterSetup.isproj", "{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}"
20-
ProjectSection(ProjectDependencies) = postProject
21-
{9A0EC5E1-B32F-4103-BAFA-DFAEC9C2B50C} = {9A0EC5E1-B32F-4103-BAFA-DFAEC9C2B50C}
22-
EndProjectSection
16+
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "ModbusTool", "Setup\ModbusTool\ModbusTool.vdproj", "{25937867-E6BD-46E7-8054-86FE89E890B3}"
2317
EndProject
2418
Global
2519
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -148,68 +142,41 @@ Global
148142
{BB022D22-F720-4E96-BD12-583F8DC3A9C2}.SingleImage|Mixed Platforms.Build.0 = Release|x86
149143
{BB022D22-F720-4E96-BD12-583F8DC3A9C2}.SingleImage|x86.ActiveCfg = Release|Any CPU
150144
{BB022D22-F720-4E96-BD12-583F8DC3A9C2}.SingleImage|x86.Build.0 = Release|x86
151-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.CD_ROM|Any CPU.ActiveCfg = CD_ROM
152-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.CD_ROM|Any CPU.Build.0 = CD_ROM
153-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.CD_ROM|Mixed Platforms.ActiveCfg = CD_ROM
154-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.CD_ROM|Mixed Platforms.Build.0 = CD_ROM
155-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.CD_ROM|x86.ActiveCfg = CD_ROM
156-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.CD_ROM|x86.Build.0 = CD_ROM
157-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Debug|Any CPU.ActiveCfg = DVD-5
158-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Debug|Any CPU.Build.0 = DVD-5
159-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Debug|Mixed Platforms.ActiveCfg = DVD-5
160-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Debug|Mixed Platforms.Build.0 = DVD-5
161-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Debug|x86.ActiveCfg = DVD-5
162-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Debug|x86.Build.0 = DVD-5
163-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.DVD-5|Any CPU.ActiveCfg = DVD-5
164-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.DVD-5|Any CPU.Build.0 = DVD-5
165-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.DVD-5|Mixed Platforms.ActiveCfg = DVD-5
166-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.DVD-5|Mixed Platforms.Build.0 = DVD-5
167-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.DVD-5|x86.ActiveCfg = DVD-5
168-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.DVD-5|x86.Build.0 = DVD-5
169-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Release|Any CPU.ActiveCfg = SingleImage
170-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Release|Any CPU.Build.0 = SingleImage
171-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Release|Mixed Platforms.ActiveCfg = SingleImage
172-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Release|Mixed Platforms.Build.0 = SingleImage
173-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Release|x86.ActiveCfg = SingleImage
174-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.Release|x86.Build.0 = SingleImage
175-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.SingleImage|Any CPU.ActiveCfg = SingleImage
176-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.SingleImage|Any CPU.Build.0 = SingleImage
177-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.SingleImage|Mixed Platforms.ActiveCfg = SingleImage
178-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.SingleImage|Mixed Platforms.Build.0 = SingleImage
179-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.SingleImage|x86.ActiveCfg = SingleImage
180-
{EEA83B38-E424-4666-9BB5-B5C61678D881}.SingleImage|x86.Build.0 = SingleImage
181-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.CD_ROM|Any CPU.ActiveCfg = CD_ROM
182-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.CD_ROM|Any CPU.Build.0 = CD_ROM
183-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.CD_ROM|Mixed Platforms.ActiveCfg = CD_ROM
184-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.CD_ROM|Mixed Platforms.Build.0 = CD_ROM
185-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.CD_ROM|x86.ActiveCfg = CD_ROM
186-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.CD_ROM|x86.Build.0 = CD_ROM
187-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Debug|Any CPU.ActiveCfg = DVD-5
188-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Debug|Any CPU.Build.0 = DVD-5
189-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Debug|Mixed Platforms.ActiveCfg = DVD-5
190-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Debug|Mixed Platforms.Build.0 = DVD-5
191-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Debug|x86.ActiveCfg = DVD-5
192-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Debug|x86.Build.0 = DVD-5
193-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.DVD-5|Any CPU.ActiveCfg = DVD-5
194-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.DVD-5|Any CPU.Build.0 = DVD-5
195-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.DVD-5|Mixed Platforms.ActiveCfg = DVD-5
196-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.DVD-5|Mixed Platforms.Build.0 = DVD-5
197-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.DVD-5|x86.ActiveCfg = DVD-5
198-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.DVD-5|x86.Build.0 = DVD-5
199-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Release|Any CPU.ActiveCfg = SingleImage
200-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Release|Any CPU.Build.0 = SingleImage
201-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Release|Mixed Platforms.ActiveCfg = SingleImage
202-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Release|Mixed Platforms.Build.0 = SingleImage
203-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Release|x86.ActiveCfg = SingleImage
204-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.Release|x86.Build.0 = SingleImage
205-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.SingleImage|Any CPU.ActiveCfg = SingleImage
206-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.SingleImage|Any CPU.Build.0 = SingleImage
207-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.SingleImage|Mixed Platforms.ActiveCfg = SingleImage
208-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.SingleImage|Mixed Platforms.Build.0 = SingleImage
209-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.SingleImage|x86.ActiveCfg = SingleImage
210-
{68A3D8D6-2F3F-424C-A8B7-F16708C21B7F}.SingleImage|x86.Build.0 = SingleImage
145+
{25937867-E6BD-46E7-8054-86FE89E890B3}.CD_ROM|Any CPU.ActiveCfg = Release
146+
{25937867-E6BD-46E7-8054-86FE89E890B3}.CD_ROM|Any CPU.Build.0 = Release
147+
{25937867-E6BD-46E7-8054-86FE89E890B3}.CD_ROM|Mixed Platforms.ActiveCfg = Release
148+
{25937867-E6BD-46E7-8054-86FE89E890B3}.CD_ROM|Mixed Platforms.Build.0 = Release
149+
{25937867-E6BD-46E7-8054-86FE89E890B3}.CD_ROM|x86.ActiveCfg = Release
150+
{25937867-E6BD-46E7-8054-86FE89E890B3}.CD_ROM|x86.Build.0 = Release
151+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Debug|Any CPU.ActiveCfg = Debug
152+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Debug|Any CPU.Build.0 = Debug
153+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Debug|Mixed Platforms.ActiveCfg = Debug
154+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Debug|Mixed Platforms.Build.0 = Debug
155+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Debug|x86.ActiveCfg = Debug
156+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Debug|x86.Build.0 = Debug
157+
{25937867-E6BD-46E7-8054-86FE89E890B3}.DVD-5|Any CPU.ActiveCfg = Debug
158+
{25937867-E6BD-46E7-8054-86FE89E890B3}.DVD-5|Any CPU.Build.0 = Debug
159+
{25937867-E6BD-46E7-8054-86FE89E890B3}.DVD-5|Mixed Platforms.ActiveCfg = Debug
160+
{25937867-E6BD-46E7-8054-86FE89E890B3}.DVD-5|Mixed Platforms.Build.0 = Debug
161+
{25937867-E6BD-46E7-8054-86FE89E890B3}.DVD-5|x86.ActiveCfg = Debug
162+
{25937867-E6BD-46E7-8054-86FE89E890B3}.DVD-5|x86.Build.0 = Debug
163+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Release|Any CPU.ActiveCfg = Release
164+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Release|Any CPU.Build.0 = Release
165+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Release|Mixed Platforms.ActiveCfg = Release
166+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Release|Mixed Platforms.Build.0 = Release
167+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Release|x86.ActiveCfg = Release
168+
{25937867-E6BD-46E7-8054-86FE89E890B3}.Release|x86.Build.0 = Release
169+
{25937867-E6BD-46E7-8054-86FE89E890B3}.SingleImage|Any CPU.ActiveCfg = Release
170+
{25937867-E6BD-46E7-8054-86FE89E890B3}.SingleImage|Any CPU.Build.0 = Release
171+
{25937867-E6BD-46E7-8054-86FE89E890B3}.SingleImage|Mixed Platforms.ActiveCfg = Release
172+
{25937867-E6BD-46E7-8054-86FE89E890B3}.SingleImage|Mixed Platforms.Build.0 = Release
173+
{25937867-E6BD-46E7-8054-86FE89E890B3}.SingleImage|x86.ActiveCfg = Release
174+
{25937867-E6BD-46E7-8054-86FE89E890B3}.SingleImage|x86.Build.0 = Release
211175
EndGlobalSection
212176
GlobalSection(SolutionProperties) = preSolution
213177
HideSolutionNode = FALSE
214178
EndGlobalSection
179+
GlobalSection(NestedProjects) = preSolution
180+
{25937867-E6BD-46E7-8054-86FE89E890B3} = {5654844F-0A76-449C-AF38-82E0797DC188}
181+
EndGlobalSection
215182
EndGlobal

‎Setup/ModbusMasterSetup.exe‎

-1.74 MB
Binary file not shown.

‎Setup/ModbusSlaveSetup.exe‎

-1.74 MB
Binary file not shown.

‎Setup/ModbusTool.msi‎

653 KB
Binary file not shown.

0 commit comments

Comments
 (0)