Release 1.3.4

WildernessLabs · Sep 26, 2023 · 11f8b79 · 11f8b79
1 parent 53f221c
commit 11f8b79
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 64 deletions.
diff --git a/source/Meadow.Core.sln b/source/Meadow.Core.sln
@@ -34,18 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Avalonia", "ui\Meado
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Maui", "ui\Meadow.Maui\Meadow.Maui.csproj", "{F4AAB2CD-E4E8-4F6C-8DCE-3AB16A719570}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_External", "_External", "{6CEB0BB1-724E-464A-BAA2-DD50427D597F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Contracts", "..\..\Meadow.Contracts\Source\Meadow.Contracts\Meadow.Contracts.csproj", "{A93D9188-C65D-47ED-8129-9B6A8D09346E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Logging", "..\..\Meadow.Logging\Source\Meadow.Logging\lib\Meadow.Logging.csproj", "{262E8605-AE6C-4D13-A689-86BF9A915E06}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Units", "..\..\Meadow.Units\Source\Meadow.Units\Meadow.Units.csproj", "{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Meadow.Modbus", "..\..\Meadow.Modbus\src\Meadow.Modbus\Meadow.Modbus.csproj", "{17E8F12D-1991-401B-85D4-485AF33E72C3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MQTTnet", "..\..\MQTTnet\Source\MQTTnet\MQTTnet.csproj", "{E2595822-0DF5-4F61-9221-75B79B20EAD7}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Core|Any CPU = Core|Any CPU
@@ -113,42 +101,6 @@ Global
 		{F4AAB2CD-E4E8-4F6C-8DCE-3AB16A719570}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F4AAB2CD-E4E8-4F6C-8DCE-3AB16A719570}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F4AAB2CD-E4E8-4F6C-8DCE-3AB16A719570}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E}.Core|Any CPU.ActiveCfg = Debug|Any CPU
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E}.Core|Any CPU.Build.0 = Debug|Any CPU
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E}.Core|Any CPU.Deploy.0 = Debug|Any CPU
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{262E8605-AE6C-4D13-A689-86BF9A915E06}.Core|Any CPU.ActiveCfg = Debug|Any CPU
-		{262E8605-AE6C-4D13-A689-86BF9A915E06}.Core|Any CPU.Build.0 = Debug|Any CPU
-		{262E8605-AE6C-4D13-A689-86BF9A915E06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{262E8605-AE6C-4D13-A689-86BF9A915E06}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{262E8605-AE6C-4D13-A689-86BF9A915E06}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{262E8605-AE6C-4D13-A689-86BF9A915E06}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}.Core|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}.Core|Any CPU.Build.0 = Debug|Any CPU
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}.Core|Any CPU.Deploy.0 = Debug|Any CPU
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{17E8F12D-1991-401B-85D4-485AF33E72C3}.Core|Any CPU.ActiveCfg = Debug|Any CPU
-		{17E8F12D-1991-401B-85D4-485AF33E72C3}.Core|Any CPU.Build.0 = Debug|Any CPU
-		{17E8F12D-1991-401B-85D4-485AF33E72C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{17E8F12D-1991-401B-85D4-485AF33E72C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17E8F12D-1991-401B-85D4-485AF33E72C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{17E8F12D-1991-401B-85D4-485AF33E72C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E2595822-0DF5-4F61-9221-75B79B20EAD7}.Core|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2595822-0DF5-4F61-9221-75B79B20EAD7}.Core|Any CPU.Build.0 = Debug|Any CPU
-		{E2595822-0DF5-4F61-9221-75B79B20EAD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E2595822-0DF5-4F61-9221-75B79B20EAD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E2595822-0DF5-4F61-9221-75B79B20EAD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E2595822-0DF5-4F61-9221-75B79B20EAD7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -166,11 +118,6 @@ Global
 		{893B86CC-CB07-4C75-8D6A-6EC7B95277D7} = {BF8A3E34-3958-4D8D-975A-353EAC05B87A}
 		{FF2A0504-AFBE-46DD-A400-EC33256ACC3D} = {E7E568E2-4B82-4FF8-839F-AC2648925485}
 		{F4AAB2CD-E4E8-4F6C-8DCE-3AB16A719570} = {E7E568E2-4B82-4FF8-839F-AC2648925485}
-		{A93D9188-C65D-47ED-8129-9B6A8D09346E} = {6CEB0BB1-724E-464A-BAA2-DD50427D597F}
-		{262E8605-AE6C-4D13-A689-86BF9A915E06} = {6CEB0BB1-724E-464A-BAA2-DD50427D597F}
-		{6CA3D1CD-9C19-449F-B55A-8D9D2F10F5B0} = {6CEB0BB1-724E-464A-BAA2-DD50427D597F}
-		{17E8F12D-1991-401B-85D4-485AF33E72C3} = {6CEB0BB1-724E-464A-BAA2-DD50427D597F}
-		{E2595822-0DF5-4F61-9221-75B79B20EAD7} = {6CEB0BB1-724E-464A-BAA2-DD50427D597F}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {346406ED-19A9-40FB-A3F7-14139F44C0C8}

diff --git a/source/Meadow.Core/Meadow.Core.csproj b/source/Meadow.Core/Meadow.Core.csproj
@@ -22,9 +22,9 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
-	  <ProjectReference Include="..\..\..\Meadow.Contracts\Source\Meadow.Contracts\Meadow.Contracts.csproj" />
-	  <ProjectReference Include="..\..\..\Meadow.Modbus\src\Meadow.Modbus\Meadow.Modbus.csproj" />
-	  <ProjectReference Include="..\..\..\MQTTnet\Source\MQTTnet\MQTTnet.csproj" />
+    <PackageReference Include="Meadow.Contracts" Version="*" />
+    <PackageReference Include="Meadow.Modbus" Version="*" />
+    <PackageReference Include="Meadow.MQTT" Version="*" />
 	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
     <PackageReference Include="NetEscapades.Configuration.Yaml" Version="2.2.0" />
   </ItemGroup>

diff --git a/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj b/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj
@@ -16,7 +16,7 @@
     <PackageReference Include="coverlet.collector" Version="1.2.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Meadow.Core\Meadow.Core.csproj" />
+    <PackageReference Include="Meadow" Version="*" />
   </ItemGroup>
   <ItemGroup>
     <None Update="app.config.envizor.yaml">

diff --git a/source/implementations/f7/Meadow.F7/Meadow.F7.csproj b/source/implementations/f7/Meadow.F7/Meadow.F7.csproj
@@ -25,6 +25,6 @@
     <None Include="..\..\..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Meadow.Core\Meadow.Core.csproj" />
+    <PackageReference Include="Meadow" Version="*" />
   </ItemGroup>
 </Project>
diff --git a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj
@@ -25,7 +25,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.IO.Ports" Version="7.0.0" />
-    <ProjectReference Include="..\..\..\Meadow.Core\Meadow.Core.csproj" />
+    <PackageReference Include="Meadow" Version="*" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\icon.png" Link="icon.png" Pack="true" PackagePath="" />

diff --git a/...plementations/simulation/Meadow.Simulation.Unit.Tests/Meadow.Simulation.Unit.Tests.csproj b/...plementations/simulation/Meadow.Simulation.Unit.Tests/Meadow.Simulation.Unit.Tests.csproj
@@ -25,7 +25,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Meadow.Simulation\Meadow.Simulation.csproj" />
+    <PackageReference Include="Meadow.Simulation" Version="*" />
   </ItemGroup>
 
 </Project>
diff --git a/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj b/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj
@@ -23,6 +23,6 @@
     <None Include="..\..\..\icon.png" Link="icon.png" Pack="true" PackagePath="" />
     <PackageReference Include="System.IO.Ports" Version="7.0.0" />
     <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
-    <ProjectReference Include="..\..\..\Meadow.Core\Meadow.Core.csproj" />
+    <PackageReference Include="Meadow" Version="*" />
   </ItemGroup>
 </Project>
diff --git a/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj b/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj
@@ -22,7 +22,7 @@
   <ItemGroup>
     <PackageReference Include="System.IO.Ports" Version="7.0.0" />
     <PackageReference Include="System.Net.WebSockets" Version="4.3.0" />
-    <ProjectReference Include="..\..\..\Meadow.Core\Meadow.Core.csproj" />
+    <PackageReference Include="Meadow" Version="*" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\icon.png" Link="icon.png" Pack="true" PackagePath="" />

diff --git a/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj b/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj
@@ -23,6 +23,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\icon.png" Pack="true" PackagePath="" />
-    <ProjectReference Include="..\..\Meadow.Core\Meadow.Core.csproj" />
+    <PackageReference Include="Meadow" Version="*" />
   </ItemGroup>
 </Project>
diff --git a/source/ui/Meadow.Maui/Meadow.Maui.csproj b/source/ui/Meadow.Maui/Meadow.Maui.csproj
@@ -25,6 +25,6 @@
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\icon.png" Pack="true" PackagePath="" />
-    <ProjectReference Include="..\..\implementations\windows\Meadow.Windows\Meadow.Windows.csproj" />
+    <PackageReference Include="Meadow.Windows" Version="*" />
   </ItemGroup>
 </Project>