Skip to content

Commit 97d4610

Browse files
committed
Up-level to version7.0 and fix build issue.
1 parent ce73411 commit 97d4610

4 files changed

Lines changed: 7 additions & 19 deletions

File tree

Conform/Conform.vbproj

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -141,27 +141,15 @@
141141
<Reference Include="ASCOM.DeviceInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
142142
<Private>True</Private>
143143
</Reference>
144-
<Reference Include="ASCOM.DriverAccess, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
145-
<SpecificVersion>False</SpecificVersion>
146-
<HintPath>..\..\..\..\..\..\..\ASCOM Trunk\ASCOM.DriverAccess\bin\Release\ASCOM.DriverAccess.dll</HintPath>
147-
<Private>True</Private>
148-
</Reference>
149-
<Reference Include="ASCOM.Exceptions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
150-
<SpecificVersion>False</SpecificVersion>
151-
<HintPath>..\..\..\..\..\..\..\ASCOM Trunk\Interfaces\ASCOMExceptions\bin\Release\ASCOM.Exceptions.dll</HintPath>
152-
<Private>True</Private>
153-
</Reference>
144+
<Reference Include="ASCOM.DriverAccess, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
145+
<Reference Include="ASCOM.Exceptions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
154146
<Reference Include="ASCOM.Interfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
155147
<SpecificVersion>False</SpecificVersion>
156148
<EmbedInteropTypes>False</EmbedInteropTypes>
157149
<HintPath>..\..\..\..\..\..\..\ASCOM Trunk\Interfaces\Master Interfaces\ASCOM.Interfaces.dll</HintPath>
158150
<Private>True</Private>
159151
</Reference>
160-
<Reference Include="ASCOM.Utilities, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
161-
<SpecificVersion>False</SpecificVersion>
162-
<HintPath>..\..\..\..\..\..\..\ASCOM Trunk\ASCOM.Utilities\ASCOM.Utilities\bin\Release\ASCOM.Utilities.dll</HintPath>
163-
<Private>True</Private>
164-
</Reference>
152+
<Reference Include="ASCOM.Utilities, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL" />
165153
<Reference Include="System" />
166154
<Reference Include="System.Core">
167155
<RequiredTargetFramework>3.5</RequiredTargetFramework>

Conform/Devices/CoverCalibrator Tester.vb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Friend Class CoverCalibratorTester
8484

8585
Public Overrides Sub CheckAccessibility()
8686
Dim deviceInterface As ICoverCalibratorV1
87-
Dim driverAccessDevice As CoverCalibrator
87+
Dim driverAccessDevice As DriverAccess.CoverCalibrator
8888
Dim deviceObject As Object
8989

9090
MyBase.CheckAccessibility(g_CoverCalibratorProgID, DeviceType.CoverCalibrator)

Setup/BuildConform.msbuild

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<PropertyGroup>
66

77
<!-- Conform major and minor version numbers -->
8-
<MajorVersion>6</MajorVersion>
9-
<MinorVersion>6</MinorVersion>
8+
<MajorVersion>7</MajorVersion>
9+
<MinorVersion>0</MinorVersion>
1010

1111
<!-- Folder variables -->
1212
<ConformSolutionDirectory>$(MSBuildProjectDirectory)\..</ConformSolutionDirectory>

Setup/Conform6.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
; Stores Conform version in the Platform Registry Profile
2020

2121
[Setup]
22-
#define MyAppVer GetFileVersion("..\Conform\bin\Release\Conform.exe") ; define variable
22+
#define MyAppVer GetVersionNumbersString("..\Conform\bin\Release\Conform.exe") ; define variable
2323
AppID={{CEDF90C4-A415-4903-94D6-9099F7AE41B5}
2424
AppCopyright=Copyright © 2021 Peter Simpson
2525
AppName=ASCOM Conform

0 commit comments

Comments
 (0)