Skip to content

Commit

Permalink
Merge pull request #176 from wakatime/feature/nuget-update
Browse files Browse the repository at this point in the history 
Update nuget to 4.2.2
  • Loading branch information
@gandarez
gandarez authored Apr 27, 2024
2 parents a0188cc + cef83aa commit 7a73891
Show file tree
Hide file tree
Showing 6 changed files with 81 additions and 75 deletions.
140 changes: 70 additions & 70 deletions .github/workflows/on_push.yml
View file
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
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -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)
++++++++++++++++++

Expand Down

0 comments on commit 7a73891

Please sign in to comment.