From e3de337e2179371aba2fc42b38e43f77e6bb92a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Henrique=20Guard=C3=A3o=20Gandarez?= Date: Sat, 27 Apr 2024 14:16:24 -0300 Subject: [PATCH 1/2] Update wakatime nuget package to 4.2.2 --- Dev14/Dev14.csproj | 4 ++-- Dev14/packages.config | 2 +- Dev16/Dev16.csproj | 2 +- Dev17/Dev17.csproj | 2 +- HISTORY.rst | 6 ++++++ 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Dev14/Dev14.csproj b/Dev14/Dev14.csproj index f08cad1..2aaaa40 100644 --- a/Dev14/Dev14.csproj +++ b/Dev14/Dev14.csproj @@ -183,8 +183,8 @@ - - ..\packages\WakaTime.Shared.ExtensionUtils.4.2.1\lib\netstandard2.0\WakaTime.Shared.ExtensionUtils.dll + + ..\packages\WakaTime.Shared.ExtensionUtils.4.2.2\lib\netstandard2.0\WakaTime.Shared.ExtensionUtils.dll diff --git a/Dev14/packages.config b/Dev14/packages.config index 99eec37..d5a7cf2 100644 --- a/Dev14/packages.config +++ b/Dev14/packages.config @@ -19,5 +19,5 @@ - + \ No newline at end of file diff --git a/Dev16/Dev16.csproj b/Dev16/Dev16.csproj index 2c3ecde..b65a5ae 100644 --- a/Dev16/Dev16.csproj +++ b/Dev16/Dev16.csproj @@ -95,7 +95,7 @@ all - 4.2.1 + 4.2.2 diff --git a/Dev17/Dev17.csproj b/Dev17/Dev17.csproj index 5eb8364..df79a83 100644 --- a/Dev17/Dev17.csproj +++ b/Dev17/Dev17.csproj @@ -110,7 +110,7 @@ all - 4.2.1 + 4.2.2 diff --git a/HISTORY.rst b/HISTORY.rst index cfe8b2c..1c96da7 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,12 @@ History ------- +13.3.0 (2024-04-27) +++++++++++++++++++ + +- Update WakaTime.Shared.ExtensionUtils dependency to v4.2.2. + + 13.2.0 (2023-10-26) ++++++++++++++++++ From cef83aa35ae97540ae4a927fbd823a32e8b9b3c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Henrique=20Guard=C3=A3o=20Gandarez?= Date: Sat, 27 Apr 2024 14:16:38 -0300 Subject: [PATCH 2/2] Make pipeline to deploy dev16 and dev17 --- .github/workflows/on_push.yml | 140 +++++++++++++++++----------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/.github/workflows/on_push.yml b/.github/workflows/on_push.yml index fef694a..26c99a7 100644 --- a/.github/workflows/on_push.yml +++ b/.github/workflows/on_push.yml @@ -50,53 +50,53 @@ jobs: sha: context.sha }) - # build-dev16: - # name: Build Dev16 - # runs-on: windows-2019 - # needs: [version] - # steps: - # - - # name: Checkout - # uses: actions/checkout@v4 - # - - # name: Setup MSBuild - # uses: microsoft/setup-msbuild@v1 - # - - # name: Setup NuGet - # uses: NuGet/setup-nuget@v1 - # - - # name: Restore NuGet packages - # run: nuget restore ./Dev16/Dev16.csproj -PackagesDirectory ./packages -NonInteractive - # - - # name: Update version - # run: | - # (Get-Content -Path Dev16\source.extension.vsixmanifest) | - # ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} | - # Set-Content -Path Dev16\source.extension.vsixmanifest - # (Get-Content -Path Dev16\Properties\AssemblyInfo.cs) | - # ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} | - # Set-Content -Path Dev16\Properties\AssemblyInfo.cs - # - - # name: Build Dev16 for Release - # run: msbuild Dev16/Dev16.csproj -property:Configuration=Release -property:platform="AnyCPU" -property:DeployExtension=false - # - - # name: Upload artifacts - # uses: actions/upload-artifact@v4 - # with: - # name: WakaTime.Dev16.vsix - # path: Dev16/bin/Release/WakaTime.Dev16.vsix - # - - # name: Remove tag if failure - # if: ${{ failure() }} - # uses: actions/github-script@v7 - # with: - # github-token: ${{ github.token }} - # script: | - # github.rest.git.deleteRef({ - # owner: context.repo.owner, - # repo: context.repo.repo, - # ref: "tags/${{ needs.version.outputs.semver }}" - # }) + build-dev16: + name: Build Dev16 + runs-on: windows-2019 + needs: [version] + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Setup MSBuild + uses: microsoft/setup-msbuild@v1 + - + name: Setup NuGet + uses: NuGet/setup-nuget@v1 + - + name: Restore NuGet packages + run: nuget restore ./Dev16/Dev16.csproj -PackagesDirectory ./packages -NonInteractive + - + name: Update version + run: | + (Get-Content -Path Dev16\source.extension.vsixmanifest) | + ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} | + Set-Content -Path Dev16\source.extension.vsixmanifest + (Get-Content -Path Dev16\Properties\AssemblyInfo.cs) | + ForEach-Object {$_ -Replace '1.0.0', '${{ needs.version.outputs.semver }}'} | + Set-Content -Path Dev16\Properties\AssemblyInfo.cs + - + name: Build Dev16 for Release + run: msbuild Dev16/Dev16.csproj -property:Configuration=Release -property:platform="AnyCPU" -property:DeployExtension=false + - + name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: WakaTime.Dev16.vsix + path: Dev16/bin/Release/WakaTime.Dev16.vsix + - + name: Remove tag if failure + if: ${{ failure() }} + uses: actions/github-script@v7 + with: + github-token: ${{ github.token }} + script: | + github.rest.git.deleteRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: "tags/${{ needs.version.outputs.semver }}" + }) build-dev17: name: Build Dev17 @@ -146,32 +146,32 @@ jobs: ref: "tags/${{ needs.version.outputs.semver }}" }) - # publish-dev16: - # name: Publish Dev16 - # runs-on: windows-latest - # needs: [build-dev16, build-dev17] # set dependencies for both build steps to ensure both ran correctly and didn't delete the tag in case of failure - # steps: - # - - # name: Checkout - # uses: actions/checkout@v4 - # - - # name: Download artifacts - # uses: actions/download-artifact@v4 - # with: - # pattern: "*.Dev16.vsix" - # path: build/ - # - - # name: Publish Dev16 to Marketplace - # uses: cezarypiatek/VsixPublisherAction@1.1 - # with: - # extension-file: ${{ github.workspace }}\build\WakaTime.Dev16.vsix\WakaTime.Dev16.vsix - # publish-manifest-file: Dev16\publishManifest.json - # personal-access-code: ${{ secrets.VS_PUBLISHER_ACCESS_TOKEN }} + publish-dev16: + name: Publish Dev16 + runs-on: windows-latest + needs: [build-dev16, build-dev17] # set dependencies for both build steps to ensure both ran correctly and didn't delete the tag in case of failure + steps: + - + name: Checkout + uses: actions/checkout@v4 + - + name: Download artifacts + uses: actions/download-artifact@v4 + with: + pattern: "*.Dev16.vsix" + path: build/ + - + name: Publish Dev16 to Marketplace + uses: cezarypiatek/VsixPublisherAction@1.1 + with: + extension-file: ${{ github.workspace }}\build\WakaTime.Dev16.vsix\WakaTime.Dev16.vsix + publish-manifest-file: Dev16\publishManifest.json + personal-access-code: ${{ secrets.VS_PUBLISHER_ACCESS_TOKEN }} publish-dev17: name: Publish Dev17 runs-on: windows-latest - needs: [build-dev17] # set dependencies for both build steps to ensure both ran correctly and didn't delete the tag in case of failure + needs: [build-dev16, build-dev17] # set dependencies for both build steps to ensure both ran correctly and didn't delete the tag in case of failure steps: - name: Checkout @@ -193,7 +193,7 @@ jobs: release: name: Release runs-on: ubuntu-latest - needs: [version, publish-dev17] + needs: [version, publish-dev16, publish-dev17] steps: - name: Checkout