Merge pull request WildernessLabs#40 from WildernessLabs/v1.3.0

V1.3.0
jpansarasa · Aug 29, 2023 · 03c0c94 · 03c0c94
2 parents 85cb60d + d6b6c25
commit 03c0c94
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 28 deletions.
diff --git a/.github/workflows/develop-ci.yml b/.github/workflows/develop-ci.yml
@@ -0,0 +1,90 @@
+name: Develop Build
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: [ develop ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout Meadow.Logging
+      uses: actions/checkout@v3
+      with:
+        repository: WildernessLabs/Meadow.Logging
+        path: Meadow.Logging
+        ref: develop
+
+    - name: Checkout Meadow.Units
+      uses: actions/checkout@v3
+      with:
+        repository: WildernessLabs/Meadow.Units
+        path: Meadow.Units
+        ref: develop
+
+    - name: Checkout Meadow.Contracts
+      uses: actions/checkout@v3
+      with:
+        repository: WildernessLabs/Meadow.Contracts
+        path: Meadow.Contracts
+        ref: develop
+
+    - name: Checkout Meadow.Core
+      uses: actions/checkout@v3
+      with:
+        repository: WildernessLabs/Meadow.Core
+        path: Meadow.Core
+        ref: develop
+
+    - name: Checkout MQTTnet
+      uses: actions/checkout@v3
+      with:
+        repository: WildernessLabs/MQTTnet
+        path: MQTTnet
+        ref: develop
+
+    - name: Checkout Meadow.Modbus
+      uses: actions/checkout@v3
+      with:
+        repository: WildernessLabs/Meadow.Modbus
+        path: Meadow.Modbus
+        ref: develop
+
+    - name: Checkout Meadow.Foundation
+      uses: actions/checkout@v3
+      with:
+        repository: WildernessLabs/Meadow.Foundation
+        path: Meadow.Foundation
+        ref: develop
+
+    - name: Checkout Maple
+      uses: actions/checkout@v3
+      with:
+          repository: WildernessLabs/Maple
+          path: Maple
+          ref: develop
+
+    - name: Checkout Clima
+      uses: actions/checkout@v3
+      with:
+        path: Clima
+        ref: develop
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version:
+          7.0.x
+
+    - name: Install MAUI Workload
+      run: dotnet workload install maui --ignore-failed-sources
+
+    - name: Install MAUI Android Workload
+      run: dotnet workload install maui-android --ignore-failed-sources
+
+    - name: Build Meadow.Clima
+      run: dotnet build -c Release Clima/Source/Meadow.Clima.sln
diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml
@@ -0,0 +1,35 @@
+name: Main Build
+
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+
+    - name: Checkout Clima
+      uses: actions/checkout@v3
+      with:
+        path: Clima
+        ref: main
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version:
+          7.0.x
+
+    - name: Install MAUI Workload
+      run: dotnet workload install maui --ignore-failed-sources
+
+    - name: Install MAUI Android Workload
+      run: dotnet workload install maui-android --ignore-failed-sources
+
+    - name: Build Clima
+      run: dotnet build -c Release Clima/Source/Meadow.Clima.sln
diff --git a/Source/Additional Samples/Clima_HackKit_Demo/Clima_HackKit_Demo.csproj b/Source/Additional Samples/Clima_HackKit_Demo/Clima_HackKit_Demo.csproj
@@ -15,7 +15,7 @@
     <EmbeddedResource Include="img_wifi_connecting.jpg" />
   </ItemGroup>  
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Maple\Source\Web.Maple.MapleServer\Driver\Web.Maple.MapleServer.csproj" />
+    <PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="*" />
     <PackageReference Include="Meadow.F7" Version="*" />
     <PackageReference Include="Meadow.Foundation" Version="*" />
     <PackageReference Include="Meadow.Foundation.Displays.TextDisplayMenu" Version="*" />

diff --git a/Source/Additional Samples/Clima_SQLite_Demo/Clima_SQLite_Demo.csproj b/Source/Additional Samples/Clima_SQLite_Demo/Clima_SQLite_Demo.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Meadow.Sdk/1.1.0">
+<Project Sdk="Meadow.Sdk/1.1.0">
   <PropertyGroup>    
     <TargetFramework>netstandard2.1</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
@@ -10,7 +10,7 @@
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\Maple\Source\Web.Maple.MapleServer\Driver\Web.Maple.MapleServer.csproj" />
+    <PackageReference Include="Meadow.Foundation.Web.Maple.Server" Version="*" />
     <ProjectReference Include="..\..\Meadow.Clima\Meadow.Clima.csproj" />
     <PackageReference Include="System.Text.Json" Version="*" />
     <PackageReference Include="sqlite-net-static" Version="*" />

diff --git a/Source/Meadow.Clima/Meadow.Clima.csproj b/Source/Meadow.Clima/Meadow.Clima.csproj
@@ -1,29 +1,23 @@
 <Project Sdk="Meadow.Sdk/1.1.0">
-	<PropertyGroup>
-		<GenerateDocumentationFile>true</GenerateDocumentationFile>
-		<PackageIcon>icon.png</PackageIcon>
-		<Authors>Wilderness Labs, Inc</Authors>
-		<TargetFramework>netstandard2.1</TargetFramework>
-		<OutputType>Library</OutputType>
-		<AssemblyName>Clima</AssemblyName>
-		<Company>Wilderness Labs, Inc</Company>
-		<PackageProjectUrl>https://github.com/WildernessLabs/Clima</PackageProjectUrl>
-		<PackageId>Meadow.Clima</PackageId>
-		<RepositoryUrl>https://github.com/WildernessLabs/Clima</RepositoryUrl>
-		<PackageTags>Meadow.Clima,Meadow,Clima,atmospheric,environmental,sensors,accelerator</PackageTags>
-		<Version>0.1.0</Version>
-		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-		<Description>Library for the Meadow Clima IoT accelerator</Description>
-		<Nullable>enable</Nullable>
-	</PropertyGroup>
-	<PropertyGroup>
-		<LangVersion>10.0</LangVersion>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<None Include="icon.png" Pack="true" PackagePath="" />
-	</ItemGroup>
-
+  <PropertyGroup>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageIcon>icon.png</PackageIcon>
+    <Authors>Wilderness Labs, Inc</Authors>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Clima</AssemblyName>
+    <Company>Wilderness Labs, Inc</Company>
+    <PackageProjectUrl>https://github.com/WildernessLabs/Clima</PackageProjectUrl>
+    <PackageId>Meadow.Clima</PackageId>
+    <RepositoryUrl>https://github.com/WildernessLabs/Clima</RepositoryUrl>
+    <PackageTags>Meadow.Clima,Meadow,Clima,atmospheric,environmental,sensors,accelerator</PackageTags>
+    <Version>0.1.0</Version>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Description>Library for the Meadow Clima IoT accelerator</Description>
+    <Nullable>enable</Nullable>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <LangVersion>10.0</LangVersion>
+  </PropertyGroup>
   <ItemGroup>
     <None Include="icon.png" Pack="true" PackagePath="" />
   </ItemGroup>