Skip to content

Commit

Permalink
September 4, 2024 (#471)
Browse files Browse the repository at this point in the history
  • Loading branch information
walbourn authored Sep 5, 2024
1 parent 2895334 commit 3de1b4a
Show file tree
Hide file tree
Showing 10 changed files with 153 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .nuget/directxtk_desktop_2019.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ SpriteBatch - simple & efficient 2D sprite rendering
SpriteFont - bitmap based text rendering
VertexTypes - structures for commonly used vertex data formats
WICTextureLoader - WIC-based image file texture loader</description>
<releaseNotes>Matches the June 4, 2024 release on GitHub.
<releaseNotes>Matches the September 4, 2024 release on GitHub.

DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to support Windows 7 or later.</releaseNotes>
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion .nuget/directxtk_desktop_win10.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ SpriteBatch - simple &amp; efficient 2D sprite rendering
SpriteFont - bitmap based text rendering
VertexTypes - structures for commonly used vertex data formats
WICTextureLoader - WIC-based image file texture loader</description>
<releaseNotes>Matches the June 4, 2024 release on GitHub.
<releaseNotes>Matches the September 4, 2024 release on GitHub.

DirectX Tool Kit for Audio in this package uses XAudio 2.9 which requires Windows 10 or later.</releaseNotes>
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion .nuget/directxtk_uwp.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ SpriteBatch - simple &amp; efficient 2D sprite rendering
SpriteFont - bitmap based text rendering
VertexTypes - structures for commonly used vertex data formats
WICTextureLoader - WIC-based image file texture loader</description>
<releaseNotes>Matches the June 4, 2024 release on GitHub.</releaseNotes>
<releaseNotes>Matches the September 4, 2024 release on GitHub.</releaseNotes>
<projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
<repository type="git" url="https://github.com/microsoft/DirectXTK.git" />
<icon>images\icon.jpg</icon>
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT

## Release History

### September 4, 2024
* *DirectX Tool Kit for Audio* update
* Added ``IsValid`` method to **AudioEmitter** and **AudioListener**
* Sync'd DDS.H with latest changes from DirectXTex
* CMake project updates including support for ARM64EC
* Minor code review
* Added GitHub Actions YAML files

### June 4, 2024
* Renamed Internal namespace to ToolKitInternal for some conformance issues
* CMake project updates
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

cmake_minimum_required (VERSION 3.20)

set(DIRECTXTK_VERSION 1.8.8)
set(DIRECTXTK_VERSION 1.8.9)

if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkId=248929

Copyright (c) Microsoft Corporation.

**June 4, 2024**
**September 4, 2024**

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.

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

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

Thanks to Andrew Farrier and Scott Matloff for their on-going help with code reviews.
Thanks to Andrew Farrier and Scott Matloff for their on-going help with code reviews.
5 changes: 5 additions & 0 deletions build/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!--
Copyright (c) Microsoft Corporation.
Licensed under the MIT License.
-->

<PropertyGroup>
<ExtractedFolder Condition="'$(ExtractedFolder)'==''">C:\xtracted\</ExtractedFolder>
<ExtractedFolder Condition="!HasTrailingSlash('$(ExtractedFolder)')">$(ExtractedFolder)\</ExtractedFolder>
Expand Down
5 changes: 5 additions & 0 deletions build/onefuzz-setup.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<#
Copyright (c) Microsoft Corporation.
Licensed under the MIT License.
#>

function Execute-Setup {
# Temporary work-around while OneFuzz does not run script from setup dir
Set-Location -Path $PSScriptRoot
Expand Down
124 changes: 124 additions & 0 deletions build/preparerelease.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<#
.NOTES
Copyright (c) Microsoft Corporation.
Licensed under the MIT License.
.SYNOPSIS
Prepares a PR for release
.DESCRIPTION
This script is used to do the edits required for preparing a release PR.
.PARAMETER BaseBranch
This the branch to use as the base of the release. Defaults to 'main'.
.PARAMETER TargetBranch
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.
.PARAMETER UpdateVersion
This is a $true or $false value that indicates if the library version number should be incremented. Defaults to $true.
.LINK
https://github.com/microsoft/DirectXTK/wiki
#>

param(
[string]$BaseBranch = "main",
[string]$TargetBranch = $null,
[bool]$UpdateVersion = $true
)

$reporoot = Split-Path -Path $PSScriptRoot -Parent
$cmake = $reporoot + "\CMakeLists.txt"
$readme = $reporoot + "\README.md"
$history = $reporoot + "\CHANGELOG.md"

if ((-Not (Test-Path $cmake)) -Or (-Not (Test-Path $readme)) -Or (-Not (Test-Path $history))) {
Write-Error "ERROR: Unexpected location of script file!" -ErrorAction Stop
}

$branch = git branch --show-current
if ($branch -ne $BaseBranch) {
Write-Error "ERROR: Must be in the $BaseBranch branch!" -ErrorAction Stop
}

git pull -q
if ($LastExitCode -ne 0) {
Write-Error "ERROR: Failed to sync branch!" -ErrorAction Stop
}

$version = Get-Content ($cmake) | Select-String -Pattern "set\(DIRECTXTK_VERSION" -CaseSensitive
if (-Not ($version -match "([0-9]?\.[0-9]?\.[0-9]?)")) {
Write-Error "ERROR: Failed to current version!" -ErrorAction Stop
}
$version = $Matches.0
$rawversion = $version.replace('.','')

$newreleasedate = Get-Date -Format "MMMM d, yyyy"
$newreleasetag = (Get-Date -Format "MMMyyyy").ToLower()

if($UpdateVersion) {
[string]$newrawversion = ([int]$rawversion + 1)
}
else {
$newrawversion = $rawversion
}

$newversion = $newrawversion[0] + "." + $newrawversion[1] + "." + $newrawversion[2]

$rawreleasedate = $(Get-Content $readme) | Select-String -Pattern "\*\*[A-Z][a-z]+\S.\d+,?\S.\d\d\d\d\*\*"
if ([string]::IsNullOrEmpty($rawreleasedate)) {
Write-Error "ERROR: Failed to current release date!" -ErrorAction Stop
}
$releasedate = $rawreleasedate -replace '\*',''

if($releasedate -eq $newreleasedate) {
Write-Error ("ERROR: Release "+$releasedate+" already exists!") -ErrorAction Stop
}

if ($TargetBranch -ne 'none') {
if ([string]::IsNullOrEmpty($TargetBranch)) {
$TargetBranch = $newreleasetag + "release"
}

git checkout -b $TargetBranch
if ($LastExitCode -ne 0) {
Write-Error "ERROR: Failed to create new topic branch!" -ErrorAction Stop
}
}

Write-Host " Old Version: " $version
Write-Host "Old Release Date: " $releasedate
Write-Host "->"
Write-Host " Release Date: " $newreleasedate
Write-Host " Release Tag: " $newreleasetag
Write-Host " Release Version: " $newversion

if($UpdateVersion) {
(Get-Content $cmake).Replace("set(DIRECTXTK_VERSION $version)","set(DIRECTXTK_VERSION $newversion)") | Set-Content $cmake
}

(Get-Content $readme).Replace("$rawreleasedate", "**$newreleasedate**") | Set-Content $readme

Get-ChildItem -Path ($reporoot + "\.nuget") -Filter *.nuspec | Foreach-Object {
(Get-Content -Path $_.Fullname).Replace("$releasedate", "$newreleasedate") | Set-Content -Path $_.Fullname -Encoding utf8
}

[System.Collections.ArrayList]$file = Get-Content $history
$inserthere = @()

for ($i=0; $i -lt $file.count; $i++) {
if ($file[$i] -match "## Release History") {
$inserthere += $i + 1
}
}

$file.insert($inserthere[0], "`n### $newreleasedate`n* change history here")
Set-Content -Path $history -Value $file

code $history $readme
if ($LastExitCode -ne 0) {
Write-Error "ERROR: Failed to launch VS Code!" -ErrorAction Stop
}
5 changes: 5 additions & 0 deletions build/versioninfo.ps1
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<#
Copyright (c) Microsoft Corporation.
Licensed under the MIT License.
#>

param(
[string]$version
)
Expand Down

0 comments on commit 3de1b4a

Please sign in to comment.