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

Update nuget to 4.2.2 #176

Merged
merged 2 commits into from
Apr 27, 2024
+81 −75
Merged

Update nuget to 4.2.2 #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3de337
Update wakatime nuget package to 4.2.2
gandarez Apr 27, 2024
cef83aa
Make pipeline to deploy dev16 and dev17
gandarez Apr 27, 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
140 changes: 70 additions & 70 deletions .github/workflows/on_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dev14/Dev14.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="WakaTime.Shared.ExtensionUtils, Version=4.2.1.0, Culture=neutral, PublicKeyToken=202d1174b8524eea, processorArchitecture=MSIL">
<HintPath>..\packages\WakaTime.Shared.ExtensionUtils.4.2.1\lib\netstandard2.0\WakaTime.Shared.ExtensionUtils.dll</HintPath>
<Reference Include="WakaTime.Shared.ExtensionUtils, Version=4.2.2.0, Culture=neutral, PublicKeyToken=202d1174b8524eea, processorArchitecture=MSIL">
<HintPath>..\packages\WakaTime.Shared.ExtensionUtils.4.2.2\lib\netstandard2.0\WakaTime.Shared.ExtensionUtils.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Dev14/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
<package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net48" />
<package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net48" />
<package id="Microsoft.VSSDK.BuildTools" version="14.3.25420" targetFramework="net48" developmentDependency="true" />
<package id="WakaTime.Shared.ExtensionUtils" version="4.2.1" targetFramework="net48" />
<package id="WakaTime.Shared.ExtensionUtils" version="4.2.2" targetFramework="net48" />
</packages>
2 changes: 1 addition & 1 deletion Dev16/Dev16.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="WakaTime.Shared.ExtensionUtils">
<Version>4.2.1</Version>
<Version>4.2.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Dev17/Dev17.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="WakaTime.Shared.ExtensionUtils">
<Version>4.2.1</Version>
<Version>4.2.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ History
-------


13.3.0 (2024-04-27)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The version released on marketplace doesn't match, it's at v13.6.0.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep will fix that when pipeline works. During tests with pipeline it has incremented each run.

++++++++++++++++++

- Update WakaTime.Shared.ExtensionUtils dependency to v4.2.2.


13.2.0 (2023-10-26)
++++++++++++++++++

Expand Down
Loading