Skip to content

Commit 503484c

Browse files
committed
Moved install of NuGet to a separate script.
1 parent 2ef8a6a commit 503484c

File tree

5 files changed

+34
-5
lines changed

5 files changed

+34
-5
lines changed

.github/workflows/main.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@ jobs:
235235
run: ./install.dependencies.cmd
236236
working-directory: build/windows
237237

238+
- name: Install NuGet
239+
run: ./install.nuget.cmd
240+
working-directory: build/windows
241+
238242
- name: Create nuget.config
239243
run: ./create-nuget-config.cmd "dlemstra" "${{ secrets.GITHUB_TOKEN }}"
240244
working-directory: src/Magick.Native
@@ -288,6 +292,10 @@ jobs:
288292
run: ./install.dependencies.cmd
289293
working-directory: build/windows
290294

295+
- name: Install NuGet
296+
run: ./install.nuget.cmd
297+
working-directory: build/windows
298+
291299
- name: Create nuget.config
292300
run: ./create-nuget-config.cmd "dlemstra" "${{ secrets.GITHUB_TOKEN }}"
293301
working-directory: src/Magick.Native
@@ -339,6 +347,10 @@ jobs:
339347
run: ./install.dependencies.cmd
340348
working-directory: build/windows
341349

350+
- name: Install NuGet
351+
run: ./install.nuget.cmd
352+
working-directory: build/windows
353+
342354
- name: Create nuget.config
343355
run: ./create-nuget-config.cmd "dlemstra" "${{ secrets.GITHUB_TOKEN }}"
344356
working-directory: src/Magick.Native
@@ -386,6 +398,10 @@ jobs:
386398
with:
387399
persist-credentials: false
388400

401+
- name: Install NuGet
402+
run: ./install.nuget.cmd
403+
working-directory: build/windows
404+
389405
- name: Download artifacts
390406
uses: actions/download-artifact@v6
391407
with:

Magick.NET.sln

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "windows", "windows", "{C72A
104104
build\windows\build.Magick.NET.ps1 = build\windows\build.Magick.NET.ps1
105105
build\windows\install.dependencies.cmd = build\windows\install.dependencies.cmd
106106
build\windows\install.dependencies.ps1 = build\windows\install.dependencies.ps1
107+
build\windows\install.nuget.cmd = build\windows\install.nuget.cmd
108+
build\windows\install.nuget.ps1 = build\windows\install.nuget.ps1
107109
build\windows\test.Magick.NET.cmd = build\windows\test.Magick.NET.cmd
108110
build\windows\print.publickey.py = build\windows\print.publickey.py
109111
build\windows\test.Magick.NET.ps1 = build\windows\test.Magick.NET.ps1

build/windows/install.dependencies.ps1

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
# Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
22
# Licensed under the Apache License, Version 2.0.
33

4-
Write-Host "Downloading NuGet"
5-
$sourceNugetExe = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
6-
$targetNugetExe = "$PSScriptRoot\..\..\tools\windows\nuget.exe"
7-
Invoke-WebRequest $sourceNugetExe -OutFile $targetNugetExe
8-
94
Write-Host "Downloading Ghostscript 10.00.0"
105
$sourceGhostscriptExe = "https://github.com/dlemstra/Magick.NET.BuildDependencies/releases/download/build-binaries-2025-08-30/gs1000w32.exe"
116
$targetGhostscriptExe = "$PSScriptRoot\..\..\tools\windows\gs1000w32.exe"

build/windows/install.nuget.cmd

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@echo off
2+
3+
powershell .\install.nuget.ps1
4+
if %errorlevel% == 0 goto done
5+
6+
echo Failed to install nuget
7+
exit /b %errorlevel%
8+
9+
:done

build/windows/install.nuget.ps1

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Copyright Dirk Lemstra https://github.com/dlemstra/Magick.NET.
2+
# Licensed under the Apache License, Version 2.0.
3+
4+
Write-Host "Downloading NuGet"
5+
$sourceNugetExe = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
6+
$targetNugetExe = "$PSScriptRoot\..\..\tools\windows\nuget.exe"
7+
Invoke-WebRequest $sourceNugetExe -OutFile $targetNugetExe

0 commit comments

Comments
 (0)