Skip to content

Commit e5c2ea5

Browse files
adrianstevensadrianstevens
authored
Merge pull request #104 from WildernessLabs/normalize-metadata
Normalize metadata
2 parents cd7e4c3 + e2af33e commit e5c2ea5

File tree

7 files changed

+327
-90
lines changed

7 files changed

+327
-90
lines changed

‎.github/workflows/develop-ci.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,71 +14,71 @@ jobs:
1414

1515
steps:
1616
- name: Checkout Meadow.Logging
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
with:
1919
repository: WildernessLabs/Meadow.Logging
2020
path: Meadow.Logging
2121
ref: develop
2222

2323
- name: Checkout Meadow.Units
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525
with:
2626
repository: WildernessLabs/Meadow.Units
2727
path: Meadow.Units
2828
ref: develop
2929

3030
- name: Checkout Meadow.Contracts
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232
with:
3333
repository: WildernessLabs/Meadow.Contracts
3434
path: Meadow.Contracts
3535
ref: develop
3636

3737
- name: Checkout Meadow.Core
38-
uses: actions/checkout@v3
38+
uses: actions/checkout@v4
3939
with:
4040
repository: WildernessLabs/Meadow.Core
4141
path: Meadow.Core
4242
ref: develop
4343

4444
- name: Checkout MQTTnet
45-
uses: actions/checkout@v3
45+
uses: actions/checkout@v4
4646
with:
4747
repository: WildernessLabs/MQTTnet
4848
path: MQTTnet
4949
ref: develop
5050

5151
- name: Checkout Meadow.Modbus
52-
uses: actions/checkout@v3
52+
uses: actions/checkout@v4
5353
with:
5454
repository: WildernessLabs/Meadow.Modbus
5555
path: Meadow.Modbus
5656
ref: develop
5757

5858
- name: Checkout Meadow.Foundation
59-
uses: actions/checkout@v3
59+
uses: actions/checkout@v4
6060
with:
6161
repository: WildernessLabs/Meadow.Foundation
6262
path: Meadow.Foundation
6363
ref: develop
6464

6565
- name: Checkout Maple
66-
uses: actions/checkout@v3
66+
uses: actions/checkout@v4
6767
with:
6868
repository: WildernessLabs/Maple
6969
path: Maple
7070
ref: develop
7171

7272
- name: Checkout Clima
73-
uses: actions/checkout@v3
73+
uses: actions/checkout@v4
7474
with:
7575
path: Clima
7676

7777
- name: Setup .NET
78-
uses: actions/setup-dotnet@v2
78+
uses: actions/setup-dotnet@v4
7979
with:
8080
dotnet-version:
81-
6.x
81+
8.x
8282

8383
- name: Install Java SDK
8484
uses: actions/setup-java@v2
@@ -87,10 +87,10 @@ jobs:
8787
java-version: '11'
8888

8989
- name: Setup .NET SDK
90-
uses: actions/setup-dotnet@v1
90+
uses: actions/setup-dotnet@v4
9191
with:
9292
dotnet-version:
93-
7.0.x
93+
8.0.x
9494

9595
- name: Install MAUI Workload
9696
run: dotnet workload install maui --ignore-failed-sources

‎.github/workflows/main-ci.yml‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎.github/workflows/nuget.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎Source/Clima_Demo/wifi.config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
# # To enable automatically connecting to a default network, make sure to enable the Coprocessor > AutomaticallyStartNetwork value in meadow.config.yaml.
66
Credentials:
7-
Ssid: SSID
8-
Password: PASSWORD
7+
Ssid: TELUSDC1E
8+
Password: tnrXFa6MVqAU

‎Source/Directory.Packages.props‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,45 @@
11
<Project>
2-
<Import Project="../../Meadow.Contracts/Source/Directory.Packages.props" />
3-
</Project>
2+
<!-- If this file has been loaded already, do nothing -->
3+
<Choose>
4+
<When Condition="'$(MeadowContractsPackagePropsImported)' == 'true'">
5+
<!-- Do nothing, already imported -->
6+
</When>
7+
<Otherwise>
8+
<!-- Set the marker to prevent future imports -->
9+
<PropertyGroup>
10+
<MeadowContractsPackagePropsImported>true</MeadowContractsPackagePropsImported>
11+
</PropertyGroup>
12+
13+
<PropertyGroup>
14+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
15+
</PropertyGroup>
16+
17+
<ItemGroup>
18+
<PackageVersion Include="Avalonia" Version="11.2.1" />
19+
<PackageVersion Include="BouncyCastle.Cryptography" Version="2.4.0" />
20+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
21+
<PackageVersion Include="Gapotchenko.FX.Data.Integrity.Checksum.Crc8" Version="2022.2.7" />
22+
<PackageVersion Include="GtkSharp" Version="3.24.24.95" />
23+
<PackageVersion Include="ManagedNativeWifi" Version="2.6.0" />
24+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.14" />
25+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.14" />
26+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
27+
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.10" />
28+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.10" />
29+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
30+
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
31+
<PackageVersion Include="NetEscapades.Configuration.Yaml" Version="3.1.0" />
32+
<PackageVersion Include="Peak.PCANBasic.NET" Version="4.10.0.964" />
33+
<PackageVersion Include="Silk.NET" Version="2.22.0" />
34+
<PackageVersion Include="SimpleJpegDecoder" Version="0.4.0" />
35+
<PackageVersion Include="SkiaSharp" Version="2.88.9" />
36+
<PackageVersion Include="System.IO.Hashing" Version="9.0.0" />
37+
<PackageVersion Include="System.IO.Ports" Version="8.0.0" />
38+
<PackageVersion Include="System.Net.WebSockets" Version="4.3.0" />
39+
<PackageVersion Include="System.Text.Json" Version="9.0.2" />
40+
<PackageVersion Include="xunit" Version="2.9.2" />
41+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
42+
</ItemGroup>
43+
</Otherwise>
44+
</Choose>
45+
</Project>

‎Source/Meadow.Clima/Meadow.Clima.csproj‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
<Project Sdk="Meadow.Sdk/1.1.0">
1+
<Project Sdk="Meadow.Sdk/1.1.0">
22
<PropertyGroup>
3-
<Version>1.11.0</Version>
43
<Company>Wilderness Labs, Inc</Company>
54
<Authors>Wilderness Labs, Inc</Authors>
65
<GenerateDocumentationFile>true</GenerateDocumentationFile>
76
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
8-
<LangVersion>10.0</LangVersion>
7+
<LangVersion>12</LangVersion>
98
<Nullable>enable</Nullable>
109
<PackageIcon>icon.png</PackageIcon>
1110
<TargetFramework>netstandard2.1</TargetFramework>

0 commit comments

Comments
 (0)