From 7da36e038fa33a376ad6c776cad2b6161d2b9ac9 Mon Sep 17 00:00:00 2001 From: Dominique Louis Date: Tue, 18 Jul 2023 14:43:01 +0100 Subject: [PATCH] Bump version to 1.1.1.0 and comment out VS2019 releases. --- .github/workflows/dotnet.yml | 94 +++++++++---------- 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 +- Meadow.Tools.code-workspace | 3 + 7 files changed, 55 insertions(+), 52 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index cf901f5f..149d3d14 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,7 +1,7 @@ name: Meadow.CLI env: - TOOLS_RELEASE_VERSION: 1.1.0.0 - SHORT_TOOLS_RELEASE_VERSION: 1.1.0 + TOOLS_RELEASE_VERSION: 1.1.1.0 + SHORT_TOOLS_RELEASE_VERSION: 1.1.1 MEADOW_OS_VERSION: 1.1.0.0 VS_MAC_2019_VERSION: 8.10 VS_MAC_2022_VERSION: 17.5 @@ -142,10 +142,10 @@ jobs: name: Meadow.Win.VS2019.vsix.${{ ENV.SHORT_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' }} - name: Publish VS2019 Extension - run: | - & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe" publish -payload "vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\Meadow.2019.vsix" -publishManifest "vs-win\publishManifest.json" -ignoreWarnings "VSIXValidatorWarning01,VSIXValidatorWarning02" -personalAccessToken "${{secrets.MARKETPLACE_PUBLISH_PAT}}" + #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} + # name: Publish VS2019 Extension + # run: | + # & "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\Enterprise\VSSDK\VisualStudioIntegration\Tools\Bin\VsixPublisher.exe" publish -payload "vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\Meadow.2019.vsix" -publishManifest "vs-win\publishManifest.json" -ignoreWarnings "VSIXValidatorWarning01,VSIXValidatorWarning02" -personalAccessToken "${{secrets.MARKETPLACE_PUBLISH_PAT}}" build-vswin-2022: runs-on: windows-2022 @@ -282,47 +282,47 @@ jobs: name: Meadow.Mac.2019.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} path: 'vs-mac/VS4Mac_Meadow_Extension/bin/Release/net472/*.mpack' - - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} - name: Get Commit Messages - id: commit_messages - uses: actions/github-script@v6 - with: - github-token: ${{ secrets.MEADOW_MAC_TOKEN }} - script: | - const { owner, repo } = context.repo; - - const latestRelease = await github.rest.repos.getLatestRelease({ - owner: 'WildernessLabs', - repo: 'VS_Mac_Meadow_Extension', - }); - - const commits = await github.rest.repos.listCommits({ - owner: 'WildernessLabs', - repo: 'VS_Mac_Meadow_Extension', - since: latestRelease.created_at - }); - - const messages = commits.data.map(commit => `* ${commit.commit.message}`).join(' \n'); - const formattedMessages = `## What's Changed \n${messages}`; - - return formattedMessages; - - - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} - name: Create VS2019 Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.MEADOW_MAC_TOKEN }} - 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 }} - body: | - ${{ steps.commit_messages.outputs.result }} - draft: true - prerelease: false - commitish: main + #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} + # name: Get Commit Messages + # id: commit_messages + # uses: actions/github-script@v6 + # with: + # github-token: ${{ secrets.MEADOW_MAC_TOKEN }} + # script: | + # const { owner, repo } = context.repo; + + # const latestRelease = await github.rest.repos.getLatestRelease({ + # owner: 'WildernessLabs', + # repo: 'VS_Mac_Meadow_Extension', + # }); + + # const commits = await github.rest.repos.listCommits({ + # owner: 'WildernessLabs', + # repo: 'VS_Mac_Meadow_Extension', + # since: latestRelease.created_at + # }); + + # const messages = commits.data.map(commit => `* ${commit.commit.message}`).join(' \n'); + # const formattedMessages = `## What's Changed \n${messages}`; + + # return formattedMessages; + + #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} + # name: Create VS2019 Release + # id: create_release + # uses: actions/create-release@v1 + # env: + # GITHUB_TOKEN: ${{ secrets.MEADOW_MAC_TOKEN }} + # 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 }} + # body: | + # ${{ steps.commit_messages.outputs.result }} + # draft: true + # prerelease: false + # commitish: main # - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }} #- name: Upload Release Asset diff --git a/Meadow.CLI.Core/Constants.cs b/Meadow.CLI.Core/Constants.cs index 41528b5e..d06a25ad 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.0.0"; + public const string CLI_VERSION = "1.1.1.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 a8d7488f..94afe5a5 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.0.0 + 1.1.1.0 diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj index 0efdc30f..73333065 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.0.0 + 1.1.1.0 diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.csproj index ec39d8ae..6fdaf73c 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.0.0 + 1.1.1.0 diff --git a/Meadow.CLI/Meadow.CLI.csproj b/Meadow.CLI/Meadow.CLI.csproj index 6b80b3d5..384ed4ff 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.0.0 + 1.1.1.0 AnyCPU http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/ icon.png diff --git a/Meadow.Tools.code-workspace b/Meadow.Tools.code-workspace index fbf2a31d..758ea169 100644 --- a/Meadow.Tools.code-workspace +++ b/Meadow.Tools.code-workspace @@ -11,6 +11,9 @@ }, { "path": "../VSCode_Meadow_Extension" + }, + { + "path": "../Meadow.Sdk" } ], } \ No newline at end of file