Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump v1 to protocol 8 #478

Merged
merged 3 commits into from
Feb 16, 2024
Merged

Bump v1 to protocol 8 #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d668c12
Bump to protocol 8
CartBlanche Feb 16, 2024
393f6d9
Make sure OS is also 2.0
CartBlanche Feb 16, 2024
17d60fb
make v1 CLI v1.9.0
CartBlanche Feb 16, 2024
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
23 changes: 12 additions & 11 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 '<PackageVersion>.*</PackageVersion>', '<PackageVersion>${{ ENV.CLI_RELEASE_VERSION }}</PackageVersion>'
$newcontent = $content -replace '<PackageVersion>.*</PackageVersion>', '<PackageVersion>${{ ENV.CLI_RELEASE_VERSION_1 }}</PackageVersion>'
$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 '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION }}</Version>'
$newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION_1 }}</Version>'
$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 '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION }}</Version>'
$newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION_1 }}</Version>'
$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 '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION }}</Version>'
$newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION_1 }}</Version>'
$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
Expand All @@ -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
Expand All @@ -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' }}
Expand All @@ -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' }}
Expand Down
6 changes: 3 additions & 3 deletions Meadow.CLI.Core/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>1.5.0.0</Version>
adrianstevens marked this conversation as resolved.
Show resolved Hide resolved
<Version>1.9.0.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI.Core/Meadow.CLI.Core.Classic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>1.5.0.0</Version>
<Version>1.9.0.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>1.5.0.0</Version>
<Version>1.9.0.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI.Core/Meadow.CLI.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>1.5.0.0</Version>
<Version>1.9.0.0</Version>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI/Meadow.CLI.Classic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Authors>Peter Moody, Adrian Stevens, Brian Kim, Pete Garafano, Dominique Louis</Authors>
<Company>Wilderness Labs, Inc</Company>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageVersion>1.5.0.0</PackageVersion>
<PackageVersion>1.9.0.0</PackageVersion>
<Platforms>AnyCPU</Platforms>
<PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/</PackageProjectUrl>
<PackageIcon>icon.png</PackageIcon>
Expand Down
2 changes: 1 addition & 1 deletion Meadow.CLI/Meadow.CLI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Authors>Peter Moody, Adrian Stevens, Brian Kim, Pete Garafano, Dominique Louis</Authors>
<Company>Wilderness Labs, Inc</Company>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageVersion>1.5.0.0</PackageVersion>
<PackageVersion>1.9.0.0</PackageVersion>
<Platforms>AnyCPU</Platforms>
<PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/</PackageProjectUrl>
<PackageIcon>icon.png</PackageIcon>
Expand Down
Loading