Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

V2 core refactoring #424

Merged
merged 4 commits into from
Jan 12, 2024
Merged

V2 core refactoring #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4354130
Move DFU logic into Meadow.CLI.Core
adrianstevens Jan 11, 2024
5f0306b
Move PackageManager and linker logic into Meadow.CLI.Core
adrianstevens Jan 12, 2024
2e72874
Ref cleanup
adrianstevens Jan 12, 2024
bfaff3e
Meadow.UsbLib refactoring
adrianstevens Jan 12, 2024
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
0 Source/v2/Meadow.Cli/DFU/DfuContext.cs → Source/v2/Meadow.CLI.Core/DFU/DfuContext.cs
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.Cli/DFU/DfuSharp.cs → Source/v2/Meadow.CLI.Core/DFU/DfuSharp.cs
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.Cli/DFU/DfuUtils.cs → Source/v2/Meadow.CLI.Core/DFU/DfuUtils.cs
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.CLI/Linker/ILLinker.cs → Source/v2/Meadow.CLI.Core/Linker/ILLinker.cs
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.CLI/Linker/MeadowLinker.cs → ...v2/Meadow.CLI.Core/Linker/MeadowLinker.cs
View file
Open in desktop
File renamed without changes.
24 changes: 24 additions & 0 deletions Source/v2/Meadow.CLI.Core/Meadow.CLI.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,31 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Glob" Version="1.1.9" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
<PackageReference Include="YamlDotNet" Version="13.7.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Meadow.Cloud.Client\Meadow.Cloud.Client.csproj" />
<ProjectReference Include="..\Meadow.HCom\Meadow.HCom.csproj" />
<ProjectReference Include="..\Meadow.SoftwareManager\Meadow.SoftwareManager.csproj" />
</ItemGroup>

