Skip to content

Commit 3de1b4a

Browse files
authored
September 4, 2024 (#471)
1 parent 2895334 commit 3de1b4a

File tree

10 files changed

+153
-6
lines changed

10 files changed

+153
-6
lines changed

.nuget/directxtk_desktop_2019.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SpriteBatch - simple & efficient 2D sprite rendering
3030
SpriteFont - bitmap based text rendering
3131
VertexTypes - structures for commonly used vertex data formats
3232
WICTextureLoader - WIC-based image file texture loader</description>
33-
<releaseNotes>Matches the June 4, 2024 release on GitHub.
33+
<releaseNotes>Matches the September 4, 2024 release on GitHub.
3434

3535
DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to support Windows 7 or later.</releaseNotes>
3636
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>

.nuget/directxtk_desktop_win10.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SpriteBatch - simple &amp; efficient 2D sprite rendering
3030
SpriteFont - bitmap based text rendering
3131
VertexTypes - structures for commonly used vertex data formats
3232
WICTextureLoader - WIC-based image file texture loader</description>
33-
<releaseNotes>Matches the June 4, 2024 release on GitHub.
33+
<releaseNotes>Matches the September 4, 2024 release on GitHub.
3434

3535
DirectX Tool Kit for Audio in this package uses XAudio 2.9 which requires Windows 10 or later.</releaseNotes>
3636
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>

.nuget/directxtk_uwp.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ SpriteBatch - simple &amp; efficient 2D sprite rendering
3030
SpriteFont - bitmap based text rendering
3131
VertexTypes - structures for commonly used vertex data formats
3232
WICTextureLoader - WIC-based image file texture loader</description>
33-
<releaseNotes>Matches the June 4, 2024 release on GitHub.</releaseNotes>
33+
<releaseNotes>Matches the September 4, 2024 release on GitHub.</releaseNotes>
3434
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
3535
<repository type="git" url="https://github.com/microsoft/DirectXTK.git" />
3636
<icon>images\icon.jpg</icon>

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
66

77
## Release History
88

9+
### September 4, 2024
10+
* *DirectX Tool Kit for Audio* update
11+
* Added ``IsValid`` method to **AudioEmitter** and **AudioListener**
12+
* Sync'd DDS.H with latest changes from DirectXTex
13+
* CMake project updates including support for ARM64EC
14+
* Minor code review
15+
* Added GitHub Actions YAML files
16+
917
### June 4, 2024
1018
* Renamed Internal namespace to ToolKitInternal for some conformance issues
1119
* CMake project updates

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
cmake_minimum_required (VERSION 3.20)
55

6-
set(DIRECTXTK_VERSION 1.8.8)
6+
set(DIRECTXTK_VERSION 1.8.9)
77

88
if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
99
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkId=248929
66

77
Copyright (c) Microsoft Corporation.
88

9-
**June 4, 2024**
9+
**September 4, 2024**
1010

1111
This package contains the "DirectX Tool Kit", a collection of helper classes for writing Direct3D 11 C++ code for Universal Windows Platform (UWP) apps for Windows 11, Windows 10, Xbox One, and Win32 desktop applications for Windows 7 Service Pack 1 or later.
1212

@@ -136,4 +136,4 @@ Thanks to Roberto Sonnino for his help with the ``CMO``, DGSL rendering, and the
136136

137137
Thanks to Pete Lewis and Justin Saunders for the normal-mapped and PBR shaders implementation.
138138

139-
Thanks to Andrew Farrier and Scott Matloff for their on-going help with code reviews.
139+
Thanks to Andrew Farrier and Scott Matloff for their on-going help with code reviews.

build/Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4+
<!--
5+
Copyright (c) Microsoft Corporation.
6+
Licensed under the MIT License.
7+
-->
8+
49
<PropertyGroup>
510
<ExtractedFolder Condition="'$(ExtractedFolder)'==''">C:\xtracted\</ExtractedFolder>
611
<ExtractedFolder Condition="!HasTrailingSlash('$(ExtractedFolder)')">$(ExtractedFolder)\</ExtractedFolder>

build/onefuzz-setup.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<#
2+
Copyright (c) Microsoft Corporation.
3+
Licensed under the MIT License.
4+
#>
5+
16
function Execute-Setup {
27
# Temporary work-around while OneFuzz does not run script from setup dir
38
Set-Location -Path $PSScriptRoot

build/preparerelease.ps1

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
<#
2+
3+
.NOTES
4+
Copyright (c) Microsoft Corporation.
5+
Licensed under the MIT License.
6+
7+
.SYNOPSIS
8+
Prepares a PR for release
9+
10+
.DESCRIPTION
11+
This script is used to do the edits required for preparing a release PR.
12+
13+
.PARAMETER BaseBranch
14+
This the branch to use as the base of the release. Defaults to 'main'.
15+
16+
.PARAMETER TargetBranch
17+
This is the name of the newly created branch for the release PR. Defaults to '<DATETAG>release'. If set to 'none', then no branch is created.
18+
19+
.PARAMETER UpdateVersion
20+
This is a $true or $false value that indicates if the library version number should be incremented. Defaults to $true.
21+
22+
.LINK
23+
https://github.com/microsoft/DirectXTK/wiki
24+
25+
#>
26+
27+
param(
28+
[string]$BaseBranch = "main",
29+
[string]$TargetBranch = $null,
30+
[bool]$UpdateVersion = $true
31+
)
32+
33+
$reporoot = Split-Path -Path $PSScriptRoot -Parent
34+
$cmake = $reporoot + "\CMakeLists.txt"
35+
$readme = $reporoot + "\README.md"
36+
$history = $reporoot + "\CHANGELOG.md"
37+
38+
if ((-Not (Test-Path $cmake)) -Or (-Not (Test-Path $readme)) -Or (-Not (Test-Path $history))) {
39+
Write-Error "ERROR: Unexpected location of script file!" -ErrorAction Stop
40+
}
41+
42+
$branch = git branch --show-current
43+
if ($branch -ne $BaseBranch) {
44+
Write-Error "ERROR: Must be in the $BaseBranch branch!" -ErrorAction Stop
45+
}
46+
47+
git pull -q
48+
if ($LastExitCode -ne 0) {
49+
Write-Error "ERROR: Failed to sync branch!" -ErrorAction Stop
50+
}
51+
52+
$version = Get-Content ($cmake) | Select-String -Pattern "set\(DIRECTXTK_VERSION" -CaseSensitive
53+
if (-Not ($version -match "([0-9]?\.[0-9]?\.[0-9]?)")) {
54+
Write-Error "ERROR: Failed to current version!" -ErrorAction Stop
55+
}
56+
$version = $Matches.0
57+
$rawversion = $version.replace('.','')
58+
59+
$newreleasedate = Get-Date -Format "MMMM d, yyyy"
60+
$newreleasetag = (Get-Date -Format "MMMyyyy").ToLower()
61+
62+
if($UpdateVersion) {
63+
[string]$newrawversion = ([int]$rawversion + 1)
64+
}
65+
else {
66+
$newrawversion = $rawversion
67+
}
68+
69+
$newversion = $newrawversion[0] + "." + $newrawversion[1] + "." + $newrawversion[2]
70+
71+
$rawreleasedate = $(Get-Content $readme) | Select-String -Pattern "\*\*[A-Z][a-z]+\S.\d+,?\S.\d\d\d\d\*\*"
72+
if ([string]::IsNullOrEmpty($rawreleasedate)) {
73+
Write-Error "ERROR: Failed to current release date!" -ErrorAction Stop
74+
}
75+
$releasedate = $rawreleasedate -replace '\*',''
76+
77+
if($releasedate -eq $newreleasedate) {
78+
Write-Error ("ERROR: Release "+$releasedate+" already exists!") -ErrorAction Stop
79+
}
80+
81+
if ($TargetBranch -ne 'none') {
82+
if ([string]::IsNullOrEmpty($TargetBranch)) {
83+
$TargetBranch = $newreleasetag + "release"
84+
}
85+
86+
git checkout -b $TargetBranch
87+
if ($LastExitCode -ne 0) {
88+
Write-Error "ERROR: Failed to create new topic branch!" -ErrorAction Stop
89+
}
90+
}
91+
92+
Write-Host " Old Version: " $version
93+
Write-Host "Old Release Date: " $releasedate
94+
Write-Host "->"
95+
Write-Host " Release Date: " $newreleasedate
96+
Write-Host " Release Tag: " $newreleasetag
97+
Write-Host " Release Version: " $newversion
98+
99+
if($UpdateVersion) {
100+
(Get-Content $cmake).Replace("set(DIRECTXTK_VERSION $version)","set(DIRECTXTK_VERSION $newversion)") | Set-Content $cmake
101+
}
102+
103+
(Get-Content $readme).Replace("$rawreleasedate", "**$newreleasedate**") | Set-Content $readme
104+
105+
Get-ChildItem -Path ($reporoot + "\.nuget") -Filter *.nuspec | Foreach-Object {
106+
(Get-Content -Path $_.Fullname).Replace("$releasedate", "$newreleasedate") | Set-Content -Path $_.Fullname -Encoding utf8
107+
}
108+
109+
[System.Collections.ArrayList]$file = Get-Content $history
110+
$inserthere = @()
111+
112+
for ($i=0; $i -lt $file.count; $i++) {
113+
if ($file[$i] -match "## Release History") {
114+
$inserthere += $i + 1
115+
}
116+
}
117+
118+
$file.insert($inserthere[0], "`n### $newreleasedate`n* change history here")
119+
Set-Content -Path $history -Value $file
120+
121+
code $history $readme
122+
if ($LastExitCode -ne 0) {
123+
Write-Error "ERROR: Failed to launch VS Code!" -ErrorAction Stop
124+
}

build/versioninfo.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
<#
2+
Copyright (c) Microsoft Corporation.
3+
Licensed under the MIT License.
4+
#>
5+
16
param(
27
[string]$version
38
)

0 commit comments

Comments
 (0)