diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 31b83240..a119f760 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,8 +1,9 @@ name: Meadow.CLI Packaging env: - CLI_RELEASE_VERSION: 1.5.0.0 - IDE_TOOLS_RELEASE_VERSION: 1.5.0 - MEADOW_OS_VERSION: 1.5.0.0 + CLI_RELEASE_VERSION_1: 1.9.0.0 + CLI_RELEASE_VERSION_2: 2.0.6.0 + IDE_TOOLS_RELEASE_VERSION: 1.9.0 + MEADOW_OS_VERSION: 2.0.0.0 VS_MAC_2019_VERSION: 8.10 VS_MAC_2022_VERSION: 17.6 @@ -57,23 +58,23 @@ jobs: name: Update CLI Version Numbers run: | $content = Get-Content main/Meadow.CLI/Meadow.CLI.csproj | Out-String - $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_VERSION }}' + $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_VERSION_1 }}' $newcontent | Set-Content main/Meadow.CLI/Meadow.CLI.csproj $content = Get-Content main/Meadow.CLI.Core/Meadow.CLI.Core.csproj | Out-String - $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_VERSION }}' + $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_VERSION_1 }}' $newcontent | Set-Content main/Meadow.CLI.Core/Meadow.CLI.Core.csproj $content = Get-Content main/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj | Out-String - $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_VERSION }}' + $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_VERSION_1 }}' $newcontent | Set-Content main/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj $content = Get-Content main/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj | Out-String - $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_VERSION }}' + $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_VERSION_1 }}' $newcontent | Set-Content main/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj $content = Get-Content main/Meadow.CLI.Core/Constants.cs | Out-String - $newcontent = $content -replace 'CLI_VERSION = \".*\";', 'CLI_VERSION = "${{ ENV.CLI_RELEASE_VERSION }}";' + $newcontent = $content -replace 'CLI_VERSION = \".*\";', 'CLI_VERSION = "${{ ENV.CLI_RELEASE_VERSION_1 }}";' $newcontent | Set-Content main/Meadow.CLI.Core/Constants.cs - name: Add MSBuild to Path @@ -88,7 +89,7 @@ jobs: - name: Upload nuget Artifacts for internal testing uses: actions/upload-artifact@v2 with: - name: Meadow.CLI.Classic.nuget.${{ ENV.CLI_RELEASE_VERSION }} + name: Meadow.CLI.Classic.nuget.${{ ENV.CLI_RELEASE_VERSION_1 }} path: 'main\Meadow.CLI.Classic\bin\Release\*.nupkg' - name: Restore normal dependencies @@ -100,7 +101,7 @@ jobs: - name: Upload nuget Artifacts for internal testing uses: actions/upload-artifact@v2 with: - name: Meadow.CLI.nuget.${{ ENV.CLI_RELEASE_VERSION }} + name: Meadow.CLI.nuget.${{ ENV.CLI_RELEASE_VERSION_1 }} path: 'main\Meadow.CLI\bin\Release\*.nupkg' - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} @@ -117,7 +118,7 @@ jobs: - name: Upload nuget Artifacts for internal testing uses: actions/upload-artifact@v2 with: - name: Meadow.CLI.V2.nuget.2.0.0 + name: Meadow.CLI.nuget.${{ ENV.CLI_RELEASE_VERSION_2 }} path: 'main\Source\v2\Meadow.CLI\bin\Release\*.nupkg' #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} diff --git a/Meadow.CLI.Core/Constants.cs b/Meadow.CLI.Core/Constants.cs index de655f1d..abf20e9f 100644 --- a/Meadow.CLI.Core/Constants.cs +++ b/Meadow.CLI.Core/Constants.cs @@ -7,9 +7,9 @@ namespace Meadow.CLI.Core { public static class Constants { - public const string CLI_VERSION = "1.5.0.0"; - public const ushort HCOM_PROTOCOL_PREVIOUS_VERSION_NUMBER = 0x0006; - public const ushort HCOM_PROTOCOL_CURRENT_VERSION_NUMBER = 0x0007; // Used for transmission + public const string CLI_VERSION = "1.9.0.0"; + public const ushort HCOM_PROTOCOL_PREVIOUS_VERSION_NUMBER = 0x0007; + public const ushort HCOM_PROTOCOL_CURRENT_VERSION_NUMBER = 0x0008; // Used for transmission public const string WILDERNESS_LABS_USB_VID = "2E6A"; public const string MEADOW_CLOUD_HOST_CONFIG_NAME = "meadowCloudHost"; } diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj index 0f7f45dd..2447a027 100644 --- a/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj +++ b/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj @@ -11,7 +11,7 @@ preview enable True - 1.5.0.0 + 1.9.0.0 diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.Classic.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.Classic.csproj index 144ac96f..380b9d11 100644 --- a/Meadow.CLI.Core/Meadow.CLI.Core.Classic.csproj +++ b/Meadow.CLI.Core/Meadow.CLI.Core.Classic.csproj @@ -11,7 +11,7 @@ preview enable True - 1.5.0.0 + 1.9.0.0 diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj index 10fed43f..ff7f82a6 100644 --- a/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj +++ b/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj @@ -11,7 +11,7 @@ preview enable True - 1.5.0.0 + 1.9.0.0 diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.csproj index 5ae6c32e..faa87196 100644 --- a/Meadow.CLI.Core/Meadow.CLI.Core.csproj +++ b/Meadow.CLI.Core/Meadow.CLI.Core.csproj @@ -11,7 +11,7 @@ preview enable True - 1.5.0.0 + 1.9.0.0 diff --git a/Meadow.CLI/Meadow.CLI.Classic.csproj b/Meadow.CLI/Meadow.CLI.Classic.csproj index 5815d5e1..263bd650 100644 --- a/Meadow.CLI/Meadow.CLI.Classic.csproj +++ b/Meadow.CLI/Meadow.CLI.Classic.csproj @@ -10,7 +10,7 @@ Peter Moody, Adrian Stevens, Brian Kim, Pete Garafano, Dominique Louis Wilderness Labs, Inc true - 1.5.0.0 + 1.9.0.0 AnyCPU http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/ icon.png diff --git a/Meadow.CLI/Meadow.CLI.csproj b/Meadow.CLI/Meadow.CLI.csproj index 8e33bd81..92d6c09e 100644 --- a/Meadow.CLI/Meadow.CLI.csproj +++ b/Meadow.CLI/Meadow.CLI.csproj @@ -10,7 +10,7 @@ Peter Moody, Adrian Stevens, Brian Kim, Pete Garafano, Dominique Louis Wilderness Labs, Inc true - 1.5.0.0 + 1.9.0.0 AnyCPU http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/ icon.png