Merge branch 'release/7.1'

GitVersion.yml

@@ -0,0 +1,5 @@
+assembly-versioning-scheme: MajorMinorPatchTag
+mode: ContinuousDeployment
+branches: {}
+ignore:
+  sha: []

TA.DigitalDomeworks.AscomDome/Dome.cs → TA.DigitalDomewoks.AscomDome/Dome.cs

@@ -2,18 +2,18 @@
 // 
 // Copyright © 2016-2018 Tigra Astronomy, all rights reserved.
 // 
-// File: Dome.cs  Last modified: 2018-04-21@21:39 by Tim Long
+// File: Dome.cs  Last modified: 2018-09-01@18:14 by Tim Long
 
 using System;
 using System.Collections;
 using System.Runtime.InteropServices;
 using ASCOM;
 using ASCOM.DeviceInterface;
 using JetBrains.Annotations;
+using TA.DigitalDomeworks.Aspects;
 using TA.DigitalDomeworks.DeviceInterface;
 using TA.DigitalDomeworks.Server;
 using TA.DigitalDomeworks.SharedTypes;
-using TA.PostSharp.Aspects;
 using TI.DigitalDomeWorks;
 using NotImplementedException = ASCOM.NotImplementedException;
 
@@ -35,6 +35,97 @@ public Dome()
             clientId = SharedResources.ConnectionManager.RegisterClient("ASCOM Dome");
             }
 
+        public string Description => "ASCOM Dome driver for Digital Domeworks";
+
+        public string DriverInfo => @"ASCOM Dome driver for Digital Domeworks, 2018 reboot
+An open source ASCOM driver by Tigra Astronomy
+Home page: http://tigra-astronomy.com
+Source code: https://bitbucket.org/tigra-astronomy/ta.digitaldomeworks
+License: https://tigra.mit-license.org/
+Copyright © 2018 Tigra Astronomy";
+
+        public string DriverVersion => "7.0";
+
+        public short InterfaceVersion => 2;
+
+        public string Name => "Digital Domeworks 2018 Reboot";
+
+        public ArrayList SupportedActions => new ArrayList
+            {
+            Constants.ActionNameDsrSwingoutState,
+            Constants.ActionNameControllerStatus
+            };
+
+        public double Altitude => throw new PropertyNotImplementedException(nameof(Altitude), accessorSet: false);
+
+        [MustBeConnected]
+        public bool AtHome => controller.AtHome;
+
+        [MustBeConnected]
+        public bool AtPark { get; private set; }
+
+        [MustBeConnected]
+        public double Azimuth => controller.AzimuthDegrees;
+
+        public bool CanFindHome => true;
+
+        public bool CanPark => true;
+
+        public bool CanSetAltitude => false;
+
+        public bool CanSetAzimuth => true;
+
+        public bool CanSetPark => false;
+
+        public bool CanSetShutter => true;
+
+        public bool CanSlave => false;
+
+        public bool CanSyncAzimuth => false;
+
+        [MustBeConnected]
+        public ShutterState ShutterStatus
+            {
+            get
+                {
+                if (controller.ShutterMovementDirection == ShutterDirection.Closing)
+                    return ShutterState.shutterClosing;
+                if (controller.ShutterMovementDirection == ShutterDirection.Opening)
+                    return ShutterState.shutterOpening;
+                if (controller.ShutterPosition == SensorState.Closed)
+                    return ShutterState.shutterClosed;
+                if (controller.ShutterPosition == SensorState.Open)
+                    return ShutterState.shutterOpen;
+                return ShutterState.shutterError;
+                }
+            }
+
+        public bool Slaved
+            {
+            get => false;
+            set => throw new NotImplementedException();
+            }
+
+        [MustBeConnected]
+        public bool Slewing => controller.IsMoving;
+
+        public bool Connected
+            {
+            get => controller?.IsConnected ?? false;
+            set
+                {
+                if (value)
+                    {
+                    controller = SharedResources.ConnectionManager.GoOnline(clientId);
+                    }
+                else
+                    {
+                    SharedResources.ConnectionManager.GoOffline(clientId);
+                    controller = null; //[Sentinel]
+                    }
+                }
+            }
+
         public void SetupDialog()
             {
             SharedResources.DoSetupDialog(clientId);
@@ -131,97 +222,6 @@ public void SyncToAzimuth(double Azimuth)
             throw new NotImplementedException();
             }
 
