Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Shimmer32FeetAPI/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.3.9.0")]
[assembly: AssemblyFileVersion("1.3.9.0")]
15 changes: 5 additions & 10 deletions Shimmer32FeetAPI/Shimmer32FeetAPI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,13 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="32feet.NET">
<Version>3.5.0</Version>
</PackageReference>
<PackageReference Include="Grpc.Tools">
<Version>2.58.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="InTheHand.BluetoothLE">
<Version>4.0.34</Version>
<Version>4.0.37</Version>
</PackageReference>
<PackageReference Include="InTheHand.Net.Bluetooth">
<Version>4.2.2</Version>
</PackageReference>
<PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.11.1">
<PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.14.0">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,8 @@
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
<Reference Include="InTheHand.Net.Personal, Version=3.5.605.0, Culture=neutral, PublicKeyToken=ea38caa273134499, processorArchitecture=MSIL">
<HintPath>..\packages\32feet.NET.3.5.0.0\lib\net\InTheHand.Net.Personal.dll</HintPath>
<Private>True</Private>
<Reference Include="InTheHand.Net.Bluetooth, Version=4.2.2.0, Culture=neutral, PublicKeyToken=ea38caa273134499, processorArchitecture=MSIL">
<HintPath>..\..\ShimmerAPI\packages\InTheHand.Net.Bluetooth.4.2.2\lib\net462\InTheHand.Net.Bluetooth.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="32feet.NET" version="3.5.0.0" targetFramework="net46" />
<package id="InTheHand.Net.Bluetooth" version="4.2.2" targetFramework="net472" />
</packages>
4 changes: 2 additions & 2 deletions ShimmerAPI/ShimmerAPI/ShimmerAPI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
<OutputType>Library</OutputType>
<Description>Library to communicate with Shimmer devices</Description>
<Version>1.3.8</Version>
<Version>1.3.9</Version>
<PackageLicenseFile>license.md</PackageLicenseFile>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
Expand All @@ -31,7 +31,7 @@
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
<PackageReference Include="System.Interactive.Async" Version="5.0.0" />
<PackageReference Include="System.IO" Version="4.3.0" />
<PackageReference Include="System.IO.Ports" Version="5.0.1" />
<PackageReference Include="System.IO.Ports" Version="9.0.8" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.4" />
<PackageReference Include="System.Xml.Linq" Version="3.5.21022.801" />
Expand Down
10 changes: 5 additions & 5 deletions ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.IO.Ports, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Ports.5.0.1\lib\net461\System.IO.Ports.dll</HintPath>
<Reference Include="System.IO.Ports, Version=9.0.0.8, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Ports.9.0.8\lib\net462\System.IO.Ports.dll</HintPath>
</Reference>
</ItemGroup>
<Choose>
Expand All @@ -63,15 +63,15 @@
<Compile Include="ShimmerTest.cs" />
<Compile Include="ShimmerReadDataPacketTest.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ShimmerAPI\ShimmerAPI.csproj">
<Project>{6e320423-1d88-47ee-97ba-51113e538d33}</Project>
<Name>ShimmerAPI</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Choose>
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ShimmerAPI/ShimmerUnitTests/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="System.IO.Ports" version="5.0.1" targetFramework="net472" />
<package id="System.IO.Ports" version="9.0.8" targetFramework="net472" />
</packages>
5 changes: 2 additions & 3 deletions ShimmerCapture/ShimmerCapture/ShimmerCapture.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MathNet.Numerics" Version="3.20.0" />
<PackageReference Include="System.IO.Ports" Version="5.0.1" />
</ItemGroup>

<PackageReference Include="System.IO.Ports" Version="9.0.8" />
</ItemGroup>
<ItemGroup>
<Reference Include="ExceptionReporter.WinForms">
<HintPath>libs\ExceptionReporter.WinForms.dll</HintPath>
Expand Down
Loading