From ab9c5b37c7d9fffea32826eab9a11bf302b5df14 Mon Sep 17 00:00:00 2001 From: Dominique Louis Date: Wed, 26 Jul 2023 13:31:38 +0100 Subject: [PATCH] Bump to 1.2.0.0 --- .github/workflows/dotnet.yml | 52 +++++++++---------- Meadow.CLI.Core/Constants.cs | 2 +- Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj | 2 +- Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj | 2 +- Meadow.CLI.Core/Meadow.CLI.Core.csproj | 2 +- Meadow.CLI/Meadow.CLI.csproj | 2 +- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 149d3d14..f4971fa5 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,8 +1,8 @@ name: Meadow.CLI env: - TOOLS_RELEASE_VERSION: 1.1.1.0 - SHORT_TOOLS_RELEASE_VERSION: 1.1.1 - MEADOW_OS_VERSION: 1.1.0.0 + CLI_RELEASE_VERSION: 1.2.0.0 + IDE_TOOLS_RELEASE_VERSION: 1.2.0 + MEADOW_OS_VERSION: 1.2.0.0 VS_MAC_2019_VERSION: 8.10 VS_MAC_2022_VERSION: 17.5 @@ -12,7 +12,7 @@ on: pull_request: branches: [ main, develop ] - # Allows you to run this workflow manually from the Actions tab +# Allows you to run this workflow manually from the Actions tab workflow_dispatch: jobs: @@ -40,23 +40,23 @@ jobs: name: Update CLI Version Numbers run: | $content = Get-Content main/Meadow.CLI/Meadow.CLI.csproj | Out-String - $newcontent = $content -replace '.*', '${{ ENV.TOOLS_RELEASE_VERSION }}' + $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_VERSION }}' $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.TOOLS_RELEASE_VERSION }}' + $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_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 '.*', '${{ ENV.TOOLS_RELEASE_VERSION }}' + $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_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 '.*', '${{ ENV.TOOLS_RELEASE_VERSION }}' + $newcontent = $content -replace '.*', '${{ ENV.CLI_RELEASE_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.TOOLS_RELEASE_VERSION }}";' + $newcontent = $content -replace 'CLI_VERSION = \".*\";', 'CLI_VERSION = "${{ ENV.CLI_RELEASE_VERSION }}";' $newcontent | Set-Content main/Meadow.CLI.Core/Constants.cs - name: Add MSBuild to Path @@ -71,7 +71,7 @@ jobs: - name: Upload nuget Artifacts for internal testing uses: actions/upload-artifact@v2 with: - name: Meadow.CLI.nuget.${{ ENV.TOOLS_RELEASE_VERSION }} + name: Meadow.CLI.nuget.${{ ENV.CLI_RELEASE_VERSION }} path: 'main\Meadow.CLI\bin\Release\*.nupkg' - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} @@ -124,7 +124,7 @@ jobs: name: Update VS2019 Version Numbers run: | $content = Get-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2019/source.extension.vsixmanifest | Out-String - $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"' + $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.IDE_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"' $newcontent | Set-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2019/source.extension.vsixmanifest - name: Restore VS2019 dependencies @@ -139,7 +139,7 @@ jobs: - name: Upload VS2019 VSIX Artifacts uses: actions/upload-artifact@v2 with: - name: Meadow.Win.VS2019.vsix.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} + name: Meadow.Win.VS2019.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }} path: 'vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\*.vsix' #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} @@ -193,7 +193,7 @@ jobs: name: Update VS2022 Version Numbers run: | $content = Get-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2022/source.extension.vsixmanifest | Out-String - $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"' + $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.IDE_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"' $newcontent | Set-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2022/source.extension.vsixmanifest - name: Restore VS2022 dependencies @@ -207,7 +207,7 @@ jobs: - name: Upload VS2022 VSIX Artifacts uses: actions/upload-artifact@v2 with: - name: Meadow.Win.VS2022.vsix.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} + name: Meadow.Win.VS2022.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }} path: 'vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2022\bin\Release\*.vsix' - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} @@ -266,7 +266,7 @@ jobs: - if: ${{ github.event_name == 'workflow_dispatch' }} name: Update VS2019 Version Numbers run: | - sed -i "" "s/Version = \"1.*\"/Version = \"${{ENV.SHORT_TOOLS_RELEASE_VERSION}}\"/" vs-mac/VS4Mac_Meadow_Extension/Properties/AddinInfo.cs + sed -i "" "s/Version = \"1.*\"/Version = \"${{ENV.IDE_TOOLS_RELEASE_VERSION}}\"/" vs-mac/VS4Mac_Meadow_Extension/Properties/AddinInfo.cs - name: Restore our VS2019 project run: | @@ -279,7 +279,7 @@ jobs: - name: Upload Mac VS2019 mpack Artifacts uses: actions/upload-artifact@v2 with: - name: Meadow.Mac.2019.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} + name: Meadow.Mac.2019.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }} path: 'vs-mac/VS4Mac_Meadow_Extension/bin/Release/net472/*.mpack' #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} @@ -316,8 +316,8 @@ jobs: # with: # owner: WildernessLabs # repo: VS_Mac_Meadow_Extension - # tag_name: v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2019_VERSION }} - # release_name: VS Mac VS2019 Extension v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }} + # tag_name: v${{ ENV.IDE_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2019_VERSION }} + # release_name: VS Mac VS2019 Extension v${{ ENV.IDE_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }} # body: | # ${{ steps.commit_messages.outputs.result }} # draft: true @@ -332,7 +332,7 @@ jobs: # with: # upload_url: ${{ steps.create_release.outputs.upload_url }} # asset_path: vs-mac/VS4Mac_Meadow_Extension/bin/Release/net472/*.mpack - # asset_name: Meadow.Mac.2019.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} + # asset_name: Meadow.Mac.2019.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }} # asset_content_type: application/zip build-vsmac-2022: @@ -374,7 +374,7 @@ jobs: - if: ${{ github.event_name == 'workflow_dispatch' }} name: Update VS2022 Version Numbers run: | - sed -i "" "s/Version = \"1.*\"/Version = \"${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}\"/" vs-mac/VS4Mac_Meadow_Extension/Properties/AddinInfo.2022.cs + sed -i "" "s/Version = \"1.*\"/Version = \"${{ ENV.IDE_TOOLS_RELEASE_VERSION }}\"/" vs-mac/VS4Mac_Meadow_Extension/Properties/AddinInfo.2022.cs - name: Restore our VS2022 project run: | @@ -387,7 +387,7 @@ jobs: - name: Upload VS2022 mpack Artifacts uses: actions/upload-artifact@v2 with: - name: Meadow.Mac.2022.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} + name: Meadow.Mac.2022.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }} path: 'vs-mac/VS4Mac_Meadow_Extension/bin/Release/net7.0/*.mpack' - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} @@ -424,8 +424,8 @@ jobs: with: owner: WildernessLabs repo: VS_Mac_Meadow_Extension - tag_name: v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2022_VERSION }} - release_name: VS Mac VS2022 Extension v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }} + tag_name: v${{ ENV.IDE_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2022_VERSION }} + release_name: VS Mac VS2022 Extension v${{ ENV.IDE_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }} body: | ${{ steps.commit_messages.outputs.result }} draft: true @@ -440,7 +440,7 @@ jobs: # with: # upload_url: ${{ steps.create_release.outputs.upload_url }} # asset_path: vs-mac/VS4Mac_Meadow_Extension/bin/Release/net7.0/*.mpack - # asset_name: Meadow.Mac.2022.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} + # asset_name: Meadow.Mac.2022.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }} # asset_content_type: application/zip build-vscode: @@ -503,7 +503,7 @@ jobs: name: Update VSCode Version Numbers run: | $content = Get-Content vs-code/package.json | Out-String - $newcontent = $content -replace '"version": "1.*",', '"version": "${{ENV.SHORT_TOOLS_RELEASE_VERSION}}",' + $newcontent = $content -replace '"version": "1.*",', '"version": "${{ENV.IDE_TOOLS_RELEASE_VERSION}}",' $newcontent | Set-Content vs-code/package.json - name: Restore VSCode Extension dependencies @@ -535,7 +535,7 @@ jobs: - name: Upload VSIX Artifacts uses: actions/upload-artifact@v2 with: - name: Meadow.VSCode.vsix.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} + name: Meadow.VSCode.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }} path: 'vs-code/*.vsix' - 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 d915c772..9cb2e6ad 100644 --- a/Meadow.CLI.Core/Constants.cs +++ b/Meadow.CLI.Core/Constants.cs @@ -7,7 +7,7 @@ namespace Meadow.CLI.Core { public static class Constants { - public const string CLI_VERSION = "1.1.1.0"; + public const string CLI_VERSION = "1.2.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 WILDERNESS_LABS_USB_VID = "2E6A"; 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 94afe5a5..c063a2ec 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.1.1.0 + 1.2.0.0 diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj index 73333065..3912ddb2 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.1.1.0 + 1.2.0.0 diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.csproj index 6fdaf73c..1cba4598 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.1.1.0 + 1.2.0.0 diff --git a/Meadow.CLI/Meadow.CLI.csproj b/Meadow.CLI/Meadow.CLI.csproj index 384ed4ff..0f1faa51 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.1.1.0 + 1.2.0.0 AnyCPU http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/ icon.png