Skip to content

Commit

Permalink
Merge pull request #102 from parkerreno/dev/centralPackageManagement
Browse files Browse the repository at this point in the history
Move to Central Package Management
  • Loading branch information
thebentern authored Nov 10, 2024
2 parents b230c66 + dade088 commit 15d83f8
Show file tree
Hide file tree
Showing 5 changed files with 95 additions and 74 deletions.
31 changes: 31 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="coverlet.collector" Version="6.0.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="ILogger.Moq" Version="1.1.10" />
<PackageVersion Include="Google.Protobuf" Version="3.25.3" />
<PackageVersion Include="Google.Protobuf.Tools" Version="3.25.3" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NUnit" Version="4.1.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageVersion Include="NUnit.Analyzers" Version="4.0.1" />
<PackageVersion Include="MQTTnet" Version="4.3.3.952" />
<PackageVersion Include="QRCoder" Version="1.4.3" />
<PackageVersion Include="SimpleExec" Version="12.0.0" />
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
<PackageVersion Include="Spectre.Console.Json" Version="0.49.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.IO.Ports" Version="8.0.0" />
<PackageVersion Include="YamlDotNet" Version="15.1.2" />
</ItemGroup>
</Project>
35 changes: 15 additions & 20 deletions Meshtastic.Cli/Meshtastic.Cli.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
Expand Down Expand Up @@ -32,34 +31,30 @@
</None>
</ItemGroup>


<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.25.3" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.25.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
<PackageReference Include="MQTTnet" Version="4.3.3.952" />
<PackageReference Include="QRCoder" Version="1.4.3" />
<PackageReference Include="SimpleExec" Version="12.0.0" />
<PackageReference Include="Spectre.Console" Version="0.49.1" />
<PackageReference Include="Spectre.Console.Json" Version="0.49.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.IO.Ports" Version="8.0.0" />
<PackageReference Include="YamlDotNet" Version="15.1.2" />
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="Google.Protobuf.Tools" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
<PackageReference Include="MQTTnet" />
<PackageReference Include="QRCoder" />
<PackageReference Include="SimpleExec" />
<PackageReference Include="Spectre.Console" />
<PackageReference Include="Spectre.Console.Json" />
<PackageReference Include="Newtonsoft.Json" />
<PackageReference Include="System.CommandLine" />
<PackageReference Include="System.IO.Ports" />
<PackageReference Include="YamlDotNet" />
</ItemGroup>


<ItemGroup>
<ProjectReference Include="..\Meshtastic\Meshtastic.csproj" />
</ItemGroup>


<ItemGroup>
<Using Include="Spectre.Console" />
<Using Include="System.CommandLine" />
</ItemGroup>

</Project>
18 changes: 8 additions & 10 deletions Meshtastic.Test/Meshtastic.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
Expand All @@ -15,17 +14,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="ILogger.Moq" Version="1.1.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="Moq" Version="4.18.4" />
<PackageReference Include="NUnit" Version="4.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="NUnit.Analyzers" Version="4.0.1">
<PackageReference Include="FluentAssertions" />
<PackageReference Include="ILogger.Moq" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Moq" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="NUnit.Analyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PackageReference Include="coverlet.collector">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -35,5 +34,4 @@
<ProjectReference Include="..\Meshtastic.Cli\Meshtastic.Cli.csproj" />
<ProjectReference Include="..\Meshtastic\Meshtastic.csproj" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions Meshtastic.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{020BC5F0-48A6-4870-8220-5A4B7A016094}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Global
Expand Down
84 changes: 40 additions & 44 deletions Meshtastic/Meshtastic.csproj
Original file line number Diff line number Diff line change
@@ -1,48 +1,44 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Meshtastic</RootNamespace>
<PackageIcon>logo.png</PackageIcon>
<RepositoryUrl>http://github.com/meshtastic/c-sharp</RepositoryUrl>
<Company>Meshtastic LLC</Company>
<Title>Meshtastic C#</Title>
<IncludeSymbols>True</IncludeSymbols>
<DebugType>embedded</DebugType>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Meshtastic</RootNamespace>
<PackageIcon>logo.png</PackageIcon>
<RepositoryUrl>http://github.com/meshtastic/c-sharp</RepositoryUrl>
<Company>Meshtastic LLC</Company>
<Title>Meshtastic C#</Title>
<IncludeSymbols>True</IncludeSymbols>
<DebugType>embedded</DebugType>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
</PropertyGroup>
<ItemGroup>
<None Include="..\LICENSE">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\logo.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<None Include="..\LICENSE">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\logo.png">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>


<ItemGroup>
<PackageReference Include="Google.Protobuf" Version="3.25.3" />
<PackageReference Include="Google.Protobuf.Tools" Version="3.25.3" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
<PackageReference Include="System.IO.Ports" Version="8.0.0" />
</ItemGroup>


<ItemGroup>
<Folder Include="Generated\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Google.Protobuf" />
<PackageReference Include="Google.Protobuf.Tools" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
<PackageReference Include="System.IO.Ports" />
</ItemGroup>

<ItemGroup>
<Folder Include="Generated\" />
</ItemGroup>
</Project>

0 comments on commit 15d83f8

Please sign in to comment.