Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 13 additions & 13 deletions .github/workflows/develop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,71 +14,71 @@ jobs:

steps:
- name: Checkout Meadow.Logging
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: WildernessLabs/Meadow.Logging
path: Meadow.Logging
ref: develop

- name: Checkout Meadow.Units
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: WildernessLabs/Meadow.Units
path: Meadow.Units
ref: develop

- name: Checkout Meadow.Contracts
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: WildernessLabs/Meadow.Contracts
path: Meadow.Contracts
ref: develop

- name: Checkout Meadow.Core
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: WildernessLabs/Meadow.Core
path: Meadow.Core
ref: develop

- name: Checkout MQTTnet
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: WildernessLabs/MQTTnet
path: MQTTnet
ref: develop

- name: Checkout Meadow.Modbus
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: WildernessLabs/Meadow.Modbus
path: Meadow.Modbus
ref: develop

- name: Checkout Meadow.Foundation
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: WildernessLabs/Meadow.Foundation
path: Meadow.Foundation
ref: develop

- name: Checkout Maple
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: WildernessLabs/Maple
path: Maple
ref: develop

- name: Checkout Clima
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: Clima

- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version:
6.x
8.x

- name: Install Java SDK
uses: actions/setup-java@v2
Expand All @@ -87,10 +87,10 @@ jobs:
java-version: '11'

- name: Setup .NET SDK
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v4
with:
dotnet-version:
7.0.x
8.0.x

- name: Install MAUI Workload
run: dotnet workload install maui --ignore-failed-sources
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/main-ci.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/nuget.yml

This file was deleted.

4 changes: 2 additions & 2 deletions Source/Clima_Demo/wifi.config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@

# # To enable automatically connecting to a default network, make sure to enable the Coprocessor > AutomaticallyStartNetwork value in meadow.config.yaml.
Credentials:
Ssid: SSID
Password: PASSWORD
Ssid: TELUSDC1E
Password: tnrXFa6MVqAU
46 changes: 44 additions & 2 deletions Source/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,3 +1,45 @@
<Project>
<Import Project="../../Meadow.Contracts/Source/Directory.Packages.props" />
</Project>
<!-- If this file has been loaded already, do nothing -->
<Choose>
<When Condition="'$(MeadowContractsPackagePropsImported)' == 'true'">
<!-- Do nothing, already imported -->
</When>
<Otherwise>
<!-- Set the marker to prevent future imports -->
<PropertyGroup>
<MeadowContractsPackagePropsImported>true</MeadowContractsPackagePropsImported>
</PropertyGroup>

<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<ItemGroup>
<PackageVersion Include="Avalonia" Version="11.2.1" />
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="Gapotchenko.FX.Data.Integrity.Checksum.Crc8" Version="2022.2.7" />
<PackageVersion Include="GtkSharp" Version="3.24.24.95" />
<PackageVersion Include="ManagedNativeWifi" Version="2.6.0" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.14" />
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.14" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.10" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.10" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
<PackageVersion Include="Peak.PCANBasic.NET" Version="4.10.0.964" />
<PackageVersion Include="Silk.NET" Version="2.22.0" />
<PackageVersion Include="SimpleJpegDecoder" Version="0.4.0" />
<PackageVersion Include="SkiaSharp" Version="2.88.9" />
<PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
<PackageVersion Include="System.IO.Ports" Version="8.0.0" />
<PackageVersion Include="System.Net.WebSockets" Version="4.3.0" />
<PackageVersion Include="System.Text.Json" Version="9.0.2" />
<PackageVersion Include="xunit" Version="2.9.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>
</Otherwise>
</Choose>
</Project>
5 changes: 2 additions & 3 deletions Source/Meadow.Clima/Meadow.Clima.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<Version>1.11.0</Version>
<Company>Wilderness Labs, Inc</Company>
<Authors>Wilderness Labs, Inc</Authors>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<LangVersion>10.0</LangVersion>
<LangVersion>12</LangVersion>
<Nullable>enable</Nullable>
<PackageIcon>icon.png</PackageIcon>
<TargetFramework>netstandard2.1</TargetFramework>
Expand Down
Loading
Loading