update to latest 1.5

This commit is contained in:
Steve Kirbach 2024-06-20 08:51:12 -07:00
parent 8d094d4478
commit 9706ffd7d9
6 changed files with 91 additions and 78 deletions

View File

@ -192,17 +192,28 @@ STDAPI MddAddPackageDependency(
STDAPI_(void) MddRemovePackageDependency(
_In_ MDD_PACKAGEDEPENDENCY_CONTEXT packageDependencyContext) noexcept;
/// Return the package full name that would be used if the
/// PackageDependency were to be resolved. Does not add the
/// Return the package full name to which the
/// PackageDependency has been resolved. Does not add the
/// package to the process graph.
///
/// @param packageFullName allocated via HeapAlloc; use HeapFree to deallocate.
/// If the package dependency cannot be resolved the function
/// succeeds but packageFullName is nullptr.
/// @note An unknown packageDependencyId returns S_OK and packageFullName=null.
STDAPI MddGetResolvedPackageFullNameForPackageDependency(
_In_ PCWSTR packageDependencyId,
_Outptr_result_maybenull_ PWSTR* packageFullName) noexcept;
/// Return the package full name to which the
/// PackageDependency has been resolved. Does not add the
/// package to the process graph.
///
/// @param packageFullName allocated via HeapAlloc; use HeapFree to deallocate.
/// @note An unknown packageDependencyId returns HRESULT_FROM_WIN32(ERROR_NOT_FOUND).
STDAPI MddGetResolvedPackageFullNameForPackageDependency2(
_In_ PCWSTR packageDependencyId,
_Outptr_result_maybenull_ PWSTR* packageFullName) noexcept;
/// Return the package dependency for the context.
///
/// @param packageDependencyId allocated via HeapAlloc; use HeapFree to deallocate.

View File

@ -7,23 +7,23 @@
// Release information
#define WINDOWSAPPSDK_RELEASE_MAJOR 1
#define WINDOWSAPPSDK_RELEASE_MINOR 5
#define WINDOWSAPPSDK_RELEASE_PATCH 0
#define WINDOWSAPPSDK_RELEASE_PATCH 1
#define WINDOWSAPPSDK_RELEASE_MAJORMINOR 0x00010005
#define WINDOWSAPPSDK_RELEASE_CHANNEL "preview"
#define WINDOWSAPPSDK_RELEASE_CHANNEL_W L"preview"
#define WINDOWSAPPSDK_RELEASE_CHANNEL "stable"
#define WINDOWSAPPSDK_RELEASE_CHANNEL_W L"stable"
#define WINDOWSAPPSDK_RELEASE_VERSION_TAG "preview1"
#define WINDOWSAPPSDK_RELEASE_VERSION_TAG_W L"preview1"
#define WINDOWSAPPSDK_RELEASE_VERSION_TAG ""
#define WINDOWSAPPSDK_RELEASE_VERSION_TAG_W L""
#define WINDOWSAPPSDK_RELEASE_VERSION_SHORTTAG "p1"
#define WINDOWSAPPSDK_RELEASE_VERSION_SHORTTAG_W L"p1"
#define WINDOWSAPPSDK_RELEASE_VERSION_SHORTTAG ""
#define WINDOWSAPPSDK_RELEASE_VERSION_SHORTTAG_W L""
#define WINDOWSAPPSDK_RELEASE_FORMATTED_VERSION_TAG "-preview1"
#define WINDOWSAPPSDK_RELEASE_FORMATTED_VERSION_TAG_W L"-preview1"
#define WINDOWSAPPSDK_RELEASE_FORMATTED_VERSION_TAG ""
#define WINDOWSAPPSDK_RELEASE_FORMATTED_VERSION_TAG_W L""
#define WINDOWSAPPSDK_RELEASE_FORMATTED_VERSION_SHORTTAG "-p1"
#define WINDOWSAPPSDK_RELEASE_FORMATTED_VERSION_SHORTTAG_W L"-p1"
#define WINDOWSAPPSDK_RELEASE_FORMATTED_VERSION_SHORTTAG ""
#define WINDOWSAPPSDK_RELEASE_FORMATTED_VERSION_SHORTTAG_W L""
// Runtime information
#define WINDOWSAPPSDK_RUNTIME_IDENTITY_PUBLISHER "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
@ -31,26 +31,26 @@
#define WINDOWSAPPSDK_RUNTIME_IDENTITY_PUBLISHERID "8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_IDENTITY_PUBLISHERID_W L"8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_VERSION_MAJOR 5000u
#define WINDOWSAPPSDK_RUNTIME_VERSION_MINOR 35u
#define WINDOWSAPPSDK_RUNTIME_VERSION_BUILD 2034u
#define WINDOWSAPPSDK_RUNTIME_VERSION_MAJOR 5001u
#define WINDOWSAPPSDK_RUNTIME_VERSION_MINOR 159u
#define WINDOWSAPPSDK_RUNTIME_VERSION_BUILD 55u
#define WINDOWSAPPSDK_RUNTIME_VERSION_REVISION 0u
#define WINDOWSAPPSDK_RUNTIME_VERSION_UINT64 0x1388002307F20000u
#define WINDOWSAPPSDK_RUNTIME_VERSION_DOTQUADSTRING "5000.35.2034.0"
#define WINDOWSAPPSDK_RUNTIME_VERSION_DOTQUADSTRING_W L"5000.35.2034.0"
#define WINDOWSAPPSDK_RUNTIME_VERSION_UINT64 0x1389009F00370000u
#define WINDOWSAPPSDK_RUNTIME_VERSION_DOTQUADSTRING "5001.159.55.0"
#define WINDOWSAPPSDK_RUNTIME_VERSION_DOTQUADSTRING_W L"5001.159.55.0"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_FRAMEWORK_PACKAGEFAMILYNAME "Microsoft.WindowsAppRuntime.1.5-preview1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_FRAMEWORK_PACKAGEFAMILYNAME_W L"Microsoft.WindowsAppRuntime.1.5-preview1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_MAIN_PACKAGEFAMILYNAME "MicrosoftCorporationII.WinAppRuntime.Main.1.5-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_MAIN_PACKAGEFAMILYNAME_W L"MicrosoftCorporationII.WinAppRuntime.Main.1.5-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_SINGLETON_PACKAGEFAMILYNAME "MicrosoftCorporationII.WinAppRuntime.Singleton-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_SINGLETON_PACKAGEFAMILYNAME_W L"MicrosoftCorporationII.WinAppRuntime.Singleton-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_X86_PACKAGEFAMILYNAME "Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x8-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_X86_PACKAGEFAMILYNAME_W L"Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x8-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_X64_PACKAGEFAMILYNAME "Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x6-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_X64_PACKAGEFAMILYNAME_W L"Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x6-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_ARM64_PACKAGEFAMILYNAME "Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-a6-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_ARM64_PACKAGEFAMILYNAME_W L"Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-a6-p1_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_FRAMEWORK_PACKAGEFAMILYNAME "Microsoft.WindowsAppRuntime.1.5_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_FRAMEWORK_PACKAGEFAMILYNAME_W L"Microsoft.WindowsAppRuntime.1.5_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_MAIN_PACKAGEFAMILYNAME "MicrosoftCorporationII.WinAppRuntime.Main.1.5_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_MAIN_PACKAGEFAMILYNAME_W L"MicrosoftCorporationII.WinAppRuntime.Main.1.5_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_SINGLETON_PACKAGEFAMILYNAME "MicrosoftCorporationII.WinAppRuntime.Singleton_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_SINGLETON_PACKAGEFAMILYNAME_W L"MicrosoftCorporationII.WinAppRuntime.Singleton_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_X86_PACKAGEFAMILYNAME "Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x8_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_X86_PACKAGEFAMILYNAME_W L"Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x8_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_X64_PACKAGEFAMILYNAME "Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x6_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_X64_PACKAGEFAMILYNAME_W L"Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x6_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_ARM64_PACKAGEFAMILYNAME "Microsoft.WinAppRuntime.DDLM.5001.159.55.0-a6_8wekyb3d8bbwe"
#define WINDOWSAPPSDK_RUNTIME_PACKAGE_DDLM_ARM64_PACKAGEFAMILYNAME_W L"Microsoft.WinAppRuntime.DDLM.5001.159.55.0-a6_8wekyb3d8bbwe"
#ifdef RC_INVOKED
// Only first 31 characters are significant for ResourceCompiler macro names (anything beyond that's silently ignored)
@ -65,23 +65,23 @@
// Release information
#define WAS_RELEASE_MAJOR 1
#define WAS_RELEASE_MINOR 5
#define WAS_RELEASE_PATCH 0
#define WAS_RELEASE_PATCH 1
#define WAS_RELEASE_MAJORMINOR 0x00010005
#define WAS_RELEASE_CHANNEL "preview"
#define WAS_RELEASE_CHANNEL_W L"preview"
#define WAS_RELEASE_CHANNEL "stable"
#define WAS_RELEASE_CHANNEL_W L"stable"
#define WAS_RELEASE_VERSION_TAG "preview1"
#define WAS_RELEASE_VERSION_TAG_W L"preview1"
#define WAS_RELEASE_VERSION_TAG ""
#define WAS_RELEASE_VERSION_TAG_W L""
#define WAS_RELEASE_VERSION_STAG "p1"
#define WAS_RELEASE_VERSION_STAG_W L"p1"
#define WAS_RELEASE_VERSION_STAG ""
#define WAS_RELEASE_VERSION_STAG_W L""
#define WAS_RELEASE_FMT_VERSION_TAG "-preview1"
#define WAS_RELEASE_FMT_VERSION_TAG_W L"-preview1"
#define WAS_RELEASE_FMT_VERSION_TAG ""
#define WAS_RELEASE_FMT_VERSION_TAG_W L""
#define WAS_RELEASE_FMT_VERSION_STAG "-p1"
#define WAS_RELEASE_FMT_VERSION_STAG_W L"-p1"
#define WAS_RELEASE_FMT_VERSION_STAG ""
#define WAS_RELEASE_FMT_VERSION_STAG_W L""
// Runtime information
#define WASR_IDENTITY_PUBLISHER "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US"
@ -89,26 +89,26 @@
#define WASR_IDENTITY_PUBLISHERID "8wekyb3d8bbwe"
#define WASR_IDENTITY_PUBLISHERID_W L"8wekyb3d8bbwe"
#define WASR_VERSION_MAJOR 5000
#define WASR_VERSION_MINOR 35
#define WASR_VERSION_BUILD 2034
#define WASR_VERSION_MAJOR 5001
#define WASR_VERSION_MINOR 159
#define WASR_VERSION_BUILD 55
#define WASR_VERSION_REVISION 0
#define WASR_VERSION_UINT64 0x1388002307F20000
#define WASR_VERSION_DOTQUADSTRING "5000.35.2034.0"
#define WASR_VERSION_DOTQUADSTRING_W L"5000.35.2034.0"
#define WASR_VERSION_UINT64 0x1389009F00370000
#define WASR_VERSION_DOTQUADSTRING "5001.159.55.0"
#define WASR_VERSION_DOTQUADSTRING_W L"5001.159.55.0"
#define WASR_PKG_FRAMEWORK_FAMILY "Microsoft.WindowsAppRuntime.1.5-preview1_8wekyb3d8bbwe"
#define WASR_PKG_FRAMEWORK_FAMILY_W L"Microsoft.WindowsAppRuntime.1.5-preview1_8wekyb3d8bbwe"
#define WASR_PKG_MAIN_FAMILY "MicrosoftCorporationII.WinAppRuntime.Main.1.5-p1_8wekyb3d8bbwe"
#define WASR_PKG_MAIN_FAMILY_W L"MicrosoftCorporationII.WinAppRuntime.Main.1.5-p1_8wekyb3d8bbwe"
#define WASR_PKG_SINGLETON_FAMILY "MicrosoftCorporationII.WinAppRuntime.Singleton-p1_8wekyb3d8bbwe"
#define WASR_PKG_SINGLETON_FAMILY_W L"MicrosoftCorporationII.WinAppRuntime.Singleton-p1_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_X86_FAMILY "Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x8-p1_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_X86_FAMILY_W L"Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x8-p1_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_X64_FAMILY "Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x6-p1_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_X64_FAMILY_W L"Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x6-p1_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_ARM64_FAMILY "Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-a6-p1_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_ARM64_FAMILY_W L"Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-a6-p1_8wekyb3d8bbwe"
#define WASR_PKG_FRAMEWORK_FAMILY "Microsoft.WindowsAppRuntime.1.5_8wekyb3d8bbwe"
#define WASR_PKG_FRAMEWORK_FAMILY_W L"Microsoft.WindowsAppRuntime.1.5_8wekyb3d8bbwe"
#define WASR_PKG_MAIN_FAMILY "MicrosoftCorporationII.WinAppRuntime.Main.1.5_8wekyb3d8bbwe"
#define WASR_PKG_MAIN_FAMILY_W L"MicrosoftCorporationII.WinAppRuntime.Main.1.5_8wekyb3d8bbwe"
#define WASR_PKG_SINGLETON_FAMILY "MicrosoftCorporationII.WinAppRuntime.Singleton_8wekyb3d8bbwe"
#define WASR_PKG_SINGLETON_FAMILY_W L"MicrosoftCorporationII.WinAppRuntime.Singleton_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_X86_FAMILY "Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x8_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_X86_FAMILY_W L"Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x8_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_X64_FAMILY "Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x6_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_X64_FAMILY_W L"Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x6_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_ARM64_FAMILY "Microsoft.WinAppRuntime.DDLM.5001.159.55.0-a6_8wekyb3d8bbwe"
#define WASR_PKG_DDLM_ARM64_FAMILY_W L"Microsoft.WinAppRuntime.DDLM.5001.159.55.0-a6_8wekyb3d8bbwe"
#endif
#ifdef __cplusplus
@ -125,25 +125,25 @@ namespace Microsoft::WindowsAppSDK
constexpr uint16_t Minor = 5;
/// The patch version of the Windows App SDK release.
constexpr uint16_t Patch = 0;
constexpr uint16_t Patch = 1;
/// The major and minor version of the Windows App SDK release, encoded as a uint32_t (0xMMMMNNNN where M=major, N=minor).
constexpr uint32_t MajorMinor = 0x00010005;
/// The Windows App SDK release's channel; for example, "preview", or empty string for stable.
constexpr PCWSTR Channel = L"preview";
constexpr PCWSTR Channel = L"stable";
/// The Windows App SDK release's version tag; for example, "preview2", or empty string for stable.
constexpr PCWSTR VersionTag = L"preview1";
constexpr PCWSTR VersionTag = L"";
/// The Windows App SDK release's short-form version tag; for example, "p2", or empty string for stable.
constexpr PCWSTR VersionShortTag = L"p1";
constexpr PCWSTR VersionShortTag = L"";
/// The Windows App SDK release's version tag, formatted for concatenation when constructing identifiers; for example, "-preview2", or empty string for stable.
constexpr PCWSTR FormattedVersionTag = L"-preview1";
constexpr PCWSTR FormattedVersionTag = L"";
/// The Windows App SDK release's short-form version tag, formatted for concatenation when constructing identifiers; for example, "-p2", or empty string for stable.
constexpr PCWSTR FormattedVersionShortTag = L"-p1";
constexpr PCWSTR FormattedVersionShortTag = L"";
}
/// Build-time constants for the Windows App SDK runtime
@ -161,22 +161,22 @@ namespace Microsoft::WindowsAppSDK
namespace Version
{
/// The major version of the Windows App SDK runtime; for example, 1000.
constexpr uint16_t Major = 5000;
constexpr uint16_t Major = 5001;
/// The minor version of the Windows App SDK runtime; for example, 446.
constexpr uint16_t Minor = 35;
constexpr uint16_t Minor = 159;
/// The build version of the Windows App SDK runtime; for example, 804.
constexpr uint16_t Build = 2034;
constexpr uint16_t Build = 55;
/// The revision version of the Windows App SDK runtime; for example, 0.
constexpr uint16_t Revision = 0;
/// The version of the Windows App SDK runtime, as a uint64l for example, 0x03E801BE03240000.
constexpr uint64_t UInt64 = 0x1388002307F20000;
constexpr uint64_t UInt64 = 0x1389009F00370000;
/// The version of the Windows App SDK runtime, as a string (const wchar_t*); for example, "1000.446.804.0".
constexpr PCWSTR DotQuadString = L"5000.35.2034.0";
constexpr PCWSTR DotQuadString = L"5001.159.55.0";
}
namespace Packages
@ -184,34 +184,34 @@ namespace Microsoft::WindowsAppSDK
namespace Framework
{
/// The Windows App SDK runtime's Framework package's family name.
constexpr PCWSTR PackageFamilyName = L"Microsoft.WindowsAppRuntime.1.5-preview1_8wekyb3d8bbwe";
constexpr PCWSTR PackageFamilyName = L"Microsoft.WindowsAppRuntime.1.5_8wekyb3d8bbwe";
}
namespace Main
{
/// The Windows App SDK runtime's Main package's family name.
constexpr PCWSTR PackageFamilyName = L"MicrosoftCorporationII.WinAppRuntime.Main.1.5-p1_8wekyb3d8bbwe";
constexpr PCWSTR PackageFamilyName = L"MicrosoftCorporationII.WinAppRuntime.Main.1.5_8wekyb3d8bbwe";
}
namespace Singleton
{
/// The Windows App SDK runtime's Singleton package's family name.
constexpr PCWSTR PackageFamilyName = L"MicrosoftCorporationII.WinAppRuntime.Singleton-p1_8wekyb3d8bbwe";
constexpr PCWSTR PackageFamilyName = L"MicrosoftCorporationII.WinAppRuntime.Singleton_8wekyb3d8bbwe";
}
namespace DDLM
{
namespace X86
{
/// The Windows App SDK runtime's Dynamic Dependency Lifetime Manager (DDLM) package's family name, for x86.
constexpr PCWSTR PackageFamilyName = L"Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x8-p1_8wekyb3d8bbwe";
constexpr PCWSTR PackageFamilyName = L"Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x8_8wekyb3d8bbwe";
}
namespace X64
{
/// The Windows App SDK runtime's Dynamic Dependency Lifetime Manager (DDLM) package's family name, for x64.
constexpr PCWSTR PackageFamilyName = L"Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-x6-p1_8wekyb3d8bbwe";
constexpr PCWSTR PackageFamilyName = L"Microsoft.WinAppRuntime.DDLM.5001.159.55.0-x6_8wekyb3d8bbwe";
}
namespace Arm64
{
/// The Windows App SDK runtime's Dynamic Dependency Lifetime Manager (DDLM) package's family name, for arm64.
constexpr PCWSTR PackageFamilyName = L"Microsoft.WinAppRuntime.DDLM.5000.35.2034.0-a6-p1_8wekyb3d8bbwe";
constexpr PCWSTR PackageFamilyName = L"Microsoft.WinAppRuntime.DDLM.5001.159.55.0-a6_8wekyb3d8bbwe";
}
}
}

View File

@ -141,6 +141,7 @@
/*
*
* Typedef of Windows.Graphics.DirectX.DirectXAlphaMode
@ -433,6 +434,7 @@ ABI_NAMESPACE_END
/*
*
* Typedef of Windows.Graphics.DirectX.DirectXAlphaMode

View File

@ -2,7 +2,7 @@
"swift-winrt": "0.5.0",
"package": {
"id": "Microsoft.WindowsAppSDK",
"version": "1.5.240205001-preview1"
"version": "1.5.240607001"
},
"project": "WinAppSDK",
"dependencies": [