Merge pull request #4 from WildernessLabs/v1.5.0

Release 1.5.0
WildernessLabs · Nov 29, 2023 · 5d3a0e4 · 5d3a0e4
2 parents 038b079 + 7a723b4
commit 5d3a0e4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 59 deletions.
diff --git a/Source/Driver/Meadow.MBus.csproj b/Source/Driver/Meadow.MBus.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <PackageReadmeFile>Readme.md</PackageReadmeFile>
@@ -25,7 +25,7 @@
   <ItemGroup>
     <None Include=".\Readme.md" Pack="true" PackagePath=""/>
     <None Include="..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
-    <ProjectReference Include="..\..\..\Meadow.Core\source\Meadow.Core\Meadow.Core.csproj" />
+    <PackageReference Include="Meadow" Version="1.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Source/MBus.sln b/Source/MBus.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33213.308
@@ -13,22 +13,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.MBus", "Driver\Meado
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MBus_Desktop_Sample", "Samples\MBus_Desktop_Sample\MBus_Desktop_Sample.csproj", "{BC0EDEA3-916E-4533-B609-0A005E102870}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Windows", "..\..\Meadow.Core\source\implementations\windows\Meadow.Windows\Meadow.Windows.csproj", "{A32BF0AE-0C60-405E-8383-2D22453CB61C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Core", "..\..\Meadow.Core\source\Meadow.Core\Meadow.Core.csproj", "{FF2DBE63-D3CF-4AAF-BCEA-F3EDEC6B360E}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Devices", "Devices", "{512DA550-1FA5-438F-808E-35E15D258BC7}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Relay M-Bus", "Relay M-Bus", "{B8C34EC3-DED2-49F8-B7F4-766578BFC509}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schneider Electric", "Schneider Electric", "{A1F61A37-9414-452E-A1A6-5DA63B99056D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Contracts", "..\..\Meadow.Contracts\Source\Meadow.Contracts\Meadow.Contracts.csproj", "{679E3D68-BB9B-4705-8A11-2941ECFAD3A7}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Units", "..\..\Meadow.Units\Source\Meadow.Units\Meadow.Units.csproj", "{5DF60E6F-8734-4CD9-BC00-3DB73921087E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Logging", "..\..\Meadow.Logging\Source\Meadow.Logging\lib\Meadow.Logging.csproj", "{48C3A0B4-68C9-46C4-A362-6B50DE2DB3BF}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PadPulsM2", "Devices\RelayMBus\PadPulsM2\Driver\PadPulsM2.csproj", "{7D688475-2885-4999-ACF6-A99042F99D48}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IEM3135", "Devices\SchneiderElectric\IEM3135\Driver\IEM3135.csproj", "{DA2E48FE-C39A-418B-BB86-B640E66A3213}"
@@ -37,10 +27,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PadPulsM2", "PadPulsM2", "{
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "IEM3135", "IEM3135", "{6E49699D-14EB-46CD-A317-FE12A60B4BE9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet", "..\..\MQTTnet\Source\MQTTnet\MQTTnet.csproj", "{84425C46-CE7F-4B97-914F-4EF7882B2773}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Modbus", "..\..\Meadow.Modbus\src\Meadow.Modbus\Meadow.Modbus.csproj", "{920DF110-7A87-4B7E-9D8E-C8CF41801A06}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -55,32 +41,6 @@ Global
 		{BC0EDEA3-916E-4533-B609-0A005E102870}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC0EDEA3-916E-4533-B609-0A005E102870}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BC0EDEA3-916E-4533-B609-0A005E102870}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A32BF0AE-0C60-405E-8383-2D22453CB61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A32BF0AE-0C60-405E-8383-2D22453CB61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A32BF0AE-0C60-405E-8383-2D22453CB61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A32BF0AE-0C60-405E-8383-2D22453CB61C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF2DBE63-D3CF-4AAF-BCEA-F3EDEC6B360E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FF2DBE63-D3CF-4AAF-BCEA-F3EDEC6B360E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FF2DBE63-D3CF-4AAF-BCEA-F3EDEC6B360E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{FF2DBE63-D3CF-4AAF-BCEA-F3EDEC6B360E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FF2DBE63-D3CF-4AAF-BCEA-F3EDEC6B360E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FF2DBE63-D3CF-4AAF-BCEA-F3EDEC6B360E}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{679E3D68-BB9B-4705-8A11-2941ECFAD3A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{679E3D68-BB9B-4705-8A11-2941ECFAD3A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{679E3D68-BB9B-4705-8A11-2941ECFAD3A7}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{679E3D68-BB9B-4705-8A11-2941ECFAD3A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{679E3D68-BB9B-4705-8A11-2941ECFAD3A7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{679E3D68-BB9B-4705-8A11-2941ECFAD3A7}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{5DF60E6F-8734-4CD9-BC00-3DB73921087E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5DF60E6F-8734-4CD9-BC00-3DB73921087E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5DF60E6F-8734-4CD9-BC00-3DB73921087E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{5DF60E6F-8734-4CD9-BC00-3DB73921087E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5DF60E6F-8734-4CD9-BC00-3DB73921087E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5DF60E6F-8734-4CD9-BC00-3DB73921087E}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{48C3A0B4-68C9-46C4-A362-6B50DE2DB3BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{48C3A0B4-68C9-46C4-A362-6B50DE2DB3BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{48C3A0B4-68C9-46C4-A362-6B50DE2DB3BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{48C3A0B4-68C9-46C4-A362-6B50DE2DB3BF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7D688475-2885-4999-ACF6-A99042F99D48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7D688475-2885-4999-ACF6-A99042F99D48}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D688475-2885-4999-ACF6-A99042F99D48}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -89,34 +49,19 @@ Global
 		{DA2E48FE-C39A-418B-BB86-B640E66A3213}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DA2E48FE-C39A-418B-BB86-B640E66A3213}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DA2E48FE-C39A-418B-BB86-B640E66A3213}.Release|Any CPU.Build.0 = Release|Any CPU
-		{84425C46-CE7F-4B97-914F-4EF7882B2773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{84425C46-CE7F-4B97-914F-4EF7882B2773}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{84425C46-CE7F-4B97-914F-4EF7882B2773}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{84425C46-CE7F-4B97-914F-4EF7882B2773}.Release|Any CPU.Build.0 = Release|Any CPU
-		{920DF110-7A87-4B7E-9D8E-C8CF41801A06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{920DF110-7A87-4B7E-9D8E-C8CF41801A06}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{920DF110-7A87-4B7E-9D8E-C8CF41801A06}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{920DF110-7A87-4B7E-9D8E-C8CF41801A06}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{B3BA9298-D99B-46AA-9D41-A6A9A154CDCB} = {10C0D605-7FCF-49EF-A72A-1ED45AB56FB8}
 		{BC0EDEA3-916E-4533-B609-0A005E102870} = {1F90ED3D-1D51-4D17-993F-6C3C6F18BA3F}
-		{A32BF0AE-0C60-405E-8383-2D22453CB61C} = {AD309A9D-9EE5-45B5-B3D8-3F4F61C36741}
-		{FF2DBE63-D3CF-4AAF-BCEA-F3EDEC6B360E} = {AD309A9D-9EE5-45B5-B3D8-3F4F61C36741}
 		{B8C34EC3-DED2-49F8-B7F4-766578BFC509} = {512DA550-1FA5-438F-808E-35E15D258BC7}
 		{A1F61A37-9414-452E-A1A6-5DA63B99056D} = {512DA550-1FA5-438F-808E-35E15D258BC7}
-		{679E3D68-BB9B-4705-8A11-2941ECFAD3A7} = {AD309A9D-9EE5-45B5-B3D8-3F4F61C36741}
-		{5DF60E6F-8734-4CD9-BC00-3DB73921087E} = {AD309A9D-9EE5-45B5-B3D8-3F4F61C36741}
-		{48C3A0B4-68C9-46C4-A362-6B50DE2DB3BF} = {AD309A9D-9EE5-45B5-B3D8-3F4F61C36741}
 		{7D688475-2885-4999-ACF6-A99042F99D48} = {ECC4C325-CE66-4FD1-8BF2-41271C425C12}
 		{DA2E48FE-C39A-418B-BB86-B640E66A3213} = {6E49699D-14EB-46CD-A317-FE12A60B4BE9}
 		{ECC4C325-CE66-4FD1-8BF2-41271C425C12} = {A1F61A37-9414-452E-A1A6-5DA63B99056D}
 		{6E49699D-14EB-46CD-A317-FE12A60B4BE9} = {A1F61A37-9414-452E-A1A6-5DA63B99056D}
-		{84425C46-CE7F-4B97-914F-4EF7882B2773} = {AD309A9D-9EE5-45B5-B3D8-3F4F61C36741}
-		{920DF110-7A87-4B7E-9D8E-C8CF41801A06} = {AD309A9D-9EE5-45B5-B3D8-3F4F61C36741}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BA8CFA32-55F8-4175-8000-7F0DAD8AC3DE}

diff --git a/Source/Samples/MBus_Desktop_Sample/MBus_Desktop_Sample.csproj b/Source/Samples/MBus_Desktop_Sample/MBus_Desktop_Sample.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Meadow.Core\source\implementations\windows\Meadow.Windows\Meadow.Windows.csproj" />
+    <PackageReference Include="Meadow.Windows" Version="1.5.0" />
     <ProjectReference Include="..\..\Devices\SchneiderElectric\IEM3135\Driver\IEM3135.csproj" />
     <ProjectReference Include="..\..\Driver\Meadow.MBus.csproj" />
   </ItemGroup>