-        public bool Connected
-            {
-            get => controller?.IsConnected ?? false;
-            set
-                {
-                if (value)
-                    {
-                    controller = SharedResources.ConnectionManager.GoOnline(clientId);
-                    }
-                else
-                    {
-                    SharedResources.ConnectionManager.GoOffline(clientId);
-                    controller = null; //[Sentinel]
-                    }
-                }
-            }
-
-        public string Description => "ASCOM Dome driver for Digital Domeworks";
-
-        public string DriverInfo => @"ASCOM Dome driver for Digital Domeworks, 2018 reboot
-An open source ASCOM driver by Tigra Astronomy
-Home page: http://tigra-astronomy.com
-Source code: https://bitbucket.org/tigra-astronomy/ta.digitaldomeworks
-License: https://tigra.mit-license.org/
-Copyright © 2018 Tigra Astronomy";
-
-        public string DriverVersion => "7.0";
-
-        public short InterfaceVersion => 2;
-
-        public string Name => "Digital Domeworks 2018 Reboot";
-
-        public ArrayList SupportedActions => new ArrayList
-            {
-            Constants.ActionNameDsrSwingoutState,
-            Constants.ActionNameControllerStatus
-            };
-
-        public double Altitude => throw new PropertyNotImplementedException(nameof(Altitude), accessorSet: false);
-
-        [MustBeConnected]
-        public bool AtHome => controller.AtHome;
-
-        [MustBeConnected]
-        public bool AtPark { get; private set; }
-
-        [MustBeConnected]
-        public double Azimuth => controller.AzimuthDegrees;
-
-        public bool CanFindHome => true;
-
-        public bool CanPark => true;
-
-        public bool CanSetAltitude => false;
-
-        public bool CanSetAzimuth => true;
-
-        public bool CanSetPark => false;
-
-        public bool CanSetShutter => true;
-
-        public bool CanSlave => false;
-
-        public bool CanSyncAzimuth => false;
-
-        [MustBeConnected]
-        public ShutterState ShutterStatus
-            {
-            get
-                {
-                if (controller.ShutterMovementDirection == ShutterDirection.Closing)
-                    return ShutterState.shutterClosing;
-                if (controller.ShutterMovementDirection == ShutterDirection.Opening)
-                    return ShutterState.shutterOpening;
-                if (controller.ShutterPosition == SensorState.Closed)
-                    return ShutterState.shutterClosed;
-                if (controller.ShutterPosition == SensorState.Open)
-                    return ShutterState.shutterOpen;
-                return ShutterState.shutterError;
-                }
-            }
-
-        public bool Slaved
-            {
-            get => false;
-            set => throw new NotImplementedException();
-            }
-
-        [MustBeConnected]
-        public bool Slewing => controller.IsMoving;
-
         [NotNull]
         private string CustomActionDsrSwingoutSensorState()
             {

TA.DigitalDomewoks.AscomDome/Properties/AssemblyInfo.cs

@@ -0,0 +1,17 @@
+// This file is part of the TA.DigitalDomeworks project
+// 
+// Copyright © 2016-2018 Tigra Astronomy, all rights reserved.
+// 
+// File: AssemblyInfo.cs  Last modified: 2018-09-01@17:52 by Tim Long
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("TA.DigitalDomewoks.AscomDome")]
+[assembly: AssemblyDescription("")]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2067d7e2-410a-4b8b-9d07-425d27bace10")]

TA.DigitalDomewoks.AscomDome/TA.DigitalDomewoks.AscomDome.csproj

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{2067D7E2-410A-4B8B-9D07-425D27BACE10}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TA.DigitalDomewoks.AscomDome</RootNamespace>
+    <AssemblyName>TA.DigitalDomewoks.AscomDome</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\BuildOutput\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\BuildOutput\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Dome.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="GitVersionTask">
+      <Version>4.0.0</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="JetBrains.Annotations">
+      <Version>2018.2.1</Version>
+    </PackageReference>
+    <PackageReference Include="PostSharp">
+      <Version>6.0.32</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\TA.DigitalDomeworks.Aspects\TA.DigitalDomeworks.Aspects.csproj">
+      <Project>{7b39350a-905b-4d14-8408-fd74334e53d3}</Project>
+      <Name>TA.DigitalDomeworks.Aspects</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TA.DigitalDomeworks.DeviceInterface\TA.DigitalDomeworks.DeviceInterface.csproj">
+      <Project>{c0e526b9-e19d-42b4-8aee-08a775d9e0b6}</Project>
+      <Name>TA.DigitalDomeworks.DeviceInterface</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TA.DigitalDomeworks.Server\TA.DigitalDomeworks.Server.csproj">
+      <Project>{ff0b89e7-3601-4b5f-b0da-17c329d2ee2d}</Project>
+      <Name>TA.DigitalDomeworks.Server</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\TA.DigitalDomeworks.SharedTypes\TA.DigitalDomeworks.SharedTypes.csproj">
+      <Project>{1224a06b-5a84-452f-af63-cf8ef7d6713e}</Project>
+      <Name>TA.DigitalDomeworks.SharedTypes</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\TA.DigitalDomeworks.SharedCode\TA.DigitalDomeworks.SharedCode.projitems" Label="Shared" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>