From c6595d708fc62489bb87baf4ecbdfc6f2b4ff6e2 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 23 Sep 2021 17:53:29 -0700 Subject: [dxsdk-d3dx/directxsdk] Add message to handle the conflicts between these two ports (#20286) * [dxsdk-d3dx] Modify the destination path * [dxsdk-d3dx/directxsdk] Add message to handle the conflicts between these two ports Co-authored-by: Cheney-Wang --- versions/baseline.json | 4 ++-- versions/d-/directxsdk.json | 5 +++++ versions/d-/dxsdk-d3dx.json | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) (limited to 'versions') diff --git a/versions/baseline.json b/versions/baseline.json index 72daec0b3..c6ff66583 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1782,7 +1782,7 @@ }, "directxsdk": { "baseline": "jun10", - "port-version": 3 + "port-version": 4 }, "directxtex": { "baseline": "aug2021", @@ -1882,7 +1882,7 @@ }, "dxsdk-d3dx": { "baseline": "9.29.952.8", - "port-version": 0 + "port-version": 1 }, "dxut": { "baseline": "11.26", diff --git a/versions/d-/directxsdk.json b/versions/d-/directxsdk.json index 361bb976f..c40d1fad2 100644 --- a/versions/d-/directxsdk.json +++ b/versions/d-/directxsdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "440a5b43febdcc709d9ae1d768371c0b184ca92e", + "version-string": "jun10", + "port-version": 4 + }, { "git-tree": "49dc911dc7c69f6e0eee0279afcf53187d547ae5", "version-string": "jun10", diff --git a/versions/d-/dxsdk-d3dx.json b/versions/d-/dxsdk-d3dx.json index 9c5b277d6..f6594d45f 100644 --- a/versions/d-/dxsdk-d3dx.json +++ b/versions/d-/dxsdk-d3dx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81aeb21cd027336b00f758ece5371f0c4930be2e", + "version": "9.29.952.8", + "port-version": 1 + }, { "git-tree": "38ff04dcf269c835a7f5c03d50a1a457350bde49", "version": "9.29.952.8", -- cgit v1.2.3