diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj index 821ac6844e..406f392759 100644 --- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj +++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Microsoft.Windows.ApplicationModel.Resources.vcxproj @@ -179,7 +179,7 @@ - + @@ -193,6 +193,6 @@ - + diff --git a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/packages.config b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/packages.config index 4f351d3d3b..bd2ea1ddc8 100644 --- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/packages.config +++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/packages.config @@ -1,7 +1,7 @@  - + diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj b/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj index fd847841a8..b1cf7b689d 100644 --- a/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj +++ b/dev/PushNotifications/PushNotificationsLongRunningTask/PushNotificationsLongRunningTask.vcxproj @@ -260,7 +260,7 @@ - + @@ -275,6 +275,6 @@ - + \ No newline at end of file diff --git a/dev/PushNotifications/PushNotificationsLongRunningTask/packages.config b/dev/PushNotifications/PushNotificationsLongRunningTask/packages.config index 41455a8585..14339def1b 100644 --- a/dev/PushNotifications/PushNotificationsLongRunningTask/packages.config +++ b/dev/PushNotifications/PushNotificationsLongRunningTask/packages.config @@ -1,7 +1,7 @@  - + diff --git a/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj b/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj index c4eaba044f..27d9b18009 100644 --- a/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj +++ b/dev/WindowsAppRuntime_DLL/WindowsAppRuntime_DLL.vcxproj @@ -408,7 +408,7 @@ - + @@ -426,7 +426,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/dev/WindowsAppRuntime_DLL/packages.config b/dev/WindowsAppRuntime_DLL/packages.config index 7184738d08..6cd943400e 100644 --- a/dev/WindowsAppRuntime_DLL/packages.config +++ b/dev/WindowsAppRuntime_DLL/packages.config @@ -1,7 +1,7 @@  - + diff --git a/specs/AppLifecycle/StateNotifications/AppLifecycle StateNotifications.md b/specs/AppLifecycle/StateNotifications/AppLifecycle StateNotifications.md index 7580b50666..89ae32e945 100644 --- a/specs/AppLifecycle/StateNotifications/AppLifecycle StateNotifications.md +++ b/specs/AppLifecycle/StateNotifications/AppLifecycle StateNotifications.md @@ -247,7 +247,7 @@ In addition, the PowerRegisterForEffectivePowerModeNotifications API is brought | Existing API | Description | New property and event | | -------------------------------------------------------- | --------------------------------------- | ----------------------------------------------- | -| PowerRegisterForEffectivePowerModeNotifications function | The effective power mode of the system. | `EffectivePowerMode, EffectivePowerModeChanged` | +| PowerRegisterForEffectivePowerModeNotifications function | The effective power mode of the system. Note: while the new API does include an additional EffectivePowerMode property, this should not be used: use EffectivePowerMode2 instead. | `EffectivePowerMode2, EffectivePowerModeChanged` | The existing PowerManager class exposes only static properties and events: all members are valid to be brought over to the Windows App SDK version. Many existing enumerated values are brought over as-is as @@ -347,6 +347,7 @@ namespace Microsoft.Windows.System.Power static event Windows.Foundation.EventHandler SystemIdleStatusChanged; static Windows.Foundation.IAsyncOperation EffectivePowerMode{ get; }; + static EffectivePowerMode EffectivePowerMode2{ get; }; static event Windows.Foundation.EventHandler EffectivePowerModeChanged; static UserPresenceStatus UserPresenceStatus{ get; }; diff --git a/specs/Deployment/MSIXPackageVersioning.md b/specs/Deployment/MSIXPackageVersioning.md index 3693963cf1..957cf2a73f 100644 --- a/specs/Deployment/MSIXPackageVersioning.md +++ b/specs/Deployment/MSIXPackageVersioning.md @@ -81,9 +81,9 @@ for more details. Windows App SDK 1.0 has 4 MSIX packages * `Microsoft.WindowsAppRuntime` aka **WARfwk** -* `Microsoft.WindowsAppRuntime.Main` aka **WARmain** +* `MicrosoftCorporationII.WinAppRuntime.Main` aka **WARmain** * `Microsoft.WindowsAppRuntime.Singleton` aka **WARsingleton** -* `Microsoft.WindowsAppRuntime.DDLM` aka **WARddlm** +* `Microsoft.WinAppRuntime.DDLM` aka **WARddlm** WARsingleton supplements WARmain to provide a mechanism for features needing singular global behavior across all versions of Windows App SDK. See [Windows App SDK: MSIX Packages](https://github.com/microsoft/WindowsAppSDK/blob/main/specs/Deployment/MSIXPackage.md) @@ -393,12 +393,18 @@ MinVersion Windows App SDK 0.8+ has 3 MSIX packages. We have choices for package Name patterns for 0.8 and 1.x. Assuming Breaking Change Boundary for v0.x and v1+'s decision are `Major.Minor` version we have the -following naming patterns... +following naming patterns release 0.x... * WARfwk: `Microsoft.WindowsAppRuntime..[-tag]` * WARmain: `Microsoft.WindowsAppRuntime.Main..[-tag]` * WARddlm: `Microsoft.WindowsAppRuntime.DDLM....-[-shorttag]` +and release 1.x... + +* WARfwk: `Microsoft.WindowsAppRuntime..[-tag]` +* WARmain: `MicrosoftCorporationII.WinAppRuntime.Main..[-shorttag]` +* WARddlm: `Microsoft.WinAppRuntime.DDLM....-[-shorttag]` + where * rmajor = Major version number of the project release, base-10, no leading zeros (e.g. "1" for WindowsAppSDK 1.2) @@ -429,21 +435,21 @@ This leads to package Name length issues even for common cases: |WARfwk |Microsoft.WindowsAppRuntime.1.15-preview1|41| |WARmain|Microsoft.WindowsAppRuntime.Main.1.15-preview1|46| |WARmain|Microsoft.WindowsAppRuntime.Singleton-preview1|46| -|WARddlm|Microsoft.WindowsAppRuntime.DDLM.1.15.12345.24680-arm64-preview1|**64**| +|WARddlm|Microsoft.WinAppRuntime.DDLM.1.15.12345.24680-arm64-preview1|**64**| |Package|Min|MinLength| | --- | :--- | :---: | |WARfwk |Microsoft.WindowsAppRuntime.1.0-preview1|40| |WARmain|Microsoft.WindowsAppRuntime.Main.1.0-preview1|45| |WARmain|Microsoft.WindowsAppRuntime.Singleton-preview1|46| -|WARddlm|Microsoft.WindowsAppRuntime.DDLM.1.0.0.0-arm64-preview1|**52**| +|WARddlm|Microsoft.WinAppRuntime.DDLM.1.0.0.0-arm64-preview1|**52**| |Package|Max|MaxLength| | --- | :--- | :---: | |WARfwk |Microsoft.WindowsAppRuntime.65535.65535-preview1|48| -|WARmain|Microsoft.WindowsAppRuntime.Main.65535.65535-preview1|**60**| +|WARmain|Microsoft.WindowsAppRuntime.Main.65535.65535-preview1|53| |WARmain|Microsoft.WindowsAppRuntime.Singleton-preview1|46| -|WARddlm|Microsoft.WindowsAppRuntime.DDLM.65535.65535.65535.65535-arm64-preview1|**71**| +|WARddlm|Microsoft.WinAppRuntime.DDLM.65535.65535.65535.65535-arm64-preview1|**71**| Possible options we can use to shorten package Name: @@ -451,8 +457,8 @@ Possible options we can use to shorten package Name: * Dictate max values e.g. Major=0-99 * Encode values as base-16 * Replace -channel with a shorter string e.g. replace "-preview" with "-pre", "-p", "p" -* Encode the channel name in the delimiter between name+version e.g. Microsoft.WindowsAppRuntime.DDLM.preview1.1.0.0.0-arm64 -* Encode tag in the delimiter between version+architecture e.g. Microsoft.WindowsAppRuntime.DDLM.1.0.0.0p1arm64 using P1 for Preview1, E1=Experimental1, ... +* Encode the channel name in the delimiter between name+version e.g. Microsoft.WinAppRuntime.DDLM.preview1.1.0.0.0-arm64 +* Encode tag in the delimiter between version+architecture e.g. Microsoft.WinAppRuntime.DDLM.1.0.0.0p1arm64 using P1 for Preview1, E1=Experimental1, ... * Name WARddlm differently from WARfwk and WARmain e.g. use "-p1" for WARddlm regardless if WARfwk and WARmain use "-preview1" * ??? @@ -469,10 +475,10 @@ Windows App SDK 0.8 will use package Names of... * WARfwk: `Microsoft.WindowsAppRuntime..[-tag]` * WARmain: `Microsoft.WindowsAppRuntime.Main..[-tag]` * WARsingleton: `Microsoft.WindowsAppRuntime.Singleton[-tag]` -* WARddlm: `Microsoft.WindowsAppRuntime.DDLM....-[-shorttag]` +* WARddlm: `Microsoft.WinAppRuntime.DDLM....-[-shorttag]` Using Decision 5: Version Encoding = Option D (NPPP.E.B.0) WARddlm's maximum package Name length is -`Microsoft.WindowsAppRuntime.DDLM.1714.3944.123.24680-arm64-p3` = 58 characters. This can be reduced +`Microsoft.WinAppRuntime.DDLM.1714.3944.123.24680-arm64-p3` = 58 characters. This can be reduced with the following rules: * Major version <= 99 @@ -508,7 +514,7 @@ i.e. format encoding `NPPP.E.B.0`. See length constraints. The specific packages Names in Windows App SDK 1.0: * WARfwk: `Microsoft.WindowsAppRuntime..[-tag]` -* WARmain: `Microsoft.WindowsAppRuntime.Main..[-tag]` +* WARmain: `MicrosoftCorporationII.WinAppRuntime.Main..[-shorttag]` * WARmain: `Microsoft.WindowsAppRuntime.Singleton[-tag]` * WARddlm: `Microsoft.WinAppRuntime.DDLM....-[-shorttag]` diff --git a/specs/Deployment/MSIXPackages.md b/specs/Deployment/MSIXPackages.md index 94122c064f..e5060717a0 100644 --- a/specs/Deployment/MSIXPackages.md +++ b/specs/Deployment/MSIXPackages.md @@ -7,8 +7,9 @@ - [2.1.4. Dynamic Dependency Lifetime Manager (DDLM)](#214-dynamic-dependency-lifetime-manager-ddlm) - [3. Package Naming](#3-package-naming) - [3.1. Package Naming - SubName](#31-package-naming---subname) - - [3.2. Package Naming - Singleton](#32-package-naming---singleton) - - [3.3. Package Naming - DDLM](#33-package-naming---ddlm) + - [3.2. Package Naming - Singleton](#32-package-naming---main) + - [3.3. Package Naming - Singleton](#33-package-naming---singleton) + - [3.4. Package Naming - DDLM](#34-package-naming---ddlm) - [4. Package Versioning](#4-package-versioning) # 1. Background @@ -110,9 +111,9 @@ SDK 1.0, 1.1 and 2.0 (Stable) are installed on an x86 system, the user will have * Microsoft.WindowsAppRuntime.1.0 * Microsoft.WindowsAppRuntime.1.1 * Microsoft.WindowsAppRuntime.2.0 -* Microsoft.WindowsAppRuntime.Main.1.0 -* Microsoft.WindowsAppRuntime.Main.1.1 -* Microsoft.WindowsAppRuntime.Main.2.0 +* MicrosoftCorporationII.WinAppRuntime.Main.1.0 +* MicrosoftCorporationII.WinAppRuntime.Main.1.1 +* MicrosoftCorporationII.WinAppRuntime.Main.2.0 * Microsoft.WindowsAppRuntime.Singleton (version 2.0) * Microsoft.WinAppRuntime.DDLM.0.146.711.0-x8 * Microsoft.WinAppRuntime.DDLM.1000.328.1510.0-x8 @@ -159,11 +160,24 @@ The following SubName values are used: | SubName | Package | Example | |-|-|-| | | Framework | Microsoft.WindowsAppRuntime.1.0-experimental1 | -| Main | Main | Microsoft.WindowsAppRuntime.Main.1.0-experimental1 | +| Main | Main | MicrosoftCorporationII.WinAppRuntime.Main.1.0-e1 | | Singleton | Singleton | Microsoft.WindowsAppRuntime.Singleton-experimental1 | -| DDLM | Dynamic Dependency Lifetime Manager (DDLM) | Microsoft.WinAppRuntime.DDLM.7.3944.123.1-x6-e1 | +| DDLM | Dynamic Dependency Lifetime Manager (DDLM) | Microsoft.WinAppRuntime.DDLM.0.146.711.0-x6-e1 | -## 3.2. Package Naming - Singleton +## 3.2. Package Naming - Main + +The Main package follows a different naming scheme + +* Name = MicrosoftCcorporationII.WinAppRuntime.Main.\[-ShortVersionTag] + +where + +* ReleaseMajorMinor = project release major.minor version number. See the [MSIX Package Versioning](https://github.com/microsoft/WindowsAppSDK/blob/main/specs/deployment/MSIXPackageVersioning.md) for more details. +* ShortVersionTag = short form of the VersionTag + +ShortVersionTag is derived from a VersionTag by combining the 1st letter and the last digit (if any) for non-Stable channels (ShortVeresionTag is blank for the Stable channel, just like VersionTag). + +## 3.3. Package Naming - Singleton The Singleton package follows a different naming scheme @@ -176,7 +190,7 @@ compared to other package Names, lacking any version information. See [2.1.3. Role - Singleton](#213-role---singleton) for more information. -## 3.3. Package Naming - DDLM +## 3.4. Package Naming - DDLM DDLM packages follow a different naming scheme