diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a23a2e3..82ab912f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -230,7 +230,9 @@ jobs: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} VERSION: ${{ steps.version.outputs.VERSION }} run: | - dotnet tool install -g vpk + # Pin vpk to the Velopack library version (keep in sync with the Velopack + # PackageReference in Dashboard.csproj / PerformanceMonitorLite.csproj). + dotnet tool install -g vpk --version 1.2.0 New-Item -ItemType Directory -Force -Path releases/velopack-dashboard New-Item -ItemType Directory -Force -Path releases/velopack-lite diff --git a/Dashboard/Dashboard.csproj b/Dashboard/Dashboard.csproj index 8e2fa874..96c27d2c 100644 --- a/Dashboard/Dashboard.csproj +++ b/Dashboard/Dashboard.csproj @@ -50,7 +50,7 @@ - + diff --git a/Dashboard/packages.lock.json b/Dashboard/packages.lock.json index 125c4e35..40e26762 100644 --- a/Dashboard/packages.lock.json +++ b/Dashboard/packages.lock.json @@ -130,12 +130,9 @@ }, "Velopack": { "type": "Direct", - "requested": "[0.0.1298, )", - "resolved": "0.0.1298", - "contentHash": "PJ6Nm28qJ4ChsHYzgHUJ8g+DGyyHes2+bwxY709+znMhgi8fMp8M1FTF8x6pZMjnsPCWVwoMlxVEyq0NLeRZtA==", - "dependencies": { - "NuGet.Versioning": "6.14.0" - } + "requested": "[1.2.0, )", + "resolved": "1.2.0", + "contentHash": "Rz67gJL619fSBS6omaSINUxyDuwhIxkm5mmubf7uLd5Qgi6LLKaKCha+QFP6n+Bw/UjA0vutnH4JQfYzn6ANtw==" }, "Azure.Core": { "type": "Transitive", @@ -542,11 +539,6 @@ "Microsoft.Extensions.Logging.Abstractions": "10.0.7" } }, - "NuGet.Versioning": { - "type": "Transitive", - "resolved": "6.14.0", - "contentHash": "4v4blkhCv8mpKtfx+z0G/X0daVCzdIaHSC51GkUspugi5JIMn2Bo8xm5PdZYF0U68gOBfz/+aPWMnpRd85Jbow==" - }, "OpenTK": { "type": "Transitive", "resolved": "4.9.4", diff --git a/Lite.Tests/packages.lock.json b/Lite.Tests/packages.lock.json index 0274c2a0..7dcef2a1 100644 --- a/Lite.Tests/packages.lock.json +++ b/Lite.Tests/packages.lock.json @@ -619,11 +619,6 @@ "resolved": "13.0.3", "contentHash": "HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==" }, - "NuGet.Versioning": { - "type": "Transitive", - "resolved": "6.14.0", - "contentHash": "4v4blkhCv8mpKtfx+z0G/X0daVCzdIaHSC51GkUspugi5JIMn2Bo8xm5PdZYF0U68gOBfz/+aPWMnpRd85Jbow==" - }, "OpenTK": { "type": "Transitive", "resolved": "4.9.4", @@ -821,11 +816,8 @@ }, "Velopack": { "type": "Transitive", - "resolved": "0.0.1298", - "contentHash": "PJ6Nm28qJ4ChsHYzgHUJ8g+DGyyHes2+bwxY709+znMhgi8fMp8M1FTF8x6pZMjnsPCWVwoMlxVEyq0NLeRZtA==", - "dependencies": { - "NuGet.Versioning": "6.14.0" - } + "resolved": "1.2.0", + "contentHash": "Rz67gJL619fSBS6omaSINUxyDuwhIxkm5mmubf7uLd5Qgi6LLKaKCha+QFP6n+Bw/UjA0vutnH4JQfYzn6ANtw==" }, "xunit.analyzers": { "type": "Transitive", @@ -938,7 +930,7 @@ "PerformanceMonitor.PlanAnalysis": "[1.0.0, )", "PerformanceMonitor.Ui": "[1.0.0, )", "ScottPlot.WPF": "[5.1.58, )", - "Velopack": "[0.0.1298, )" + "Velopack": "[1.2.0, )" } } } diff --git a/Lite/PerformanceMonitorLite.csproj b/Lite/PerformanceMonitorLite.csproj index 7b2d4062..d807e43f 100644 --- a/Lite/PerformanceMonitorLite.csproj +++ b/Lite/PerformanceMonitorLite.csproj @@ -73,7 +73,7 @@ - + diff --git a/Lite/packages.lock.json b/Lite/packages.lock.json index 04356eaf..0bb0e033 100644 --- a/Lite/packages.lock.json +++ b/Lite/packages.lock.json @@ -134,12 +134,9 @@ }, "Velopack": { "type": "Direct", - "requested": "[0.0.1298, )", - "resolved": "0.0.1298", - "contentHash": "PJ6Nm28qJ4ChsHYzgHUJ8g+DGyyHes2+bwxY709+znMhgi8fMp8M1FTF8x6pZMjnsPCWVwoMlxVEyq0NLeRZtA==", - "dependencies": { - "NuGet.Versioning": "6.14.0" - } + "requested": "[1.2.0, )", + "resolved": "1.2.0", + "contentHash": "Rz67gJL619fSBS6omaSINUxyDuwhIxkm5mmubf7uLd5Qgi6LLKaKCha+QFP6n+Bw/UjA0vutnH4JQfYzn6ANtw==" }, "Azure.Core": { "type": "Transitive", @@ -561,11 +558,6 @@ "Microsoft.Extensions.Logging.Abstractions": "10.0.7" } }, - "NuGet.Versioning": { - "type": "Transitive", - "resolved": "6.14.0", - "contentHash": "4v4blkhCv8mpKtfx+z0G/X0daVCzdIaHSC51GkUspugi5JIMn2Bo8xm5PdZYF0U68gOBfz/+aPWMnpRd85Jbow==" - }, "OpenTK": { "type": "Transitive", "resolved": "4.9.4",