Skip to content

Commit fcfa422

Browse files
Merge branch 'KhronosGroup:main' into dengkail/apilayer_discovery
2 parents 84e07a8 + f66902f commit fcfa422

File tree

89 files changed

+1237
-1828
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1237
-1828
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# SPDX-License-Identifier: Apache-2.0
44

5-
version: 1.0.28.{build}
5+
version: 1.0.29.{build}
66
image: Visual Studio 2017
77

88

.azure-pipelines/nuget/NugetTemplate/build/native/OpenXR.Loader.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<!--
3-
Copyright (c) 2020 The Khronos Group Inc.
3+
Copyright (c) 2020-2023, The Khronos Group Inc.
44
SPDX-License-Identifier: CC-BY-4.0
55
-->
66
<PropertyGroup>

.azure-pipelines/nuget/NugetTemplate/build/native/OpenXR.Loader.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project ToolsVersion="4.0"
22
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<!--
4-
Copyright (c) 2020 The Khronos Group Inc.
4+
Copyright (c) 2020-2023, The Khronos Group Inc.
55
SPDX-License-Identifier: CC-BY-4.0
66
-->
77

.azure-pipelines/nuget/stage_nuget.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019-2020 The Khronos Group Inc.
1+
# Copyright (c) 2019-2023, The Khronos Group Inc.
22
# SPDX-License-Identifier: Apache-2.0
33
param(
44
[Parameter(Mandatory = $true, HelpMessage = "Path to unzipped openxr_loader_windows OpenXR-SDK release asset")]

.azure-pipelines/shared/generate_windows_matrix_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2019 The Khronos Group Inc.
2+
# Copyright (c) 2019-2023, The Khronos Group Inc.
33
# SPDX-License-Identifier: Apache-2.0
44

55
from itertools import product

.azure-pipelines/shared/install_vulkan.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019 The Khronos Group Inc.
1+
# Copyright (c) 2019-2023, The Khronos Group Inc.
22
# SPDX-License-Identifier: Apache-2.0
33

44
if (-not $env:VULKAN_SDK_VERSION) {

.azure-pipelines/shared/organize_windows_artifacts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2019 The Khronos Group Inc.
2+
# Copyright (c) 2019-2023, The Khronos Group Inc.
33
# SPDX-License-Identifier: Apache-2.0
44

55
from itertools import product

.azure-pipelines/shared/print_windows_artifact_names.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
# Copyright (c) 2019 The Khronos Group Inc.
2+
# Copyright (c) 2019-2023, The Khronos Group Inc.
33
# SPDX-License-Identifier: Apache-2.0
44

55
from itertools import product

.azure-pipelines/shared/shared.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2019 The Khronos Group Inc.
1+
# Copyright (c) 2019-2023, The Khronos Group Inc.
22
# SPDX-License-Identifier: Apache-2.0
33

44
import json

.git-blame-ignore-revs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
# and do try to make sure that the bulk change is made
1010
# **separate from a release commit** on all repos.
1111
# See <https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt>
12-
# for how to use this.
12+
# for how to use this, probably something like:
13+
# git config blame.ignoreRevsFile .git-blame-ignore-revs
1314

15+
## Old changes
16+
767537d9523253de1615b01450a8b22c8e2cc6a2
1417

1518
## 1.0.17 - Fix XML indentation
1619

0 commit comments

Comments
 (0)