Skip to content

Commit 335caad

Browse files
Peter-SimpsonPeter-Simpson
committed
2 parents d2e41a2 + 8f294dd commit 335caad

8 files changed

Lines changed: 14 additions & 66 deletions

File tree

‎ASCOM.Alpaca.Device/ASCOM.Alpaca.Device.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<SignAssembly>true</SignAssembly>
2020
<AssemblyOriginatorKeyFile>..\ASCOM.snk</AssemblyOriginatorKeyFile>
2121
<DelaySign>false</DelaySign>
22-
<Configurations>Debug;Release;Swashbuckle_Documentation</Configurations>
22+
<Configurations>Debug;Release</Configurations>
2323
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2424
</PropertyGroup>
2525

‎ASCOM.Alpaca/ASCOM.Alpaca.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<SignAssembly>true</SignAssembly>
2020
<AssemblyOriginatorKeyFile>..\ASCOM.snk</AssemblyOriginatorKeyFile>
2121
<DelaySign>false</DelaySign>
22-
<Configurations>Debug;Release;Swashbuckle_Documentation</Configurations>
22+
<Configurations>Debug;Release</Configurations>
2323
<GenerateDocumentationFile>True</GenerateDocumentationFile>
2424
</PropertyGroup>
2525

‎ASCOM.Com/ASCOM.Com.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<PackageIcon>ASCOMBoarderless.png</PackageIcon>
1414
<PackageTags>ascom;alpaca;com;driveraccess</PackageTags>
1515
<Product>ASCOM COM Components</Product>
16-
<Configurations>Debug;Release;Swashbuckle_Documentation</Configurations>
16+
<Configurations>Debug;Release</Configurations>
1717
<GenerateDocumentationFile>True</GenerateDocumentationFile>
1818
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1919
</PropertyGroup>

‎ASCOM.Common/ASCOM.Common.Alpaca/AlpacaResponses/Response.cs‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
using ASCOM.Common.Com;
22
using System;
3-
4-
#if Swashbuckle_Documentation
5-
using Swashbuckle.AspNetCore.Annotations;
6-
using System.ComponentModel.DataAnnotations;
7-
#endif
3+
using System.ComponentModel;
84

