From 8718e368956c89e648f89f2a6792f7b59f247bc9 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Tue, 19 Aug 2025 13:19:43 -0700 Subject: [PATCH] Get props and targets from the scripts bundle. (#1756) I'm not positive exactly what I was thinking in https://github.com/microsoft/vcpkg-tool/pull/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 . --- vcpkg-init/mint-standalone-bundle.ps1 | 4 +- vcpkg-init/vcpkg.props | 46 ----- vcpkg-init/vcpkg.targets | 239 -------------------------- 3 files changed, 1 insertion(+), 288 deletions(-) delete mode 100644 vcpkg-init/vcpkg.props delete mode 100644 vcpkg-init/vcpkg.targets diff --git a/vcpkg-init/mint-standalone-bundle.ps1 b/vcpkg-init/mint-standalone-bundle.ps1 index 3ecbbaec..90389fb6 100644 --- a/vcpkg-init/mint-standalone-bundle.ps1 +++ b/vcpkg-init/mint-standalone-bundle.ps1 @@ -98,14 +98,12 @@ try { Copy-Item -Path "$ArchIndependentSignedFilesRoot/scripts/applocal.ps1" -Destination 'out/scripts/buildsystems/msbuild/applocal.ps1' # None of the standalone bundles support classic mode, so turn that off in the bundled copy of the props - $propsContent = Get-Content "$PSScriptRoot/vcpkg.props" -Raw -Encoding Ascii + $propsContent = Get-Content "out/scripts/buildsystems/msbuild/vcpkg.props" -Raw -Encoding Ascii $classicEnabledLine = "true" $classicDisabledLine = "false" $propsContent = $propsContent.Replace($classicEnabledLine, $classicDisabledLine) Set-Content -Path "out/scripts/buildsystems/msbuild/vcpkg.props" -Value $propsContent -NoNewline -Encoding Ascii - Copy-Item -Path "$PSScriptRoot/vcpkg.targets" -Destination 'out/scripts/buildsystems/msbuild/vcpkg.targets' - New-Item -Path 'out/scripts/posh-vcpkg/' -ItemType 'Directory' -Force Copy-Item -Path "$ArchIndependentSignedFilesRoot/scripts/posh-vcpkg.psm1" -Destination 'out/scripts/posh-vcpkg/posh-vcpkg.psm1' Copy-Item -Path "$ArchIndependentSignedFilesRoot/scripts/posh-vcpkg.psd1" -Destination 'out/scripts/posh-vcpkg/posh-vcpkg.psd1' diff --git a/vcpkg-init/vcpkg.props b/vcpkg-init/vcpkg.props deleted file mode 100644 index 0f0b6e3b..00000000 --- a/vcpkg-init/vcpkg.props +++ /dev/null @@ -1,46 +0,0 @@ - - - - true - true - - - - - - - - $(Configuration) - - - - - Debug - - - - - Release - - - - - - false - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\..')) - - true - - false - true - - - true - - - false - true - $([MSbuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), vcpkg.json)) - - diff --git a/vcpkg-init/vcpkg.targets b/vcpkg-init/vcpkg.targets deleted file mode 100644 index 361850bd..00000000 --- a/vcpkg-init/vcpkg.targets +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - <_ZVcpkgRoot>$(VcpkgRoot) - <_ZVcpkgManifestRoot>$(VcpkgManifestRoot) - <_ZVcpkgInstalledDir>$(VcpkgInstalledDir) - - - - - <_ZVcpkgRoot Condition="!$(_ZVcpkgRoot.EndsWith('\'))">$(_ZVcpkgRoot)\ - <_ZVcpkgManifestRoot Condition="'$(_ZVcpkgManifestRoot)' != '' and !$(_ZVcpkgManifestRoot.EndsWith('\'))">$(_ZVcpkgManifestRoot)\ - <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' != '' and !$(_ZVcpkgInstalledDir.EndsWith('\'))">$(_ZVcpkgInstalledDir)\ - - - - <_ZVcpkgClassicOrManifest Condition="'$(VcpkgEnabled)' == 'true' And ('$(VcpkgEnableClassic)' == 'true' Or '$(VcpkgEnableManifest)' == 'true')">true - <_ZVcpkgClassicOrManifest Condition="'$(_ZVcpkgClassicOrManifest)' == ''">false - - - - - windows - x64 - true - - - xbox-scarlett - x64 - false - - - xbox-xboxone - x64 - false - - - - - windows - uwp - - - - $(Platform) - x86 - - - - <_ZVcpkgLinkage /> - <_ZVcpkgLinkage Condition="'$(VcpkgUseStatic)' == 'true'">-static - <_ZVcpkgLinkageMD /> - <_ZVcpkgLinkageMD Condition="'$(VcpkgUseStatic)' == 'true' and '$(VcpkgUseMD)' == 'true'">-md - $(VcpkgPlatformTarget)-$(VcpkgOSTarget)$(_ZVcpkgLinkage)$(_ZVcpkgLinkageMD) - $(VcpkgTriplet)$(_ZVcpkgLinkage)$(_ZVcpkgLinkageMD) - - - - - VcpkgTriplet=$(VcpkgTriplet):$(ProjectStateLine) - - - - - - - <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgManifestRoot)vcpkg_installed\$(VcpkgTriplet)\ - - - - - <_ZVcpkgInstalledDir Condition="'$(_ZVcpkgInstalledDir)' == ''">$(_ZVcpkgRoot)installed\ - - - - - - <_ZVcpkgCurrentInstalledDir>$(_ZVcpkgInstalledDir)$(VcpkgTriplet)\ - <_ZVcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Debug'))">Debug - <_ZVcpkgNormalizedConfiguration Condition="$(VcpkgConfiguration.StartsWith('Release')) or '$(VcpkgConfiguration)' == 'RelWithDebInfo' or '$(VcpkgConfiguration)' == 'MinSizeRel'">Release - - <_ZVcpkgConfigSubdir Condition="'$(_ZVcpkgNormalizedConfiguration)' == 'Debug'">debug\ - <_ZVcpkgExecutable>$(_ZVcpkgRoot)vcpkg.exe - $(ExternalIncludePath);$(_ZVcpkgCurrentInstalledDir)include - - - - - $(_ZVcpkgRoot)scripts\buildsystems\msbuild\vcpkg-general.xml - - - - - Project - - - - - - - %(AdditionalLibraryDirectories);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib;$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\manual-link - - - %(AdditionalDependencies);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\*.lib - %(AdditionalLibraryDirectories);$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib;$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)lib\manual-link - - - %(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)include - - - %(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)include - - - - - - - - - - - - - - - - - - - <_ZVcpkgHostTripletParameter>"--host-triplet=$(VcpkgHostTriplet)" - <_ZVcpkgHostTripletSuffix>$(VcpkgHostTriplet). - - - - - <_ZVcpkgHostTripletParameter /> - <_ZVcpkgHostTripletSuffix /> - - - - - - <_ZVcpkgManifestFileLocation>$(_ZVcpkgManifestRoot)vcpkg.json - <_ZVcpkgConfigurationFileLocation>$(_ZVcpkgManifestRoot)vcpkg-configuration.json - <_ZVcpkgMSBuildStampFile>$(_ZVcpkgInstalledDir).msbuildstamp-$(VcpkgTriplet).$(_ZVcpkgHostTripletSuffix)stamp - - - - <_ZVcpkgInstallManifestDependenciesInputs Include="$(_ZVcpkgManifestFileLocation)"/> - <_ZVcpkgInstallManifestDependenciesInputs Include="$(_ZVcpkgConfigurationFileLocation)" Condition="Exists('$(_ZVcpkgConfigurationFileLocation)')"/> - - - - - - <_ZVcpkgTLogFileLocation>$(TLogLocation)VcpkgInstallManifest$(VcpkgTriplet).$(_ZVcpkgHostTripletSuffix)read.1u.tlog - - - - - - - - - - - - - - - - - <_ZVcpkgAppLocalPowerShellCommonArguments>-ExecutionPolicy Bypass -noprofile -File "$(MSBuildThisFileDirectory)applocal.ps1" "$(TargetPath)" "$(_ZVcpkgCurrentInstalledDir)$(_ZVcpkgConfigSubdir)bin" "$(TLogLocation)$(ProjectName).write.1u.tlog" "$(IntDir)vcpkg.applocal.log" - - - - - - - - - - - - - - - - - - - - -