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

Merge main #38

Closed
wants to merge 13 commits into from
Closed

Merge main #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
afdacd5
Update readme.md
jeffward01 May 18, 2023
0a6a764
Merge pull request #14 from jeffward01/patch-1
ctacke Sep 19, 2023
7d6e4f6
Release 1.3.4
adrianstevens Sep 26, 2023
5825665
Merge branch 'main' into v1.3.4
ctacke Oct 4, 2023
8144182
Merge pull request #27 from WildernessLabs/v1.3.4
ctacke Oct 4, 2023
010e0a5
Release 1.4.0.3
adrianstevens Nov 11, 2023
656b02e
Merge branch 'main' into v1.4.0.3
adrianstevens Nov 11, 2023
59b6d41
Merge pull request #35 from WildernessLabs/v1.4.0.3
jorgedevs Nov 11, 2023
f97332b
Release 1.5.0
adrianstevens Nov 29, 2023
11880df
Merge pull request #36 from WildernessLabs/v1.5.0
jorgedevs Nov 29, 2023
c6bd28d
Release 1.6.0
adrianstevens Dec 7, 2023
d81a2c6
Merge pull request #37 from WildernessLabs/v1.6.0
jorgedevs Dec 7, 2023
09c48c7
Merge remote-tracking branch 'origin/main' into merge-main
ctacke Dec 23, 2023
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
9 changes: 0 additions & 9 deletions src/Meadow.Modbus.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Modbus.Unit.Tests",
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_refs", "_refs", "{F3A19D25-32FB-4420-B50D-220C86E5F8A0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Contracts", "..\..\Meadow.Contracts\Source\Meadow.Contracts\Meadow.Contracts.csproj", "{B2CE678E-2C35-490E-B311-8401567D8ABA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -29,18 +27,11 @@ Global
{E6F3EFB2-C8E9-4F7B-826D-79DC3AB5BDD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E6F3EFB2-C8E9-4F7B-826D-79DC3AB5BDD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E6F3EFB2-C8E9-4F7B-826D-79DC3AB5BDD2}.Release|Any CPU.Build.0 = Release|Any CPU
{B2CE678E-2C35-490E-B311-8401567D8ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B2CE678E-2C35-490E-B311-8401567D8ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B2CE678E-2C35-490E-B311-8401567D8ABA}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{B2CE678E-2C35-490E-B311-8401567D8ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B2CE678E-2C35-490E-B311-8401567D8ABA}.Release|Any CPU.Build.0 = Release|Any CPU
{B2CE678E-2C35-490E-B311-8401567D8ABA}.Release|Any CPU.Deploy.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B2CE678E-2C35-490E-B311-8401567D8ABA} = {F3A19D25-32FB-4420-B50D-220C86E5F8A0}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5FCB68E9-82F3-44F9-BF93-D9A8F55D7F9E}
Expand Down
2 changes: 1 addition & 1 deletion src/Meadow.Modbus/Meadow.Modbus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
<PackageReference Include="System.IO.Ports" Version="6.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Meadow.Contracts\Source\Meadow.Contracts\Meadow.Contracts.csproj" />
<PackageReference Include="Meadow.Contracts" Version="1.6.0" />
</ItemGroup>
</Project>
Loading