Incorporate PR feedback-1

Author: Santosh Chintalapati

specs/Deployment/DeploymentAPI.md

@@ -3,67 +3,62 @@
 This is the spec for proposal
 [Windows App Runtime Deployment API #1240](https://github.com/microsoft/WindowsAppSDK/issues/1240).
 
-The Windows App SDK (WinAppSDK) for packaged apps involves the framework, main, and singleton
-packages, which are all signed and published by Microsoft. The framework package contains the
-WinAppSDK binaries used at run time, and it is installed with the application. The main package
-contains out-of-process services that are brokered between apps, such as Dynamic Dependency data
-store, and it is also needed for the framework to be serviced by the Microsoft Store. The singleton
-package supports a single long-running process that is brokered between apps for features like push
-notifications.
-
-Currently, packaged apps can only declare dependencies on WinAppSDK framework package. In order to
-get the other WinAppSDK packages (main, singleton) deployed, the packaged apps can use the mechanism
+The Windows App SDK (WinAppSDK) for packaged apps involves the Framework, Main, and Singleton
+packages, which are all signed and published by Microsoft.
+
+Currently, packaged apps can only declare dependencies on WinAppSDK Framework package. In order to
+get the other WinAppSDK packages (Main, Singleton) deployed, the packaged apps can use the mechanism
 described here as part of their first-run experience.
 
 > **Note that in Windows App SDK version 1.0**, only unpackaged apps that are full trust or MSIX
 > packaged apps that have the packageManagement restricted capability have the permission to use the
-> Deployment API to install the main and singleton package dependencies. Support for partial trust
-> MSIX packaged apps will be coming in later releases. Additionally, support for main and singleton
+> Deployment API to install the Main and Singleton package dependencies. Support for partial trust
+> MSIX packaged apps will be coming in later releases. Additionally, support for Main and Singleton
 > package deployment through the Microsoft Store will be coming in later releases.
 
 # Description
 
 When a packaged app using the WinAppSDK is deployed from the Store, it will be installed with the
-application's main package and the WinAppSDK framework package. The WinAppSDK main and singleton
+application's Main package and the WinAppSDK Framework package. The WinAppSDK Main and Singleton
 packages may not already be present on the system, or may not be at the version required by the
-application. The Deployment API enables a developer to check when the required WinAppSDK main and
-singleton packages are missing and get them installed.
+application. The Deployment API enables a developer to check when the required WinAppSDK Main and
+Singleton packages are missing and get them installed.
 
-Since the Deployment API is part of the WinAppSDK framework package, the framework itself must be
-present to use the API. To deploy the WinAppSDK framework package with the MSIX packaged
-application, the framework must be declared as a dependency in the application manifest with a min
-version specified. For instructions on deploying the framework package, see the
-[developer docs](https://docs.microsoft.com/windows/apps/windows-app-sdk/deploy-packaged-apps#deploy-the-windows-app-sdk-framework-package).
+Since the Deployment API is part of the WinAppSDK Framework package, the Framework itself must be
+present to use the API. To deploy the WinAppSDK Framework package with the MSIX packaged
+application, the Framework must be declared as a dependency in the application manifest with a min
+version specified. For instructions on deploying the Framework package, see the
+[developer docs](https://docs.microsoft.com/windows/apps/windows-app-sdk/deploy-packaged-apps#deploy-the-windows-app-sdk-Framework-package).
 
-If a developer prefers to have the Microsoft Store automatically service the WinAppSDK framework
-package and if features like push notifications are desired, then the WinAppSDK main and singleton
-should also be deployed. Developers must not assume that the WinAppSDK main and singleton packages
-are already present on the system, or that the version present is the minimum version required by
-the application. Instead, the Deployment API should be used to validate that the WinAppSDK is at the
-correct version and that all required packages are present.
+If a developer prefers to have the Microsoft Store automatically service the WinAppSDK Framework
+package and if features like dynamic dependencies, push notifications are desired, then the
+WinAppSDK Main and Singleton should also be deployed. Developers must not assume that the WinAppSDK
+Main and Singleton packages are already present on the system, or that the version present is the
+minimum version required by the application. Instead, the Deployment API should be used to validate
+that the WinAppSDK is at the correct version and that all required packages are present.
 
-The Deployment API addresses the following three developer scenarios:
+The Deployment API addresses the following developer scenarios:
 
-1. Does this system have the min version of the WinAppSDK main and singleton packages required by my
+1. Does this system have the min version of the WinAppSDK Main and Singleton packages required by my
    app?
-2. How do I install the WinAppSDK main and singleton packages, if they are not already present on
+2. How do I install the WinAppSDK Main and Singleton packages, if they are not already present on
    the system?
-3. How do I repair the already installed WinAppSDK main and singleton pacakges, if needed ?
+3. How do I repair the already installed WinAppSDK Main and Singleton packages, if needed ?
 
 The API addresses #1 by a simple query of the version needed and a check for OS updates.
 
-#2 has two possible answers.
+#2 has the following two possible answers.
 
--   First, the developer can install these packages directly through the app, if possible. These
-    MSIX packages can be acquired through
+-   The developer can install these packages directly through the app, if possible. These MSIX
+    packages can be acquired through
     [Downloads page](https://docs.microsoft.com/windows/apps/windows-app-sdk/downloads).
 -   Alternatively, unpackaged apps that are full trust or MSIX packaged apps that have the
     packageManagement restricted capability can use the Deployment API to get these packages
     installed.
 
-#3 has two possible answers.
+#3 has the following two possible answers.
 
--   First, the developer can repair these packages directly through the app by reinstalling them, if
+-   The developer can repair these packages directly through the app by reinstalling them, if
     possible. These MSIX packages can be acquired through
     [Downloads page](https://docs.microsoft.com/windows/apps/windows-app-sdk/downloads).
 -   Alternatively, unpackaged apps that are full trust or MSIX packaged apps that have the
@@ -74,12 +69,12 @@ The API addresses #1 by a simple query of the version needed and a check for OS
 ## GetStatus
 
 This is the means by which an app or program can call to verify that all required WinAppSDK packages
-are present to a minimum version needed by the framework loaded with the app. A process should call
+are present to a minimum version needed by the Framework loaded with the app. A process should call
 GetStatus() after process initialization and before using Windows App Runtime content (e.g. in
-main() or WinMain()).
+Main() or WinMain()).
 
 Developers call this method without parameters, as all information about the version, channel, and
-architecture are derived from the current framework package loaded.
+architecture are derived from the current Framework package loaded.
 
 ```C#
     DeploymentResult result = DeploymentManager.GetStatus();
@@ -98,15 +93,17 @@ architecture are derived from the current framework package loaded.
 
 ## Initialize
 
-This API performs a status check, and if the main and/or singleton packages are missing or not at
+This API performs a status check, and if the Main and/or Singleton packages are missing or not at
 the required version, it will attempt to deploy those packages and get the WindowsAppRuntime into an
 OK state. All information about the version, channel, and architecture needed are derived from the
-current WinAppSDK framework package.
-
-Since both the main _and_ the singleton packages may need to be installed, it is possible that one
-package is installed successfully but not the other. If so, the returned WindowsAppRuntimeStatus
-will contain the error, if one occurs during package install. There will be no rollback of any
-successfully installed packages. See the
+current WinAppSDK Framework package.
+
+Since both the Main _and_ the Singleton packages may need to be installed, it is possible that Main
+package install has failed and Initialize returns with PackageInstallFailed state (OR) it is
+possible that Main package is installed successfully but the Singleton package Install has failed
+and Initialize returns with PackageInstallFailed state. In both cases, the returned
+WindowsAppRuntimeStatus will contain the error of first package install failure. There will be no
+rollback of any successfully installed packages. See the
 [developer docs](https://docs.microsoft.com/windows/apps/windows-app-sdk/deploy-packaged-apps#address-installation-errors)
 for instructions on how to handle errors.
 
@@ -115,9 +112,10 @@ concern to some developers. To address these concerns, developers can instead ca
 and verify that the required packages are missing. If so, then call Initialize() on another thread
 to handle the time delay more elegantly.
 
-Once the main and singleton packages have been deployed, they generally do not need to be deployed
-again. If a user were to remove the main or singleton package, the API can be used to reinstall them
-again.
+Once the Main and Singleton packages have been deployed, they generally do not need to be deployed
+again. If a user were to remove the Main or Singleton package, the API can be used to reinstall them
+again. If there is anything wrong with installed Main and Singleton packages, use Repair API to try
+and repair them.
 
 ```C#
     if (DeploymentManager.GetStatus().Status != DeploymentStatus.Ok)
@@ -133,7 +131,7 @@ again.
         // Check the result.
         if (initializeTask.Result.Status != DeploymentStatus.Ok)
         {
-            // The WindowsAppRuntime is in a bad state which Initialize() did not fix.
+            // The Initialize() has failed.
             // Do error reporting or gather information for submitting a bug.
             // Gracefully exit the program or carry on without using the WindowsAppRuntime.
         }
@@ -152,13 +150,13 @@ by using DeploymentInitializeOptions object and setting ForceDeployment option b
 this API. This option when set will shut down the application(s) associated with WinAppSDK packages,
 update the WinAppSDK packages and restart the application(s).
 
-If this option is set when updating singleton package, then the out of process com server from the
-singleton package such as push Notifications is explicitly restarted.
+If this option is set when updating Singleton package, then the out of process com server from the
+Singleton package such as push Notifications is explicitly restarted.
 
-When the API is updating framework package and ForceDeployment option is set, then all dependent
+When the API is updating Framework package and ForceDeployment option is set, then all dependent
 packages that are NOT currently in use will be immediately re-installed to refer to the updated
-framework package and all dependent packages that are currently in use will be re-installed, after
-they shut down, to refer to the updated framework package.
+Framework package and all dependent packages that are currently in use will be re-installed, after
+they shut down, to refer to the updated Framework package.
 
 ```C#
     if (DeploymentManager.GetStatus().Status != DeploymentStatus.Ok)
@@ -179,7 +177,7 @@ they shut down, to refer to the updated framework package.
         // Check the result.
         if (initializeTask.Result.Status != DeploymentStatus.Ok)
         {
-            // The WindowsAppRuntime is in a bad state which Initialize() did not fix.
+            // The Initialize() has failed.
             // Do error reporting or gather information for submitting a bug.
             // Gracefully exit the program or carry on without using the WindowsAppRuntime.
         }
@@ -188,19 +186,26 @@ they shut down, to refer to the updated framework package.
 
 ## Repair
 
-This API performs a status check, and if the main and singleton packages are already installed at
-the required version, it will attempt to repair those packages. All information about the version,
-channel, and architecture needed are derived from the current WinAppSDK framework package.
-
-Since both the main _and_ the singleton packages may need to be repaired, it is possible that one
-package is repaired successfully but not the other. If so, the returned WindowsAppRuntimeStatus will
-contain the error, if one occurs during package install.
+This API performs a status check, and if the Main and Singleton packages are both already installed
+at the required version (i.e. when GetStatus returns OK status), it will attempt to repair those
+packages. All information about the version, channel, and architecture needed are derived from the
+current WinAppSDK Framework package.
+
+Since both the Main _and_ the Singleton packages will be repaired, it is possible that Main package
+repair has failed and Initialize returns with PackageRepairFailed status (OR) it is possible that
+Main package is repaired successfully but the Singleton package repair has failed and Initialize
+returns with repair has failed and Initialize returns with PackageRepairFailed status (OR) it is
+possible that status. In both cases, the returned WindowsAppRuntimeStatus will contain the error of
+first package repair failure. There will be no rollback of any successfully repaired packages. See
+the
+[developer docs](https://docs.microsoft.com/windows/apps/windows-app-sdk/deploy-packaged-apps#address-installation-errors)
+for instructions on how to handle errors.
 
 ```C#
-    if (DeploymentManager.GetStatus().Status != DeploymentStatus.Ok)
+    if (DeploymentManager.GetStatus().Status == DeploymentStatus.Ok)
     {
         // Repair does a status check, and if the status is OK it will attempt to get
-        // the WindowsAppRuntime into a good state by deploying packages. Unlike a simple
+        // the WindowsAppRuntime into a good state by re-deploying packages. Unlike a simple
         // status check, Repair can sometimes take several seconds to deploy the packages.
         // These should be run on a separate thread so as not to hang your app while the
         // packages deploy.
@@ -210,7 +215,7 @@ contain the error, if one occurs during package install.
         // Check the result.
         if (repairTask.Result.Status != DeploymentStatus.Ok)
         {
-            // The WindowsAppRuntime is in a bad state which Repair() did not fix.
+            // The Repair() has failed.
             // Do error reporting or gather information for submitting a bug.
             // Gracefully exit the program or carry on without using the WindowsAppRuntime.
         }
@@ -226,13 +231,14 @@ namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime
     apicontract DeploymentContract{};
 
     /// Represents the current Deployment status of the WindowsAppRuntime
-    [contract(DeploymentContract, 1)]
+    [contract(DeploymentContract, 3)]
     enum DeploymentStatus
     {
         Unknown = 0,
         Ok,
         PackageInstallRequired,
         PackageInstallFailed,
+        PackageRepairFailed,
     };
 
     /// Represents the result of a Deployment Manager method.
@@ -256,7 +262,7 @@ namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime
         DeploymentInitializeOptions();
 
         /// Gets or sets a value that indicates whether the processes associated with the
-        /// WindowsAppSDK main and singleton packages will be shut down forcibly if they are
+        /// WindowsAppSDK Main and Singleton packages will be shut down forcibly if they are
         /// currently in use, when registering the WinAppSDK packages.
         Boolean ForceDeployment;
     };