Skip to content

Commit eecf892

Browse files
StephenHidemStephenHidem
authored
Merge pull request #20 from StephenHidem/NuGet
Merge NuGet Branch
2 parents 53dc7aa + 2b66170 commit eecf892

File tree

8 files changed

+115
-26
lines changed

8 files changed

+115
-26
lines changed

‎AntPlus.UnitTests/AntPlus.UnitTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
1212
<PackageReference Include="Moq" Version="4.20.69" />
1313
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
1414
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />

‎AntPlus.sln‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ Global
4949
{DB48B2D7-3000-481A-8C7D-5265F1D91A89}.Release|Any CPU.Build.0 = Release|Any CPU
5050
{50199F4B-CDEC-4C32-979F-2DFA639A34C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5151
{50199F4B-CDEC-4C32-979F-2DFA639A34C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{50199F4B-CDEC-4C32-979F-2DFA639A34C3}.Release|Any CPU.Build.0 = Release|Any CPU
5352
{4613E881-4E42-4617-905A-4FC2204B76D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5453
{4613E881-4E42-4617-905A-4FC2204B76D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
5554
{4613E881-4E42-4617-905A-4FC2204B76D4}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎AntPlus/AntPlus.csproj‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,34 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<AssemblyVersion>2.2.0.0</AssemblyVersion>
45
<TargetFramework>netstandard2.0</TargetFramework>
56
<GenerateDocumentationFile>True</GenerateDocumentationFile>
67
<RootNamespace>SmallEarthTech.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
7-
<AssemblyVersion>2.2.0.0</AssemblyVersion>
8+
<PackageId>SmallEarthTech.$(AssemblyName)</PackageId>
9+
<Version>$(AssemblyVersion)</Version>
10+
<Title>ANT+ Class Library</Title>
11+
<PackageProjectUrl>https://github.com/StephenHidem/AntPlus</PackageProjectUrl>
12+
<Authors>Stephen Hidem</Authors>
13+
<Copyright>© $(Authors). All rights reserved.</Copyright>
14+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15+
<IncludeSymbols>True</IncludeSymbols>
16+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
17+
<PackageReadmeFile>README.md</PackageReadmeFile>
18+
<PackageTags>ant; ant+; ant plus; smallearthtech</PackageTags>
19+
<Description>Enables applications to interface and acquire data from a variety of ANT+ sensor sources. The primary class is AntPlus and it contains device profiles of ANT+ devices and common data pages.</Description>
20+
<RepositoryUrl>https://github.com/StephenHidem/AntPlus</RepositoryUrl>
21+
<RepositoryType></RepositoryType>
22+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
23+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
24+
<AssemblyName>SmallEarthTech.$(MSBuildProjectName)</AssemblyName>
25+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
826
</PropertyGroup>
9-
27+
28+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
29+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
30+
</PropertyGroup>
31+
1032
<ItemGroup>
1133
<Compile Remove="AntFS.cs" />
1234
<Compile Remove="AntRadio.cs" />
@@ -46,6 +68,13 @@
4668
<EmbeddedResource Include="Images\Unknown.png" />
4769
</ItemGroup>
4870

71+
<ItemGroup>
72+
<None Include="..\README.md">
73+
<Pack>True</Pack>
74+
<PackagePath>\</PackagePath>
75+
</None>
76+
</ItemGroup>
77+
4978
<ItemGroup>
5079
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
5180
</ItemGroup>
@@ -54,4 +83,10 @@
5483
<ProjectReference Include="..\AntRadioInterface\AntRadioInterface.csproj" />
5584
</ItemGroup>
5685

86+
<ItemGroup>
87+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
88+
<PrivateAssets>all</PrivateAssets>
89+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
90+
</PackageReference>
91+
</ItemGroup>
5792
</Project>

‎AntRadioInterface/AntRadioInterface.csproj‎

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,49 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<AssemblyVersion>1.0.1.0</AssemblyVersion>
5+
<TargetFramework>netstandard2.0</TargetFramework>
56
<RootNamespace>SmallEarthTech.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
67
<GenerateDocumentationFile>True</GenerateDocumentationFile>
8+
<PackageId>SmallEarthTech.$(AssemblyName)</PackageId>
9+
<Authors>Stephen Hidem</Authors>
10+
<Title>ANT+ Radio Interface Class Library</Title>
11+
<Version>$(AssemblyVersion)</Version>
12+
<Copyright>© $(Authors). All rights reserved.</Copyright>
13+
<PackageProjectUrl>https://github.com/StephenHidem/AntPlus</PackageProjectUrl>
14+
<PackageReadmeFile>README.md</PackageReadmeFile>
15+
<PackageTags>ant; ant+; ant plus; smallearthtech</PackageTags>
16+
<RepositoryUrl>https://github.com/StephenHidem/AntPlus</RepositoryUrl>
17+
<Description>The AntRadioInterface defines an interface to interact with an ANT radio to send and receive from an ANT device. Use this package to create a concrete implementation of an ANT radio.</Description>
18+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
19+
<IncludeSymbols>True</IncludeSymbols>
20+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
21+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
22+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
23+
<AssemblyName>SmallEarthTech.$(MSBuildProjectName)</AssemblyName>
24+
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
25+
</PropertyGroup>
26+
27+
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
28+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
729
</PropertyGroup>
830

931
<ItemGroup>
1032
<Compile Remove="IAntResponse.cs" />
1133
</ItemGroup>
1234

35+
<ItemGroup>
36+
<None Include="..\README.md">
37+
<Pack>True</Pack>
38+
<PackagePath>\</PackagePath>
39+
</None>
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
44+
<PrivateAssets>all</PrivateAssets>
45+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
46+
</PackageReference>
47+
</ItemGroup>
48+
1349
</Project>

‎Examples/AntUsbStick/AntUsbStick.csproj‎

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,33 @@
66
<RootNamespace>SmallEarthTech.$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
77
<GenerateDocumentationFile>True</GenerateDocumentationFile>
88
<AssemblyVersion>1.1.0.0</AssemblyVersion>
9+
<AssemblyName>SmallEarthTech.$(MSBuildProjectName)</AssemblyName>
10+
<Version>$(AssemblyVersion)</Version>
11+
<Title>Garmin/Dynastream ANT+ USB Stick Class Library</Title>
12+
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
13+
<Authors>Stephen Hidem</Authors>
14+
<Description>Provides an interface to ANT+ USB sticks available from Garmin/Dynastream. This class is used in the example projects located at the project URL.</Description>
15+
<Copyright>© $(Authors). All rights reserved.</Copyright>
16+
<PackageProjectUrl>https://github.com/StephenHidem/AntPlus</PackageProjectUrl>
17+
<RepositoryUrl>https://github.com/StephenHidem/AntPlus</RepositoryUrl>
18+
<PackageReadmeFile></PackageReadmeFile>
19+
<PackageTags>ant; ant+; antplus; smallearthtech</PackageTags>
20+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
21+
<IncludeSymbols>True</IncludeSymbols>
22+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
923
</PropertyGroup>
1024

11-
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
13-
</ItemGroup>
25+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
26+
<Prefer32Bit>False</Prefer32Bit>
27+
</PropertyGroup>
28+
29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
30+
<Prefer32Bit>False</Prefer32Bit>
31+
</PropertyGroup>
1432

1533
<ItemGroup>
16-
<ProjectReference Include="..\..\AntRadioInterface\AntRadioInterface.csproj" />
34+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
35+
<PackageReference Include="SmallEarthTech.AntRadioInterface" Version="1.0.1" />
1736
</ItemGroup>
1837

1938
<ItemGroup>
@@ -22,19 +41,19 @@
2241
</Reference>
2342
</ItemGroup>
2443

25-
<ItemGroup>
26-
<None Update="ANT_NET.dll">
27-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
28-
</None>
29-
<None Update="ANT_WrappedLib.dll">
30-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
31-
</None>
32-
<None Update="DSI_CP210xManufacturing_3_1.dll">
33-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
34-
</None>
35-
<None Update="DSI_SiUSBXp_3_1.dll">
36-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
37-
</None>
38-
</ItemGroup>
44+
<ItemGroup>
45+
<None Update="ANT_NET.dll">
46+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
47+
</None>
48+
<None Update="ANT_WrappedLib.dll">
49+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
50+
</None>
51+
<None Update="DSI_CP210xManufacturing_3_1.dll">
52+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
53+
</None>
54+
<None Update="DSI_SiUSBXp_3_1.dll">
55+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
56+
</None>
57+
</ItemGroup>
3958

4059
</Project>

‎Examples/WpfUsbStickApp/MainWindowViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public MainWindowViewModel()
5959
UsbAntRadio.OpenRxScanMode();
6060

6161
// log app info
62-
var antAssemblies = Assembly.GetExecutingAssembly().GetReferencedAssemblies().Where(asm => asm.Name.StartsWith("Ant"));
62+
var antAssemblies = Assembly.GetExecutingAssembly().GetReferencedAssemblies().Where(asm => asm.Name!.StartsWith("Ant"));
6363
var logger = _host.Services.GetRequiredService<ILogger<App>>();
6464
logger.LogInformation("{App}", Assembly.GetExecutingAssembly().GetName().FullName);
6565
foreach (var asm in antAssemblies)

‎Examples/WpfUsbStickApp/Views/BicyclePowerWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
66
xmlns:local="clr-namespace:WpfUsbStickApp.Views"
77
xmlns:vm="clr-namespace:WpfUsbStickApp.ViewModels"
8-
xmlns:dp="clr-namespace:SmallEarthTech.AntPlus.DeviceProfiles.BicyclePower;assembly=AntPlus"
8+
xmlns:dp="clr-namespace:SmallEarthTech.AntPlus.DeviceProfiles.BicyclePower;assembly=SmallEarthTech.AntPlus"
99
xmlns:uc="clr-namespace:WpfUsbStickApp.Controls"
1010
d:DataContext="{d:DesignInstance Type=vm:BicyclePowerViewModel}"
1111
mc:Ignorable="d"

‎Examples/WpfUsbStickApp/WpfUsbStickApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
1515
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
1616
<PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
17+
<PackageReference Include="SmallEarthTech.AntPlus" Version="2.2.0" />
1718
<PackageReference Include="System.ObjectModel" Version="4.3.0" />
1819
</ItemGroup>
1920

2021
<ItemGroup>
21-
<ProjectReference Include="..\..\AntPlus\AntPlus.csproj" />
2222
<ProjectReference Include="..\AntUsbStick\AntUsbStick.csproj" />
2323
</ItemGroup>
2424

0 commit comments

Comments
 (0)