From feef13ccf3ef463b1208a6091d82153c32b245e5 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Wed, 13 Apr 2022 11:23:12 -0700 Subject: [PATCH] [dstorage, dxsdk-d3dx, xaudio2redist] ports updated to support static-md triplets (#24104) * Update ports to support static-md triplets * Update baseline * !(static & staticcrt) -> !staticcrt Co-authored-by: nicole mazzuca --- ports/dstorage/vcpkg.json | 3 ++- ports/dxsdk-d3dx/vcpkg.json | 4 ++-- ports/xaudio2redist/vcpkg.json | 4 ++-- versions/baseline.json | 6 +++--- versions/d-/dstorage.json | 5 +++++ versions/d-/dxsdk-d3dx.json | 5 +++++ versions/x-/xaudio2redist.json | 5 +++++ 7 files changed, 24 insertions(+), 8 deletions(-) diff --git a/ports/dstorage/vcpkg.json b/ports/dstorage/vcpkg.json index 66ada05dfe..a0f7f24f6f 100644 --- a/ports/dstorage/vcpkg.json +++ b/ports/dstorage/vcpkg.json @@ -1,8 +1,9 @@ { "name": "dstorage", "version": "1.0.0", + "port-version": 1, "description": "DirectStorage for Windows", "homepage": "https://aka.ms/directstorage/", "license": null, - "supports": "windows & !uwp & !static" + "supports": "windows & !uwp & !staticcrt" } diff --git a/ports/dxsdk-d3dx/vcpkg.json b/ports/dxsdk-d3dx/vcpkg.json index 7b0cf6d69e..d4a9518152 100644 --- a/ports/dxsdk-d3dx/vcpkg.json +++ b/ports/dxsdk-d3dx/vcpkg.json @@ -1,9 +1,9 @@ { "name": "dxsdk-d3dx", "version": "9.29.952.8", - "port-version": 3, + "port-version": 4, "description": "Redistributable package for the legacy DirectX SDK's D3DX9, D3DX10, and/or D3DX11 utility libraries.", "homepage": "https://walbourn.github.io/legacy-d3dx-on-nuget/", "license": null, - "supports": "windows & !arm & !uwp & !static" + "supports": "windows & !arm & !uwp & !staticcrt" } diff --git a/ports/xaudio2redist/vcpkg.json b/ports/xaudio2redist/vcpkg.json index 3c610f1f99..0840cb7fc5 100644 --- a/ports/xaudio2redist/vcpkg.json +++ b/ports/xaudio2redist/vcpkg.json @@ -1,9 +1,9 @@ { "name": "xaudio2redist", "version": "1.2.8", - "port-version": 2, + "port-version": 3, "description": "Redistributable version of XAudio 2.9 for Windows 7 SP1 or later", "homepage": "https://aka.ms/XAudio2Redist", "license": null, - "supports": "windows & !arm & !uwp & !static" + "supports": "windows & !arm & !uwp & !staticcrt" } diff --git a/versions/baseline.json b/versions/baseline.json index d13f96e9c4..276409497a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1946,7 +1946,7 @@ }, "dstorage": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "dtl": { "baseline": "1.19", @@ -1970,7 +1970,7 @@ }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 3 + "port-version": 4 }, "dxut": { "baseline": "11.26", @@ -7526,7 +7526,7 @@ }, "xaudio2redist": { "baseline": "1.2.8", - "port-version": 2 + "port-version": 3 }, "xbyak": { "baseline": "6.00", diff --git a/versions/d-/dstorage.json b/versions/d-/dstorage.json index cc27ca9225..5d72f09e7b 100644 --- a/versions/d-/dstorage.json +++ b/versions/d-/dstorage.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8b3e0c3eaf98dec92b8e97f19e10efac69c6a187", + "version": "1.0.0", + "port-version": 1 + }, { "git-tree": "b2494bc112c6d12ffbb8a8bc687a1ae2ad583221", "version": "1.0.0", diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index 81208748aa..8da67907f9 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14db52bb5daba8ba8e0a93b0e41ffa676935923a", + "version": "9.29.952.8", + "port-version": 4 + }, { "git-tree": "4f9cac012452363e92e36d5978972cee3b9154e5", "version": "9.29.952.8", diff --git a/versions/x-/xaudio2redist.json b/versions/x-/xaudio2redist.json index 2f86ccea77..2b305feb01 100644 --- a/versions/x-/xaudio2redist.json +++ b/versions/x-/xaudio2redist.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fe3229572bacd0c7076a7a4d710f96e6b3a66a3f", + "version": "1.2.8", + "port-version": 3 + }, { "git-tree": "8ae7aaec9ebb9859356736f91710e8d9727d7a81", "version": "1.2.8",