95
namespace ASCOM.Common.Alpaca
106
{
@@ -21,29 +17,18 @@ public class Response : IResponse
2117
/// <summary>
2218
/// Client's transaction ID (0 to 4294967295), as supplied by the client in the command request.
2319
/// </summary>
24-
#if Swashbuckle_Documentation
25-
[SwaggerSchema(Format = "uint32")]
26-
[Range(0, 4294967295)]
27-
#endif
2820
public uint ClientTransactionID { get; set; }
2921

3022
/// <summary>
3123
/// Server's transaction ID (0 to 4294967295), should be unique for each client transaction so that log messages on the client can be associated with logs on the device.
3224
/// </summary>
33-
#if Swashbuckle_Documentation
34-
[SwaggerSchema(Format = "uint32")]
35-
[Range(0, 4294967295)]
36-
#endif
3725
public uint ServerTransactionID { get; set; }
3826

3927
/// <summary>
4028
/// Zero for a successful transaction, or a non-zero integer(-2147483648 to 2147483647) if the device encountered an issue.Devices must use ASCOM reserved error
4129
/// numbers whenever appropriate so that clients can take informed actions. E.g.returning 0x401 (1025) to indicate that an invalid value was received.
4230
/// </summary>
4331
/// <seealso cref="AlpacaErrors"/>
44-
#if Swashbuckle_Documentation
45-
[Range(-2147483648, 2147483647)]
46-
#endif
4732
public AlpacaErrors ErrorNumber { get; set; }
4833

4934
/// <summary>
@@ -58,9 +43,6 @@ public class Response : IResponse
5843
/// Optional field for Windows drivers to return an exception to the client application.
5944
/// </summary>
6045
/// <remarks>Populating this automatically sets the ErrorMessage and ErrorNumber fields; COM errors in the range 0x80040400 to 0x8040FFF are translated to equivalent Alpaca error numbers in the range 0x400 to 0xFFF.</remarks>
61-
#if Swashbuckle_Documentation
62-
[System.Text.Json.Serialization.JsonIgnore]
63-
#endif
6446
public Exception DriverException
6547
{
6648
get

‎ASCOM.Common/ASCOM.Common.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1515
<PackageId>ASCOM.Common.Components</PackageId>
1616
<PackageIcon>ASCOMBoarderless.png</PackageIcon>
17-
<Configurations>Debug;Release;Swashbuckle_Documentation</Configurations>
17+
<Configurations>Debug;Release</Configurations>
1818
</PropertyGroup>
1919

2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -27,21 +27,13 @@
2727
<NoWarn>$(NoWarn);1591</NoWarn>
2828
</PropertyGroup>
2929

30-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Swashbuckle_Documentation|AnyCPU'">
31-
<DefineConstants>TRACE;Swashbuckle_Documentation</DefineConstants>
32-
</PropertyGroup>
33-
3430
<ItemGroup>
3531
<None Include="..\ASCOMBoarderless.png">
3632
<Pack>True</Pack>
3733
<PackagePath></PackagePath>
3834
</None>
3935
</ItemGroup>
4036

41-
<ItemGroup Condition=" '$(Configuration)' == 'Swashbuckle_Documentation' ">
42-
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.4.0" />
43-
</ItemGroup>
44-
4537
<ItemGroup>
4638
<PackageReference Include="ASCOM.Exception.Library" Version="6.6.1" />
4739
</ItemGroup>

‎ASCOM.Tools/ASCOM.Tools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<Description>A set of components to support development of ASCOM clients, drivers and Alpaca devices.</Description>
1111
<Copyright>ASCOM Initiative (c) 2022</Copyright>
1212
<PackageIcon>ASCOMBoarderless.png</PackageIcon>
13-
<Configurations>Debug;Release;Swashbuckle_Documentation</Configurations>
13+
<Configurations>Debug;Release</Configurations>
1414
<GenerateDocumentationFile>True</GenerateDocumentationFile>
1515
<PackageLicenseExpression>MIT</PackageLicenseExpression>
1616
</PropertyGroup>

‎ASCOMLibrary.sln‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ Global
2626
Debug|x86 = Debug|x86
2727
Release|Any CPU = Release|Any CPU
2828
Release|x86 = Release|x86
29-
Swashbuckle_Documentation|Any CPU = Swashbuckle_Documentation|Any CPU
30-
Swashbuckle_Documentation|x86 = Swashbuckle_Documentation|x86
3129
EndGlobalSection
3230
GlobalSection(ProjectConfigurationPlatforms) = postSolution
3331
{EC97A23E-7CB2-43A8-A351-CC4FDDA9CE2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -38,10 +36,6 @@ Global
3836
{EC97A23E-7CB2-43A8-A351-CC4FDDA9CE2C}.Release|Any CPU.Build.0 = Release|Any CPU
3937
{EC97A23E-7CB2-43A8-A351-CC4FDDA9CE2C}.Release|x86.ActiveCfg = Release|Any CPU
4038
{EC97A23E-7CB2-43A8-A351-CC4FDDA9CE2C}.Release|x86.Build.0 = Release|Any CPU
41-
{EC97A23E-7CB2-43A8-A351-CC4FDDA9CE2C}.Swashbuckle_Documentation|Any CPU.ActiveCfg = Swashbuckle_Documentation|Any CPU
42-
{EC97A23E-7CB2-43A8-A351-CC4FDDA9CE2C}.Swashbuckle_Documentation|Any CPU.Build.0 = Swashbuckle_Documentation|Any CPU
43-
{EC97A23E-7CB2-43A8-A351-CC4FDDA9CE2C}.Swashbuckle_Documentation|x86.ActiveCfg = Swashbuckle_Documentation|Any CPU
44-
{EC97A23E-7CB2-43A8-A351-CC4FDDA9CE2C}.Swashbuckle_Documentation|x86.Build.0 = Swashbuckle_Documentation|Any CPU
4539
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
4640
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
4741
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -50,10 +44,6 @@ Global
5044
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Release|Any CPU.Build.0 = Release|Any CPU
5145
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Release|x86.ActiveCfg = Release|Any CPU
5246
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Release|x86.Build.0 = Release|Any CPU
53-
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Swashbuckle_Documentation|Any CPU.ActiveCfg = Swashbuckle_Documentation|Any CPU
54-
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Swashbuckle_Documentation|Any CPU.Build.0 = Swashbuckle_Documentation|Any CPU
55-
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Swashbuckle_Documentation|x86.ActiveCfg = Swashbuckle_Documentation|Any CPU
56-
{F0C9BFFD-C144-44AF-9318-847B19DF5C5B}.Swashbuckle_Documentation|x86.Build.0 = Swashbuckle_Documentation|Any CPU
5747
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5848
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Debug|Any CPU.Build.0 = Debug|Any CPU
5949
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -62,10 +52,6 @@ Global
6252
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Release|Any CPU.Build.0 = Release|Any CPU
6353
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Release|x86.ActiveCfg = Release|Any CPU
6454
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Release|x86.Build.0 = Release|Any CPU
65-
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Swashbuckle_Documentation|Any CPU.ActiveCfg = Swashbuckle_Documentation|Any CPU
66-
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Swashbuckle_Documentation|Any CPU.Build.0 = Swashbuckle_Documentation|Any CPU
67-
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Swashbuckle_Documentation|x86.ActiveCfg = Swashbuckle_Documentation|Any CPU
68-
{E0DA83D6-2F10-4A2E-B34A-1113335E2375}.Swashbuckle_Documentation|x86.Build.0 = Swashbuckle_Documentation|Any CPU
6955
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
7056
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Debug|Any CPU.Build.0 = Debug|Any CPU
7157
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -74,10 +60,6 @@ Global
7460
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Release|Any CPU.Build.0 = Release|Any CPU
7561
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Release|x86.ActiveCfg = Release|Any CPU
7662
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Release|x86.Build.0 = Release|Any CPU
77-
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Swashbuckle_Documentation|Any CPU.ActiveCfg = Swashbuckle_Documentation|Any CPU
78-
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Swashbuckle_Documentation|Any CPU.Build.0 = Swashbuckle_Documentation|Any CPU
79-
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Swashbuckle_Documentation|x86.ActiveCfg = Swashbuckle_Documentation|Any CPU
80-
{15505B99-58E8-4CA7-87B0-BEDF9F2FF990}.Swashbuckle_Documentation|x86.Build.0 = Swashbuckle_Documentation|Any CPU
8163
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8264
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
8365
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -86,10 +68,6 @@ Global
8668
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Release|Any CPU.Build.0 = Release|Any CPU
8769
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Release|x86.ActiveCfg = Release|Any CPU
8870
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Release|x86.Build.0 = Release|Any CPU
89-
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Swashbuckle_Documentation|Any CPU.ActiveCfg = Swashbuckle_Documentation|Any CPU
90-
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Swashbuckle_Documentation|Any CPU.Build.0 = Swashbuckle_Documentation|Any CPU
91-
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Swashbuckle_Documentation|x86.ActiveCfg = Swashbuckle_Documentation|Any CPU
92-
{777AE5B4-4DF7-4382-9461-7A1A0D8C49D4}.Swashbuckle_Documentation|x86.Build.0 = Swashbuckle_Documentation|Any CPU
9371
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
9472
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Debug|Any CPU.Build.0 = Debug|Any CPU
9573
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -98,10 +76,6 @@ Global
9876
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Release|Any CPU.Build.0 = Release|Any CPU
9977
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Release|x86.ActiveCfg = Release|Any CPU
10078
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Release|x86.Build.0 = Release|Any CPU
101-
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Swashbuckle_Documentation|Any CPU.ActiveCfg = Swashbuckle_Documentation|Any CPU
102-
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Swashbuckle_Documentation|Any CPU.Build.0 = Swashbuckle_Documentation|Any CPU
103-
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Swashbuckle_Documentation|x86.ActiveCfg = Swashbuckle_Documentation|Any CPU
104-
{95BB0001-3F6C-405A-A343-D63F96D7975C}.Swashbuckle_Documentation|x86.Build.0 = Swashbuckle_Documentation|Any CPU
10579
EndGlobalSection
10680
GlobalSection(SolutionProperties) = preSolution
10781
HideSolutionNode = FALSE

‎test/ASCOMStandard.Tests/UnitTests.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@
77

88
<RootNamespace>ASCOM.Alpaca.Tests</RootNamespace>
99

10-
<Configurations>Debug;Release;Swashbuckle_Documentation</Configurations>
10+
<Configurations>Debug;Release</Configurations>
1111
</PropertyGroup>
1212

13-
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14-
<DebugType>portable</DebugType>
15-
<DebugSymbols>true</DebugSymbols>
13+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
14+
<DebugType>portable</DebugType>
15+
<DebugSymbols>true</DebugSymbols>
1616
</PropertyGroup>
1717

18-
<ItemGroup>
19-
<None Include="..\..\ASCOM.Tools\SOFALibraries\win-x64\libsofa.dll" Link="libsofa.dll">
20-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
21-
</None>
18+
<ItemGroup>
19+
<None Include="..\..\ASCOM.Tools\SOFALibraries\win-x64\libsofa.dll" Link="libsofa.dll">
20+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
21+
</None>
2222
</ItemGroup>
2323

2424
<ItemGroup>

0 commit comments

Comments
 (0)