Skip to content

Commit 182a950

Browse files
committed
Using VS2019
1 parent 846acd1 commit 182a950

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.github/workflows/rubberduck_demo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Rubberduck
22
on:
33
workflow_dispatch:
44
jobs:
5-
screenshot:
5+
build-rubberduck:
66
runs-on: windows-latest
77
steps:
88
- name: "Checkout"

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: ./
2222
with:
2323
sourceDir: "./tests"
24-
timeout-minutes: 15
24+
timeout-minutes: 30
2525
- name: "Display Chocolatey logs in case of Office install failure"
2626
if: failure() && steps.build_vba.outcome == 'failure'
2727
run: |

scripts/Install-Rubberduck-VBA.ps1

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -258,41 +258,41 @@ try {
258258
# Build the solution
259259
Write-Host "🦆 Building Rubberduck solution..."
260260

261-
# Download VS 2017 Build Tools installer
262-
$vsInstallerUrl = "https://aka.ms/vs/15/release/vs_buildtools.exe"
263-
$vsInstallerPath = Join-Path $env:TEMP "vs_buildtools.exe"
261+
# Download VS 2019 Build Tools installer
262+
$vsInstallerUrl = "https://aka.ms/vs/16/release/vs_buildtools.exe"
263+
$vsInstallerPath = Join-Path $env:TEMP "vs2019_buildtools.exe"
264264
Invoke-WebRequest -Uri $vsInstallerUrl -OutFile $vsInstallerPath
265265

266-
# Install VS 2017 Build Tools with necessary components
267-
Write-Host "Installing Visual Studio 2017 Build Tools..."
266+
# Install VS 2019 Build Tools with necessary components
267+
Write-Host "Installing Visual Studio 2019 Build Tools..."
268268

269269
# Using Start-Process with Wait for better process handling
270270
$vsInstallerArgs = @(
271271
"--quiet",
272272
"--wait",
273273
"--norestart",
274274
"--nocache",
275-
"--installPath", "C:\BuildTools",
275+
"--installPath", "C:\BuildTools2019",
276276
"--add", "Microsoft.VisualStudio.Workload.MSBuildTools",
277-
"--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
277+
"--add", "Microsoft.VisualStudio.Workload.NetCoreBuildTools",
278278
"--add", "Microsoft.Net.Component.4.6.2.TargetingPack",
279279
"--add", "Microsoft.Net.Component.4.6.2.SDK",
280280
"--add", "Microsoft.VisualStudio.Component.NuGet.BuildTools"
281281
)
282282

283283
$vsProcess = Start-Process -FilePath $vsInstallerPath -ArgumentList $vsInstallerArgs -PassThru -Wait -NoNewWindow
284284
if ($vsProcess.ExitCode -ne 0) {
285-
Write-Warning "VS2017 Build Tools installer exited with code $($vsProcess.ExitCode)"
285+
Write-Warning "VS2019 Build Tools installer exited with code $($vsProcess.ExitCode)"
286286
}
287287

288288
# Set MSBuild path directly to installation location
289-
$msbuildPath = "C:\BuildTools\MSBuild\15.0\Bin\MSBuild.exe"
289+
$msbuildPath = "C:\BuildTools2019\MSBuild\Current\Bin\MSBuild.exe"
290290

291291
# Verify installation
292292
if (Test-Path $msbuildPath) {
293-
Write-Host "✅ Visual Studio 2017 Build Tools installed successfully at C:\BuildTools"
293+
Write-Host "✅ Visual Studio 2019 Build Tools installed successfully at C:\BuildTools2019"
294294
} else {
295-
throw "Visual Studio 2017 Build Tools installation failed. MSBuild not found at $msbuildPath"
295+
throw "Visual Studio 2019 Build Tools installation failed. MSBuild not found at $msbuildPath"
296296
}
297297

298298
# Add the MSBuild path to the top system PATH environment variable
@@ -311,7 +311,7 @@ try {
311311
}
312312

313313
# Copy the binaries
314-
$binFolder = Join-Path (Get-Location) "Rubberduck.Core\bin\Debug\net462"
314+
$binFolder = Join-Path (Get-Location) "Rubberduck.Main\bin\Debug\net462"
315315
if (-not (Test-Path $binFolder)) {
316316
throw "Build output folder not found: $binFolder"
317317
}

0 commit comments

Comments
 (0)