Skip to content

Commit 3554208

Browse files
committed
new attempt
1 parent faa83f5 commit 3554208

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

LuaInstaller.Core/DefaultWindowsSdkFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ public WindowsSdk Create(WindowsSdkVersion version, Architecture arch)
3636
{
3737
includeInfo = (
3838
from versionDir in Directory.EnumerateDirectories(includeDir)
39-
where versionDir.StartsWith(version.ProductVersion)
39+
where Path.GetFileName(versionDir).StartsWith(version.ProductVersion)
4040
select new DirectoryInfo(versionDir)
4141
).FirstOrDefault();
4242

4343
libInfo = (
4444
from versionDir in Directory.EnumerateDirectories(libDir)
45-
where versionDir.StartsWith(version.ProductVersion)
45+
where Path.GetFileName(versionDir).StartsWith(version.ProductVersion)
4646
select new DirectoryInfo(versionDir)
4747
).FirstOrDefault();
4848

appveyor.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1+
<#
12
Get-Item 'HKLM:\SOFTWARE\Wow6432node\Microsoft\Microsoft SDKs\Windows\*' | Where-Object { $_.Name -match '[vV]\d+\.\d+$' } | ForEach-Object { 'sdk version: ' + $_.GetValue("ProductVersion"); Get-ChildItem (Join-Path $_.GetValue("InstallationFolder") -ChildPath include | Join-Path -ChildPath '*' | Join-Path -ChildPath 'string.h') -Recurse | ForEach-Object { $_.FullName }; Get-ChildItem (Join-Path $_.GetValue("InstallationFolder") -ChildPath lib | Join-Path -ChildPath '*' | Join-Path -ChildPath 'user32.lib') -Recurse | ForEach-Object { $_.FullName }; };
23
34
Get-Item 'HKLM:\SOFTWARE\Microsoft\Microsoft SDKs\Windows\*' | Where-Object { $_.Name -match '[vV]\d+\.\d+$' } | ForEach-Object { Get-ChildItem (Join-Path $_.GetValue("InstallationFolder") -ChildPath include | Join-Path -ChildPath '*' | Join-Path -ChildPath 'string.h') -Recurse | ForEach-Object { $_.FullName }; Get-ChildItem (Join-Path $_.GetValue("InstallationFolder") -ChildPath lib | Join-Path -ChildPath '*' | Join-Path -ChildPath 'user32.lib') -Recurse | ForEach-Object { $_.FullName }; };
5+
#>
46

5-
<#
67
$console = 'LuaInstaller.Console\bin\Release\LuaInstaller.Console.exe';
78

89
$infoCommands = '/?',
@@ -43,5 +44,4 @@ foreach ($v in $versions) {
4344
Write-Host;
4445
Remove-Item -Path $destDir -Recurse -Force;
4546
Write-Host;
46-
}
47-
#>
47+
}

0 commit comments

Comments
 (0)