Skip to content

Commit 7d26c94

Browse files
committed
Fixing Visual Studio 2019 build
1 parent 1781a9e commit 7d26c94

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

LuaInstaller.Core/VisualStudioVersionsFromSetupApi.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private VisualStudioVersion ProcessSetupInstance(ISetupInstance2 setupInstance)
2929
ISetupPackageReference packageReference = packageReferences[i];
3030
string id = packageReference.GetId();
3131

32-
if (id.Equals("Microsoft.VisualCpp.Tools.Common.Utils", StringComparison.InvariantCultureIgnoreCase))
32+
if (id.Equals("Microsoft.VisualCpp.DIA.SDK", StringComparison.InvariantCultureIgnoreCase))
3333
{
3434
Match match = _rgx.Match(setupInstance.GetInstallationVersion());
3535

appveyor.ps1

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
$dotnet_dir = Join-Path -Path (Get-Location) -ChildPath "dotnet_dir";
2+
3+
New-Item $dotnet_dir -ItemType Directory;
4+
25
$dotnet_install_file = Join-Path -Path $dotnet_dir -ChildPath "dotnet-install.ps1";
36
$dotnet_runner = Join-Path -Path $dotnet_dir -ChildPath "dotnet";
47

@@ -8,13 +11,19 @@ Invoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing
811
$archs = 'x64', 'x86';
912

1013
foreach ($arch in $archs) {
11-
Remove-Item .\LuaInstaller.Console\bin, .\LuaInstaller.Console\obj, .\LuaInstaller\bin, .\LuaInstaller\obj -Recurse;
14+
$directories_to_clean = ".\LuaInstaller.Console\bin", ".\LuaInstaller.Console\obj", ".\LuaInstaller\bin", ".\LuaInstaller\obj";
15+
16+
foreach ($dir_to_clean in $directories_to_clean) {
17+
if (Test-Path $dir_to_clean) {
18+
Remove-Item $dir_to_clean -Recurse;
19+
}
20+
}
1221

1322
& $dotnet_runner restore LuaInstaller.sln;
1423
& $dotnet_runner build .\LuaInstaller.Console\LuaInstaller.Console.csproj -c Release -r win-$arch --self-contained true;
1524
& $dotnet_runner build .\LuaInstaller\LuaInstaller.csproj -c Release -r win-$arch --self-contained true;
1625

17-
$console = ".\LuaInstaller.Console\bin\Release\netcoreapp3.0\win-$arch\LuaInstaller.Console.exe";
26+
$console = ".\LuaInstaller.Console\bin\Any CPU\Release\netcoreapp3.0\win-$arch\LuaInstaller.Console.exe";
1827

1928
$commands = "/?", "list-win-sdk", "list-vs-$arch", "list-lua";
2029

@@ -47,4 +56,4 @@ foreach ($arch in $archs) {
4756

4857
Write-Host;
4958
}
50-
}
59+
}

appveyor.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
version: 1.0.{build}
2-
3-
image: Visual Studio 2022
4-
2+
image:
3+
- Visual Studio 2022
4+
- Visual Studio 2019
5+
- Visual Studio 2017
56
configuration: Release
6-
77
platform: Any CPU
8-
9-
install:
10-
- pwsh: .\appveyor.ps1
11-
12-
build: off
8+
build_script:
9+
- pwsh: "$dotnet_dir = Join-Path -Path (Get-Location) -ChildPath \"dotnet_dir\";\n\nNew-Item $dotnet_dir -ItemType Directory;\n\n$dotnet_install_file = Join-Path -Path $dotnet_dir -ChildPath \"dotnet-install.ps1\";\n$dotnet_runner = Join-Path -Path $dotnet_dir -ChildPath \"dotnet\";\n\nInvoke-WebRequest -Uri 'https://dot.net/v1/dotnet-install.ps1' -UseBasicParsing -OutFile $dotnet_install_file;\n& $dotnet_install_file -Architecture x64 -Version \"6.0.301\" -InstallDir $dotnet_dir;\n\n$archs = 'x64', 'x86';\n\nforeach ($arch in $archs) {\n $directories_to_clean = \".\\LuaInstaller.Console\\bin\", \".\\LuaInstaller.Console\\obj\", \".\\LuaInstaller\\bin\", \".\\LuaInstaller\\obj\";\n\n foreach ($dir_to_clean in $directories_to_clean) {\n if (Test-Path $dir_to_clean) {\n Remove-Item $dir_to_clean -Recurse;\n }\n }\n \n & $dotnet_runner restore LuaInstaller.sln;\n & $dotnet_runner build .\\LuaInstaller.Console\\LuaInstaller.Console.csproj -c Release -r win-$arch --self-contained true;\n & $dotnet_runner build .\\LuaInstaller\\LuaInstaller.csproj -c Release -r win-$arch --self-contained true;\n\n $console = \".\\LuaInstaller.Console\\bin\\Any CPU\\Release\\netcoreapp3.0\\win-$arch\\LuaInstaller.Console.exe\";\n\n $commands = \"/?\", \"list-win-sdk\", \"list-vs-$arch\", \"list-lua\";\n\n foreach ($c in $commands) {\n Write-Host;\n Write-Host command: $c -ForegroundColor Cyan;\n & $console $c;\n Write-Host;\n }\n\n $lua_versions = \"5.1.5\", \"5.2.4\", \"5.3.6\", \"5.4.4\";\n\n $current_dir = Get-Location;\n\n foreach ($lua_ver in $lua_versions) {\n Write-Host;\n Write-Host Installing Lua $lua_ver;\n $lua_ver_dir = Join-Path -Path $current_dir -ChildPath $lua_ver | Join-Path -ChildPath $arch;\n\n & $console install \"dest-dir=$lua_ver_dir\" version=$lua_ver arch=$arch;\n \n $lua_exe_dir = Join-Path -Path $lua_ver_dir -ChildPath 'bin';\n $lua_exe = Join-Path -Path $lua_exe_dir -ChildPath 'lua.exe';\n Write-Host Executable file: $lua_exe;\n\n Write-Host;\n Write-Host Testing Lua:\n Write-Host;\n & $lua_exe -v;\n\n Write-Host;\n }\n}"

0 commit comments

Comments
 (0)