diff options
| author | AndrewDeanMS <45858683+AndrewDeanMS@users.noreply.github.com> | 2021-09-24 10:07:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-24 10:07:26 -0700 |
| commit | 86d2925af05fa744e085527e3f34b7c40370f83a (patch) | |
| tree | cc89fb9a9b26c2414e99ccfd4925dccbc404d5b6 | |
| parent | 8275003fd8c5119cb9438fea1425ebe774f2e527 (diff) | |
| download | vcpkg-86d2925af05fa744e085527e3f34b7c40370f83a.tar.gz vcpkg-86d2925af05fa744e085527e3f34b7c40370f83a.zip | |
Remove unnecessary <Delete> that races <Touch> (#20313)
When VcpkgInstallManifestDependencies runs in parallel,
the Delete in one task causes the touch in another to fail.
The Delete isn't actually necessary to accomplish the goal
here, so remove it.
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 36fd34764..7a5bb3c98 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -150,7 +150,6 @@ </PropertyGroup> <Message Text="Installing vcpkg dependencies to $(_ZVcpkgInstalledDir)" Importance="High" /> <MakeDir Directories="$(_ZVcpkgInstalledDir)" /> - <Delete Files="$(_ZVcpkgMSBuildStampFile)" /> <Message Text="%22$(_ZVcpkgExecutable)%22 install $(_ZVcpkgHostTripletParameter) --x-wait-for-lock --triplet %22$(VcpkgTriplet)%22 --vcpkg-root %22$(_ZVcpkgRoot)\%22 %22--x-manifest-root=$(_ZVcpkgManifestRoot)\%22 %22--x-install-root=$(_ZVcpkgInstalledDir)\%22 $(VcpkgAdditionalInstallOptions)" Importance="High" /> <Exec Command="%22$(_ZVcpkgExecutable)%22 install $(_ZVcpkgHostTripletParameter) --x-wait-for-lock --triplet %22$(VcpkgTriplet)%22 --vcpkg-root %22$(_ZVcpkgRoot)\%22 %22--x-manifest-root=$(_ZVcpkgManifestRoot)\%22 %22--x-install-root=$(_ZVcpkgInstalledDir)\%22 $(VcpkgAdditionalInstallOptions)" |