Upgraded all projects to use .netframework 4.8
This commit is contained in:
@@ -14,7 +14,7 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Meade.net.Telescope.UnitTests</RootNamespace>
|
<RootNamespace>Meade.net.Telescope.UnitTests</RootNamespace>
|
||||||
<AssemblyName>Meade.net.Telescope.UnitTests</AssemblyName>
|
<AssemblyName>Meade.net.Telescope.UnitTests</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<Deterministic>true</Deterministic>
|
<Deterministic>true</Deterministic>
|
||||||
<NuGetPackageImportStamp>
|
<NuGetPackageImportStamp>
|
||||||
@@ -60,9 +60,9 @@
|
|||||||
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
|
<Reference Include="ASCOM.Astrometry, Version=6.0.0.0, Culture=neutral, PublicKeyToken=565de7938946fba7, processorArchitecture=MSIL">
|
||||||
<HintPath>..\packages\ASCOM.Platform.6.5.2\lib\net40\ASCOM.Astrometry.dll</HintPath>
|
<HintPath>..\packages\ASCOM.Platform.6.5.2\lib\net40\ASCOM.Astrometry.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ using ASCOM.Meade.net.Wrapper;
|
|||||||
using ASCOM.Utilities.Interfaces;
|
using ASCOM.Utilities.Interfaces;
|
||||||
using Moq;
|
using Moq;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using InvalidOperationException = ASCOM.InvalidOperationException;
|
|
||||||
|
|
||||||
namespace Meade.net.Telescope.UnitTests
|
namespace Meade.net.Telescope.UnitTests
|
||||||
{
|
{
|
||||||
@@ -1373,7 +1372,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
// when
|
// when
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() =>
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() =>
|
||||||
{
|
{
|
||||||
var result = _telescope.SiderealTime;
|
var result = _telescope.SiderealTime;
|
||||||
Assert.Fail($"{result} should not have returned");
|
Assert.Fail($"{result} should not have returned");
|
||||||
@@ -1761,7 +1760,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
var duration = 0;
|
var duration = 0;
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.PulseGuide(direction, duration));
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.PulseGuide(direction, duration));
|
||||||
|
|
||||||
Assert.That(exception.Message, Is.EqualTo("Unable to PulseGuide whilst slewing to target."));
|
Assert.That(exception.Message, Is.EqualTo("Unable to PulseGuide whilst slewing to target."));
|
||||||
}
|
}
|
||||||
@@ -1778,7 +1777,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
var duration = 1;
|
var duration = 1;
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.PulseGuide(direction, duration));
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.PulseGuide(direction, duration));
|
||||||
|
|
||||||
Assert.That(exception.Message, Is.EqualTo("Unable to PulseGuide whilst in AltAz mode."));
|
Assert.That(exception.Message, Is.EqualTo("Unable to PulseGuide whilst in AltAz mode."));
|
||||||
}
|
}
|
||||||
@@ -1799,7 +1798,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
|
|
||||||
_telescope.MoveAxis(axes, 1);
|
_telescope.MoveAxis(axes, 1);
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.PulseGuide(direction, duration));
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.PulseGuide(direction, duration));
|
||||||
|
|
||||||
Assert.That(exception.Message, Is.EqualTo("Unable to PulseGuide while moving same axis."));
|
Assert.That(exception.Message, Is.EqualTo("Unable to PulseGuide while moving same axis."));
|
||||||
Assert.That(_sharedResourcesWrapperMock.Object.MovingPrimary, Is.EqualTo(axes == TelescopeAxes.axisPrimary));
|
Assert.That(_sharedResourcesWrapperMock.Object.MovingPrimary, Is.EqualTo(axes == TelescopeAxes.axisPrimary));
|
||||||
@@ -2216,7 +2215,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
|
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.SiteLatitude = siteLatitude);
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.SiteLatitude = siteLatitude);
|
||||||
|
|
||||||
Assert.That(exception.Message, Is.EqualTo("Failed to set site latitude."));
|
Assert.That(exception.Message, Is.EqualTo("Failed to set site latitude."));
|
||||||
}
|
}
|
||||||
@@ -2297,7 +2296,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.SiteLongitude = 10);
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.SiteLongitude = 10);
|
||||||
Assert.That(exception.Message, Is.EqualTo("Failed to set site longitude."));
|
Assert.That(exception.Message, Is.EqualTo("Failed to set site longitude."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2337,7 +2336,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
|
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.SyncToTarget());
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.SyncToTarget());
|
||||||
|
|
||||||
Assert.That(exception.Message, Is.EqualTo("Unable to perform sync"));
|
Assert.That(exception.Message, Is.EqualTo("Unable to perform sync"));
|
||||||
_sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "CM", false), Times.Once);
|
_sharedResourcesWrapperMock.Verify(x => x.SendString(_traceLoggerMock.Object, "CM", false), Times.Once);
|
||||||
@@ -2390,7 +2389,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
|
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.TargetDeclination = 50);
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.TargetDeclination = 50);
|
||||||
Assert.That(exception.Message, Is.EqualTo("Target declination invalid"));
|
Assert.That(exception.Message, Is.EqualTo("Target declination invalid"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2416,7 +2415,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
{
|
{
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() =>
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() =>
|
||||||
{
|
{
|
||||||
var result = _telescope.TargetDeclination;
|
var result = _telescope.TargetDeclination;
|
||||||
Assert.Fail($"{result} should not have returned");
|
Assert.Fail($"{result} should not have returned");
|
||||||
@@ -2519,7 +2518,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
|
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.TargetRightAscension = 1);
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.TargetRightAscension = 1);
|
||||||
Assert.That(exception.Message, Is.EqualTo("Failed to set TargetRightAscension."));
|
Assert.That(exception.Message, Is.EqualTo("Failed to set TargetRightAscension."));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2542,7 +2541,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
{
|
{
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() =>
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() =>
|
||||||
{
|
{
|
||||||
var result = _telescope.TargetRightAscension;
|
var result = _telescope.TargetRightAscension;
|
||||||
Assert.Fail($"{result} should not have returned");
|
Assert.Fail($"{result} should not have returned");
|
||||||
@@ -2830,7 +2829,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
|
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.UTCDate = newDate);
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.UTCDate = newDate);
|
||||||
|
|
||||||
Assert.That(exception.Message, Is.EqualTo("Failed to set local time"));
|
Assert.That(exception.Message, Is.EqualTo("Failed to set local time"));
|
||||||
}
|
}
|
||||||
@@ -2850,7 +2849,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
|
|
||||||
ConnectTelescope();
|
ConnectTelescope();
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.UTCDate = newDate);
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.UTCDate = newDate);
|
||||||
|
|
||||||
Assert.That(exception.Message, Is.EqualTo("Failed to set local date"));
|
Assert.That(exception.Message, Is.EqualTo("Failed to set local date"));
|
||||||
}
|
}
|
||||||
@@ -3170,7 +3169,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
|
|
||||||
_telescope.TargetRightAscension = 1;
|
_telescope.TargetRightAscension = 1;
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
||||||
Assert.That(exception.Message, Is.EqualTo("Target not set"));
|
Assert.That(exception.Message, Is.EqualTo("Target not set"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3184,7 +3183,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
|
|
||||||
_telescope.TargetDeclination = 1;
|
_telescope.TargetDeclination = 1;
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
||||||
Assert.That(exception.Message, Is.EqualTo("Target not set"));
|
Assert.That(exception.Message, Is.EqualTo("Target not set"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3239,7 +3238,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
_telescope.TargetRightAscension = 2;
|
_telescope.TargetRightAscension = 2;
|
||||||
_telescope.TargetDeclination = 1;
|
_telescope.TargetDeclination = 1;
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
||||||
Assert.That(exception.Message, Is.EqualTo("Below horizon"));
|
Assert.That(exception.Message, Is.EqualTo("Below horizon"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3259,7 +3258,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
_telescope.TargetRightAscension = 2;
|
_telescope.TargetRightAscension = 2;
|
||||||
_telescope.TargetDeclination = 1;
|
_telescope.TargetDeclination = 1;
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
||||||
Assert.That(exception.Message, Is.EqualTo("Above below elevation"));
|
Assert.That(exception.Message, Is.EqualTo("Above below elevation"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3278,7 +3277,7 @@ namespace Meade.net.Telescope.UnitTests
|
|||||||
_telescope.TargetRightAscension = 2;
|
_telescope.TargetRightAscension = 2;
|
||||||
_telescope.TargetDeclination = 1;
|
_telescope.TargetDeclination = 1;
|
||||||
|
|
||||||
var exception = Assert.Throws<InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
var exception = Assert.Throws<ASCOM.InvalidOperationException>(() => _telescope.SlewToTargetAsync());
|
||||||
Assert.That(exception.Message, Is.EqualTo("the telescope can hit the tripod"));
|
Assert.That(exception.Message, Is.EqualTo("the telescope can hit the tripod"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<runtime>
|
<runtime>
|
||||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
|
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
|
||||||
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
|
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
<dependentAssembly>
|
<dependentAssembly>
|
||||||
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
|
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
|
||||||
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
|
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1"/>
|
||||||
</dependentAssembly>
|
</dependentAssembly>
|
||||||
</assemblyBinding>
|
</assemblyBinding>
|
||||||
</runtime>
|
</runtime>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>
|
||||||
|
|||||||
Reference in New Issue
Block a user