Skip to content

Commit 8718e36

Browse files
authored
Get props and targets from the scripts bundle. (#1756)
I'm not positive exactly what I was thinking in #976 ; probably though we'd be moving the authoritative place to the tool repo. But the result of that has been that the VS copy is shipping very old bits for a while. Bug discvoered by @vicroms .
1 parent 82792cb commit 8718e36

File tree

3 files changed

+1
-288
lines changed

3 files changed

+1
-288
lines changed

vcpkg-init/mint-standalone-bundle.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,12 @@ try {
9898
Copy-Item -Path "$ArchIndependentSignedFilesRoot/scripts/applocal.ps1" -Destination 'out/scripts/buildsystems/msbuild/applocal.ps1'
9999

100100
# None of the standalone bundles support classic mode, so turn that off in the bundled copy of the props
101-
$propsContent = Get-Content "$PSScriptRoot/vcpkg.props" -Raw -Encoding Ascii
101+
$propsContent = Get-Content "out/scripts/buildsystems/msbuild/vcpkg.props" -Raw -Encoding Ascii
102102
$classicEnabledLine = "<VcpkgEnableClassic Condition=`"'`$(VcpkgEnableClassic)' == ''`">true</VcpkgEnableClassic>"
103103
$classicDisabledLine = "<VcpkgEnableClassic Condition=`"'`$(VcpkgEnableClassic)' == ''`">false</VcpkgEnableClassic>"
104104
$propsContent = $propsContent.Replace($classicEnabledLine, $classicDisabledLine)
105105
Set-Content -Path "out/scripts/buildsystems/msbuild/vcpkg.props" -Value $propsContent -NoNewline -Encoding Ascii
106106

107-
Copy-Item -Path "$PSScriptRoot/vcpkg.targets" -Destination 'out/scripts/buildsystems/msbuild/vcpkg.targets'
108-
109107
New-Item -Path 'out/scripts/posh-vcpkg/' -ItemType 'Directory' -Force
110108
Copy-Item -Path "$ArchIndependentSignedFilesRoot/scripts/posh-vcpkg.psm1" -Destination 'out/scripts/posh-vcpkg/posh-vcpkg.psm1'
111109
Copy-Item -Path "$ArchIndependentSignedFilesRoot/scripts/posh-vcpkg.psd1" -Destination 'out/scripts/posh-vcpkg/posh-vcpkg.psd1'

vcpkg-init/vcpkg.props

Lines changed: 0 additions & 46 deletions
This file was deleted.

vcpkg-init/vcpkg.targets

Lines changed: 0 additions & 239 deletions
This file was deleted.

0 commit comments

Comments
 (0)