From a1d247ec9d52dcdad1a6f35ffa7ac92847bda86c Mon Sep 17 00:00:00 2001 From: Adrian Stevens Date: Fri, 18 Aug 2023 13:04:07 -0700 Subject: [PATCH 1/2] Update project metadata --- source/Meadow.Core/Meadow.Core.csproj | 4 +++- source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj | 8 +++++++- source/Tests/Meadow.Units.Tests/Meadow.Units.Tests.csproj | 6 ++++++ source/Tests/Profiler/Profiler.csproj | 6 ++++++ source/implementations/f7/Meadow.F7/Meadow.F7.csproj | 4 +++- .../linux/Meadow.Linux/Meadow.Linux.csproj | 5 ++++- .../tests/Meadow.Linux.Unit.Tests/M4L.Unit.Tests.csproj | 6 ++++++ .../Meadow.Simulation.Unit.Tests.csproj | 6 +++++- .../simulation/Meadow.Simulation/Meadow.Simulation.csproj | 7 +++++-- .../simulation/SimulatedApp/SimulatedApp.csproj | 5 +++++ .../windows/Meadow.Windows/Meadow.Windows.csproj | 4 ++++ source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj | 2 ++ source/ui/Meadow.Maui/Meadow.Maui.csproj | 3 +++ 13 files changed, 59 insertions(+), 7 deletions(-) diff --git a/source/Meadow.Core/Meadow.Core.csproj b/source/Meadow.Core/Meadow.Core.csproj index 29eddbce..b65b410d 100644 --- a/source/Meadow.Core/Meadow.Core.csproj +++ b/source/Meadow.Core/Meadow.Core.csproj @@ -1,5 +1,7 @@ + Wilderness Labs, Inc + Apache-2.0 netstandard2.1 Exe Meadow @@ -15,7 +17,7 @@ Meadow enable Core .NET libraries for Wilderness Labs Meadow - 10 + 10.0 true diff --git a/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj b/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj index 049b493b..72ac8fce 100644 --- a/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj +++ b/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj @@ -1,6 +1,12 @@ - + + Wilderness Labs, Inc + Wilderness Labs, Inc + true + Apache-2.0 + 10.0 + enable net7.0 false diff --git a/source/Tests/Meadow.Units.Tests/Meadow.Units.Tests.csproj b/source/Tests/Meadow.Units.Tests/Meadow.Units.Tests.csproj index 3541a2ec..dbd70f95 100644 --- a/source/Tests/Meadow.Units.Tests/Meadow.Units.Tests.csproj +++ b/source/Tests/Meadow.Units.Tests/Meadow.Units.Tests.csproj @@ -1,6 +1,12 @@ + Wilderness Labs, Inc + Wilderness Labs, Inc + true + Apache-2.0 + 10.0 + enable netcoreapp3.1 false diff --git a/source/Tests/Profiler/Profiler.csproj b/source/Tests/Profiler/Profiler.csproj index dfdedbe3..c831bdb9 100644 --- a/source/Tests/Profiler/Profiler.csproj +++ b/source/Tests/Profiler/Profiler.csproj @@ -1,5 +1,11 @@ + Wilderness Labs, Inc + Wilderness Labs, Inc + true + Apache-2.0 + 10.0 + enable net472 Exe App diff --git a/source/implementations/f7/Meadow.F7/Meadow.F7.csproj b/source/implementations/f7/Meadow.F7/Meadow.F7.csproj index 148191b1..e87a89e2 100644 --- a/source/implementations/f7/Meadow.F7/Meadow.F7.csproj +++ b/source/implementations/f7/Meadow.F7/Meadow.F7.csproj @@ -1,5 +1,7 @@ + Wilderness Labs, Inc + Apache-2.0 netstandard2.1 Library Meadow.F7 @@ -16,7 +18,7 @@ enable STM32F7 .NET libraries for Wilderness Labs Meadow true - 10 + 10.0 enable diff --git a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj index a4656aa7..61cb4a69 100644 --- a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj +++ b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj @@ -16,8 +16,11 @@ Linux .NET libraries for Wilderness Labs Meadow + Wilderness Labs, Inc + true + Apache-2.0 true - 10 + 10.0 enable diff --git a/source/implementations/linux/tests/Meadow.Linux.Unit.Tests/M4L.Unit.Tests.csproj b/source/implementations/linux/tests/Meadow.Linux.Unit.Tests/M4L.Unit.Tests.csproj index 8c0a397e..2cf3ba5a 100644 --- a/source/implementations/linux/tests/Meadow.Linux.Unit.Tests/M4L.Unit.Tests.csproj +++ b/source/implementations/linux/tests/Meadow.Linux.Unit.Tests/M4L.Unit.Tests.csproj @@ -1,6 +1,12 @@ + Wilderness Labs, Inc + Wilderness Labs, Inc + true + Apache-2.0 + 10.0 + enable net5.0 false diff --git a/source/implementations/simulation/Meadow.Simulation.Unit.Tests/Meadow.Simulation.Unit.Tests.csproj b/source/implementations/simulation/Meadow.Simulation.Unit.Tests/Meadow.Simulation.Unit.Tests.csproj index ebb4dc22..13d31053 100644 --- a/source/implementations/simulation/Meadow.Simulation.Unit.Tests/Meadow.Simulation.Unit.Tests.csproj +++ b/source/implementations/simulation/Meadow.Simulation.Unit.Tests/Meadow.Simulation.Unit.Tests.csproj @@ -1,9 +1,13 @@ + Wilderness Labs, Inc + Wilderness Labs, Inc + true + Apache-2.0 net7.0 enable - 10 + 10.0 false diff --git a/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj b/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj index bae11637..fa4b08ec 100644 --- a/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj +++ b/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj @@ -1,5 +1,8 @@ - + + Wilderness Labs, Inc + true + Apache-2.0 netstandard2.1 enable Meadow.Simulation @@ -13,7 +16,7 @@ 0.1.0 false enable - 10 + 10.0 A simulation Environment for Wilderness Labs Meadow Platform diff --git a/source/implementations/simulation/SimulatedApp/SimulatedApp.csproj b/source/implementations/simulation/SimulatedApp/SimulatedApp.csproj index 180e2f58..7ea3e092 100644 --- a/source/implementations/simulation/SimulatedApp/SimulatedApp.csproj +++ b/source/implementations/simulation/SimulatedApp/SimulatedApp.csproj @@ -1,6 +1,11 @@ + Wilderness Labs, Inc + Wilderness Labs, Inc + true + Apache-2.0 + 10.0 Exe net6.0 enable diff --git a/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj b/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj index d9bf1a72..64e6e06f 100644 --- a/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj +++ b/source/implementations/windows/Meadow.Windows/Meadow.Windows.csproj @@ -1,5 +1,9 @@ + Wilderness Labs, Inc + true + Apache-2.0 + 10.0 net7.0 enable Meadow.Windows diff --git a/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj b/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj index 0906b282..4bb7cf91 100644 --- a/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj +++ b/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj @@ -1,6 +1,8 @@ + Apache-2.0 + 10.0 net6.0 enable enable diff --git a/source/ui/Meadow.Maui/Meadow.Maui.csproj b/source/ui/Meadow.Maui/Meadow.Maui.csproj index fa906ace..bb912606 100644 --- a/source/ui/Meadow.Maui/Meadow.Maui.csproj +++ b/source/ui/Meadow.Maui/Meadow.Maui.csproj @@ -1,6 +1,9 @@ + Apache-2.0 + 10.0 + enable $(TargetFrameworks);net7.0-windows10.0.19041 true true From c4891bc63db51670a4f14633e98c51c241069765 Mon Sep 17 00:00:00 2001 From: Jorge Ramirez Date: Fri, 18 Aug 2023 13:34:27 -0700 Subject: [PATCH 2/2] Fix indentations --- source/Meadow.Core/Meadow.Core.csproj | 46 ++++++++-------- .../Core.Unit.Tests/Core.Unit.Tests.csproj | 6 --- source/Tests/Profiler/Profiler.csproj | 4 -- .../linux/Meadow.Linux/Meadow.Linux.csproj | 2 +- .../M4L.Unit.Tests.csproj | 5 -- .../Meadow.Simulation.csproj | 4 +- .../SimulatedApp/SimulatedApp.csproj | 6 +-- .../ui/Meadow.Avalonia/Meadow.Avalonia.csproj | 32 +++++------ source/ui/Meadow.Maui/Meadow.Maui.csproj | 54 +++++++++---------- 9 files changed, 66 insertions(+), 93 deletions(-) diff --git a/source/Meadow.Core/Meadow.Core.csproj b/source/Meadow.Core/Meadow.Core.csproj index b65b410d..c5ff99df 100644 --- a/source/Meadow.Core/Meadow.Core.csproj +++ b/source/Meadow.Core/Meadow.Core.csproj @@ -1,31 +1,31 @@ - + Wilderness Labs, Inc Apache-2.0 - netstandard2.1 - Exe - Meadow - Wilderness Labs, Inc - http://developer.wildernesslabs.co/Meadow/ - Meadow - icon.png - https://github.com/WildernessLabs/Meadow.Core - Meadow - 0.23.0 - true - true - Meadow - enable - Core .NET libraries for Wilderness Labs Meadow + netstandard2.1 + Exe + Meadow + Wilderness Labs, Inc + http://developer.wildernesslabs.co/Meadow/ + Meadow + icon.png + https://github.com/WildernessLabs/Meadow.Core + Meadow + 0.23.0 + true + true + Meadow + enable + Core .NET libraries for Wilderness Labs Meadow 10.0 - true - - - + true + + + - - - + + + diff --git a/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj b/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj index 72ac8fce..7f3c6f4f 100644 --- a/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj +++ b/source/Tests/Core.Unit.Tests/Core.Unit.Tests.csproj @@ -1,5 +1,4 @@ - Wilderness Labs, Inc Wilderness Labs, Inc @@ -8,21 +7,17 @@ 10.0 enable net7.0 - false - - - Always @@ -43,5 +38,4 @@ Always - diff --git a/source/Tests/Profiler/Profiler.csproj b/source/Tests/Profiler/Profiler.csproj index c831bdb9..12debc2b 100644 --- a/source/Tests/Profiler/Profiler.csproj +++ b/source/Tests/Profiler/Profiler.csproj @@ -11,17 +11,13 @@ App Release;Debug - true - true - - diff --git a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj index 61cb4a69..9203f326 100644 --- a/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj +++ b/source/implementations/linux/Meadow.Linux/Meadow.Linux.csproj @@ -28,6 +28,6 @@ - + diff --git a/source/implementations/linux/tests/Meadow.Linux.Unit.Tests/M4L.Unit.Tests.csproj b/source/implementations/linux/tests/Meadow.Linux.Unit.Tests/M4L.Unit.Tests.csproj index 2cf3ba5a..6c3ad64c 100644 --- a/source/implementations/linux/tests/Meadow.Linux.Unit.Tests/M4L.Unit.Tests.csproj +++ b/source/implementations/linux/tests/Meadow.Linux.Unit.Tests/M4L.Unit.Tests.csproj @@ -1,5 +1,4 @@ - Wilderness Labs, Inc Wilderness Labs, Inc @@ -8,10 +7,8 @@ 10.0 enable net5.0 - false - @@ -24,9 +21,7 @@ all - - diff --git a/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj b/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj index fa4b08ec..627d418f 100644 --- a/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj +++ b/source/implementations/simulation/Meadow.Simulation/Meadow.Simulation.csproj @@ -9,7 +9,7 @@ Wilderness Labs, Inc http://beta-developer.wildernesslabs.co/Meadow/ Meadow.Simulation - icon.png + icon.png https://github.com/WildernessLabs/Meadow.Foundation/blob/master/Source/icon.png?raw=true https://github.com/WildernessLabs/Meadow.Core Meadow @@ -25,4 +25,4 @@ - + \ No newline at end of file diff --git a/source/implementations/simulation/SimulatedApp/SimulatedApp.csproj b/source/implementations/simulation/SimulatedApp/SimulatedApp.csproj index 7ea3e092..fc98b129 100644 --- a/source/implementations/simulation/SimulatedApp/SimulatedApp.csproj +++ b/source/implementations/simulation/SimulatedApp/SimulatedApp.csproj @@ -1,5 +1,4 @@ - Wilderness Labs, Inc Wilderness Labs, Inc @@ -10,15 +9,12 @@ net6.0 enable enable - App + App - - - diff --git a/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj b/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj index 4bb7cf91..18314633 100644 --- a/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj +++ b/source/ui/Meadow.Avalonia/Meadow.Avalonia.csproj @@ -1,32 +1,28 @@ - Apache-2.0 10.0 net6.0 enable enable - Meadow.Avalonia - true - Wilderness Labs, Inc - Wilderness Labs, Inc - http://developer.wildernesslabs.co/Meadow/Meadow.Core/ - Meadow.Avalonia - icon.png - https://github.com/WildernessLabs/Meadow.Core - Meadow,Meadow.Avalonia,Avalonia - 0.9.54 - true - Utility library for aiding in using Wilderness Labs' Meadow stack in an Avalonia application + Meadow.Avalonia + true + Wilderness Labs, Inc + Wilderness Labs, Inc + http://developer.wildernesslabs.co/Meadow/Meadow.Core/ + Meadow.Avalonia + icon.png + https://github.com/WildernessLabs/Meadow.Core + Meadow,Meadow.Avalonia,Avalonia + 0.9.54 + true + Utility library for aiding in using Wilderness Labs' Meadow stack in an Avalonia application - - - - + + - diff --git a/source/ui/Meadow.Maui/Meadow.Maui.csproj b/source/ui/Meadow.Maui/Meadow.Maui.csproj index bb912606..842c95ce 100644 --- a/source/ui/Meadow.Maui/Meadow.Maui.csproj +++ b/source/ui/Meadow.Maui/Meadow.Maui.csproj @@ -1,34 +1,30 @@ - - + Apache-2.0 10.0 enable - $(TargetFrameworks);net7.0-windows10.0.19041 - true - true - enable - false - - 10.0.17763.0 - 10.0.17763.0 - Meadow.Maui - true - Wilderness Labs, Inc - Wilderness Labs, Inc - http://developer.wildernesslabs.co/Meadow/Meadow.Core/ - Meadow.Maui - icon.png - https://github.com/WildernessLabs/Meadow.Core - Meadow,Meadow.Maui,MAUI - 0.9.54 - true - Utility library for aiding in using Wilderness Labs' Meadow stack in a MAUI application - - - - - - - + $(TargetFrameworks);net7.0-windows10.0.19041 + true + true + enable + false + 10.0.17763.0 + 10.0.17763.0 + Meadow.Maui + true + Wilderness Labs, Inc + Wilderness Labs, Inc + http://developer.wildernesslabs.co/Meadow/Meadow.Core/ + Meadow.Maui + icon.png + https://github.com/WildernessLabs/Meadow.Core + Meadow,Meadow.Maui,MAUI + 0.9.54 + true + Utility library for aiding in using Wilderness Labs' Meadow stack in a MAUI application + + + + +