<ItemGroup>
<None Update="lib\illink.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="lib\illink.runtimeconfig.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="lib\meadow_link.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="lib\Mono.Cecil.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
0 Source/v2/Meadow.Cli/IPackageManager.cs → ...LI.Core/PackageManager/IPackageManager.cs
View file
Open in desktop
File renamed without changes.
0 ...dow.Cli/PackageManager.AssemblyManager.cs → ...Manager/PackageManager.AssemblyManager.cs
View file
Open in desktop
File renamed without changes.
0 ...Meadow.Cli/PackageManager.BuildOptions.cs → ...ageManager/PackageManager.BuildOptions.cs
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.Cli/PackageManager.cs → ...CLI.Core/PackageManager/PackageManager.cs
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.Cli/lib/Mono.Cecil.Pdb.dll → ...v2/Meadow.CLI.Core/lib/Mono.Cecil.Pdb.dll
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.Cli/lib/Mono.Cecil.dll → Source/v2/Meadow.CLI.Core/lib/Mono.Cecil.dll
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.Cli/lib/illink.deps.json → ...e/v2/Meadow.CLI.Core/lib/illink.deps.json
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.Cli/lib/illink.dll → Source/v2/Meadow.CLI.Core/lib/illink.dll
View file
Open in desktop
File renamed without changes.
0 .../Meadow.Cli/lib/illink.runtimeconfig.json → ...ow.CLI.Core/lib/illink.runtimeconfig.json
View file
Open in desktop
File renamed without changes.
0 Source/v2/Meadow.Cli/lib/meadow_link.xml → ...ce/v2/Meadow.CLI.Core/lib/meadow_link.xml
View file
Open in desktop
File renamed without changes.
9 changes: 7 additions & 2 deletions Source/v2/Meadow.CLI.v2.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.4.33213.308
Expand Down Expand Up @@ -27,7 +26,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.UsbLibClassic", "Mea
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.CLI.Core", "Meadow.CLI.Core\Meadow.CLI.Core.csproj", "{677B1C15-8936-4807-8A4F-4F5219BBDB7C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Meadow.Cloud.Client", "Meadow.Cloud.Client\Meadow.Cloud.Client.csproj", "{A71A3C98-2B11-46FE-AB7A-EAD9271862AA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Cloud.Client", "Meadow.Cloud.Client\Meadow.Cloud.Client.csproj", "{A71A3C98-2B11-46FE-AB7A-EAD9271862AA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.UsbLib.Core", "Meadow.UsbLib.Core\Meadow.UsbLib.Core.csproj", "{F02ADBEF-4D52-4A71-9D95-74F45D68B43B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -87,6 +88,10 @@ Global
{A71A3C98-2B11-46FE-AB7A-EAD9271862AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A71A3C98-2B11-46FE-AB7A-EAD9271862AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A71A3C98-2B11-46FE-AB7A-EAD9271862AA}.Release|Any CPU.Build.0 = Release|Any CPU
{F02ADBEF-4D52-4A71-9D95-74F45D68B43B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F02ADBEF-4D52-4A71-9D95-74F45D68B43B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F02ADBEF-4D52-4A71-9D95-74F45D68B43B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F02ADBEF-4D52-4A71-9D95-74F45D68B43B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
18 changes: 0 additions & 18 deletions Source/v2/Meadow.CLI/Meadow.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,16 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
<PackageReference Include="Serilog" Version="3.0.1" />
<PackageReference Include="Glob" Version="1.1.9" />
<PackageReference Include="CliFx" Version="*" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
<PackageReference Include="LibUsbDotNet" Version="3.0.102-alpha" />
<PackageReference Include="System.Management" Version="7.0.2" />
<PackageReference Include="YamlDotNet" Version="13.7.1" />
<PackageReference Include="Mono.Cecil" Version="0.11.5" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Meadow.CLI.Core\Meadow.CLI.Core.csproj" />
<ProjectReference Include="..\Meadow.Cloud.Client\Meadow.Cloud.Client.csproj" />
<ProjectReference Include="..\Meadow.Hcom\Meadow.Hcom.csproj" />
<ProjectReference Include="..\Meadow.SoftwareManager\Meadow.SoftwareManager.csproj" />
<ProjectReference Include="..\Meadow.UsbLibClassic\Meadow.UsbLibClassic.csproj" />
<ProjectReference Include="..\Meadow.UsbLib\Meadow.UsbLib.csproj" />
Expand All @@ -62,18 +56,6 @@
<None Update="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="lib\illink.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="lib\illink.runtimeconfig.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="lib\meadow_link.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="lib\Mono.Cecil.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/v2/Meadow.Cli/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
},
"Firmware Write version": {
"commandName": "Project",
"commandLineArgs": "firmware write -v 1.2.0.1"
"commandLineArgs": "firmware write -v 1.7.1.3"
},
"Firmware Write runtime": {
"commandName": "Project",
Expand Down
0 Source/v2/Meadow.Cli.Core/ILibUsbDevice.cs → ...ce/v2/Meadow.UsbLib.Core/ILibUsbDevice.cs
View file
Open in desktop
File renamed without changes.
9 changes: 9 additions & 0 deletions Source/v2/Meadow.UsbLib.Core/Meadow.UsbLib.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

</Project>
10 changes: 5 additions & 5 deletions Source/v2/Meadow.UsbLib/Meadow.UsbLib.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Meadow.CLI.Core\Meadow.CLI.Core.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="LibUsbDotNet" Version="3.0.102-alpha" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Meadow.UsbLib.Core\Meadow.UsbLib.Core.csproj" />
</ItemGroup>

</Project>
11 changes: 5 additions & 6 deletions Source/v2/Meadow.UsbLibClassic/Meadow.UsbLibClassic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Meadow.CLI.Core\Meadow.CLI.Core.csproj" />

</ItemGroup>

<ItemGroup>
<PackageReference Include="LibUsbDotNet" Version="2.2.29" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\Meadow.UsbLib.Core\Meadow.UsbLib.Core.csproj" />
</ItemGroup>

</Project>
Loading