diff --git a/.github/workflows/develop-ci.yml b/.github/workflows/develop-ci.yml index 9ea271b..6c09552 100644 --- a/.github/workflows/develop-ci.yml +++ b/.github/workflows/develop-ci.yml @@ -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 @@ -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 diff --git a/.github/workflows/main-ci.yml b/.github/workflows/main-ci.yml deleted file mode 100644 index 6343f5f..0000000 --- a/.github/workflows/main-ci.yml +++ /dev/null @@ -1,47 +0,0 @@ -name: Main Build - -on: - workflow_dispatch: - pull_request: - branches: [ main ] - push: - branches: [ main ] - -jobs: - build: - - runs-on: windows-latest - - steps: - - - name: Checkout Clima - uses: actions/checkout@v3 - with: - path: Clima - - - name: Setup .NET - uses: actions/setup-dotnet@v2 - with: - dotnet-version: - 6.x - - - name: Install Java SDK - uses: actions/setup-java@v2 - with: - distribution: 'adopt' - java-version: '11' - - - 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/.github/workflows/nuget.yml b/.github/workflows/nuget.yml deleted file mode 100644 index f4ec844..0000000 --- a/.github/workflows/nuget.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: NuGet Package Creation - -on: - push: - tags: - - "v[0-9]+.[0-9]+.[0-9]" -jobs: - build: - runs-on: ubuntu-latest - timeout-minutes: 15 - steps: - - name: Checkout - uses: actions/checkout@v3 - - name: Set VERSION variable from tag - run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV - - name: Build - run: dotnet build -c Release ./Source/Clima/Meadow.Clima.csproj /p:Version=${VERSION} - - name: Pack - run: dotnet pack -c Release ./Source/Clima/Meadow.Clima.csproj /p:Version=${VERSION} --output . - - name: Push - run: dotnet nuget push Meadow.Clima.${VERSION}.nupkg -s https://api.nuget.org/v3/index.json -k ${NUGET_TOKEN} - env: - NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }} diff --git a/Source/Clima_Demo/wifi.config.yaml b/Source/Clima_Demo/wifi.config.yaml index 1687721..792f9f5 100644 --- a/Source/Clima_Demo/wifi.config.yaml +++ b/Source/Clima_Demo/wifi.config.yaml @@ -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 diff --git a/Source/Directory.Packages.props b/Source/Directory.Packages.props index f16cfb1..fb2afc5 100644 --- a/Source/Directory.Packages.props +++ b/Source/Directory.Packages.props @@ -1,3 +1,45 @@ - - + + + + + + + + + true + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Meadow.Clima/Meadow.Clima.csproj b/Source/Meadow.Clima/Meadow.Clima.csproj index 5e0a6a6..abf289c 100644 --- a/Source/Meadow.Clima/Meadow.Clima.csproj +++ b/Source/Meadow.Clima/Meadow.Clima.csproj @@ -1,11 +1,10 @@ - + - 1.11.0 Wilderness Labs, Inc Wilderness Labs, Inc true Apache-2.0 - 10.0 + 12 enable icon.png netstandard2.1 diff --git a/Source/Meadow.Packages.props b/Source/Meadow.Packages.props new file mode 100644 index 0000000..0686dbb --- /dev/null +++ b/Source/Meadow.Packages.props @@ -0,0 +1,266 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +