Incorporate API Review feedback (#2957)

microsoft · Sep 12, 2022 · 4f3eabf · 4f3eabf
1 parent f223404
commit 4f3eabf
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 170 deletions.
diff --git a/build/NuSpecs/Microsoft.WindowsAppSDK.DeploymentManager.CS.targets b/build/NuSpecs/Microsoft.WindowsAppSDK.DeploymentManager.CS.targets
@@ -3,11 +3,7 @@
     <PropertyGroup>
         <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_Default)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_DEFAULT</DefineConstants>
         <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_None)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_NONE</DefineConstants>
-        <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnError_DebugBreak)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK</DefineConstants>
-        <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnError_DebugBreak_IfDebuggerAttached)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED</DefineConstants>
-        <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnError_FailFast)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST</DefineConstants>
-        <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnNoMatch_ShowUI)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONNOMATCH_SHOWUI</DefineConstants>
-        <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnPackageIdentity_NoOp)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONPACKAGEIDENTITY_NOOP</DefineConstants>
+        <DefineConstants Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnErrorShowUI)'=='true'">$(DefineConstants);MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERRORSHOWUI</DefineConstants>
     </PropertyGroup>
 
     <Target Name="GenerateDeploymentManagerCS" BeforeTargets="BeforeCompile">

diff --git a/build/NuSpecs/Microsoft.WindowsAppSDK.DeploymentManagerCommon.targets b/build/NuSpecs/Microsoft.WindowsAppSDK.DeploymentManagerCommon.targets
@@ -4,18 +4,7 @@
 
     <PropertyGroup Condition="'$(WindowsAppSdkDeploymentManagerInitialize)'=='' and '$(WindowsAppSDKSelfContained)'!='true' and '$(WindowsPackageType)'=='None' and ('$(OutputType)'=='Exe' or '$(OutputType)'=='Winexe')">
         <!--Allows GenerateDeploymentManagerCS/GenerateDeploymentManagerCpp to run-->
-<!--
-    TODO Uncomment when ready to enable default
-    Franken-builds giving weird results after way too much manual hackery
-    so can't get a reliable read on if it's good or what's wrong. Enable
-    it all but inert unless explicitly requested (which no one does today)
-    to have viable packages for testing.
         <WindowsAppSdkDeploymentManagerInitialize>true</WindowsAppSdkDeploymentManagerInitialize>
--->
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(WindowsAppSdkDeploymentManagerInitialize)'== 'true'">
-        <PublishAppxPackage>false</PublishAppxPackage>
     </PropertyGroup>
 
 </Project>
diff --git a/build/NuSpecs/WindowsAppSDK-Nuget-Native.DeploymentManager.targets b/build/NuSpecs/WindowsAppSDK-Nuget-Native.DeploymentManager.targets
@@ -6,11 +6,7 @@
                 <PrecompiledHeader>NotUsing</PrecompiledHeader>
                 <PreprocessorDefinitions Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_Default)'=='true'">MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_DEFAULT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
                 <PreprocessorDefinitions Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_None)'=='true'">MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_NONE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                <PreprocessorDefinitions Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnError_DebugBreak)'=='true'">MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                <PreprocessorDefinitions Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnError_DebugBreak_IfDebuggerAttached)'=='true'">MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                <PreprocessorDefinitions Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnError_FailFast)'=='true'">MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                <PreprocessorDefinitions Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnNoMatch_ShowUI)'=='true'">MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONNOMATCH_SHOWUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-                <PreprocessorDefinitions Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnPackageIdentity_NoOp)'=='true'">MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONPACKAGEIDENTITY_NOOP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+                <PreprocessorDefinitions Condition="'$(WindowsAppSDKDeploymentManagerAutoInitializeOptions_OnErrorShowUI)'=='true'">MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERRORSHOWUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
             </ClCompile>
         </ItemGroup>
     </Target>

diff --git a/dev/Deployment/Deployment.idl b/dev/Deployment/Deployment.idl
@@ -41,25 +41,9 @@ namespace Microsoft.Windows.ApplicationModel.WindowsAppRuntime
         /// currently in use, when registering the WinAppSDK packages.
         Boolean ForceDeployment;
 
-        /// If not successful call DebugBreak()
-        [contract(DeploymentContract, 3)]
-        Boolean OnError_DebugBreak;
-
-        /// If not successful call DebugBreak() if a debugger is attached to the process
-        [contract(DeploymentContract, 3)]
-        Boolean OnError_DebugBreak_IfDebuggerAttached;
-
-        /// If not successful perform a fail-fast
-        [contract(DeploymentContract, 3)]
-        Boolean OnError_FailFast;
-
         /// If not successful show UI
         [contract(DeploymentContract, 3)]
-        Boolean OnError_ShowUI;
-
-        /// Do nothing (do not error) if the process lacks package identity
-        [contract(DeploymentContract, 3)]
-        Boolean OnNoPackageIdentity_NOOP;
+        Boolean OnErrorShowUI;
     };
 
     /// Used to query deployment information for WindowsAppRuntime

diff --git a/dev/Deployment/DeploymentInitializeOptions.cpp b/dev/Deployment/DeploymentInitializeOptions.cpp
@@ -14,44 +14,12 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
     {
         m_ForceDeployment = value;
     }
-    bool DeploymentInitializeOptions::OnError_DebugBreak()
+    bool DeploymentInitializeOptions::OnErrorShowUI()
     {
-        return m_OnError_DebugBreak;
+        return m_OnErrorShowUI;
     }
-    void DeploymentInitializeOptions::OnError_DebugBreak(bool value)
+    void DeploymentInitializeOptions::OnErrorShowUI(bool value)
     {
-        m_OnError_DebugBreak = value;
-    }
-    bool DeploymentInitializeOptions::OnError_DebugBreak_IfDebuggerAttached()
-    {
-        return m_OnError_DebugBreak_IfDebuggerAttached;
-    }
-    void DeploymentInitializeOptions::OnError_DebugBreak_IfDebuggerAttached(bool value)
-    {
-        m_OnError_DebugBreak_IfDebuggerAttached = value;
-    }
-    bool DeploymentInitializeOptions::OnError_FailFast()
-    {
-        return m_OnError_FailFast;
-    }
-    void DeploymentInitializeOptions::OnError_FailFast(bool value)
-    {
-        m_OnError_FailFast = value;
-    }
-    bool DeploymentInitializeOptions::OnError_ShowUI()
-    {
-        return m_OnError_ShowUI;
-    }
-    void DeploymentInitializeOptions::OnError_ShowUI(bool value)
-    {
-        m_OnError_ShowUI = value;
-    }
-    bool DeploymentInitializeOptions::OnNoPackageIdentity_NOOP()
-    {
-        return m_OnNoPackageIdentity_NOOP;
-    }
-    void DeploymentInitializeOptions::OnNoPackageIdentity_NOOP(bool value)
-    {
-        m_OnNoPackageIdentity_NOOP = value;
+        m_OnErrorShowUI = value;
     }
 }
diff --git a/dev/Deployment/DeploymentInitializeOptions.h b/dev/Deployment/DeploymentInitializeOptions.h
@@ -13,24 +13,12 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
 
         bool ForceDeployment();
         void ForceDeployment(bool value);
-        bool OnError_DebugBreak();
-        void OnError_DebugBreak(bool value);
-        bool OnError_DebugBreak_IfDebuggerAttached();
-        void OnError_DebugBreak_IfDebuggerAttached(bool value);
-        bool OnError_FailFast();
-        void OnError_FailFast(bool value);
-        bool OnError_ShowUI();
-        void OnError_ShowUI(bool value);
-        bool OnNoPackageIdentity_NOOP();
-        void OnNoPackageIdentity_NOOP(bool value);
+        bool OnErrorShowUI();
+        void OnErrorShowUI(bool value);
 
     private:
         bool m_ForceDeployment{};
-        bool m_OnError_DebugBreak{};
-        bool m_OnError_DebugBreak_IfDebuggerAttached{};
-        bool m_OnError_FailFast{};
-        bool m_OnError_ShowUI{};
-        bool m_OnNoPackageIdentity_NOOP{};
+        bool m_OnErrorShowUI{};
     };
 }
 namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::factory_implementation

diff --git a/dev/Deployment/DeploymentManager.cpp b/dev/Deployment/DeploymentManager.cpp
@@ -21,7 +21,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
         const AppModel::Identity::PackageIdentity& packageIdentity,
         const std::wstring& release) noexcept;
 
-    HRESULT Initialize_ShowUI_OnError(
+    HRESULT Initialize_OnError_ShowUI(
         const AppModel::Identity::PackageIdentity& packageIdentity,
         const std::wstring& release);
 }
@@ -166,24 +166,18 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
         winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentResult deploymentResult{ winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentStatus::Unknown, S_OK };
         if (!isPackagedProcess)
         {
-            if (deploymentInitializeOptions.OnNoPackageIdentity_NOOP())
-            {
-                // The process lacks package identity but that's OK. Do nothing
-                const auto c_status{ winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentStatus::Ok };
-                return winrt::make<implementation::DeploymentResult>(c_status, S_OK);
-            }
-            hr = LOG_HR_MSG(HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED), "DeploymentManager.Initialize called in a process without package identity");
+            // The process lacks package identity but that's OK. Do nothing
+            const auto c_status{ winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentStatus::Ok };
+            return winrt::make<implementation::DeploymentResult>(c_status, S_OK);
         }
-        else
+
+        try
         {
-            try
-            {
-                deploymentResult = _Initialize(initializeActivityContext, packageFullName, deploymentInitializeOptions);
-            }
-            catch (winrt::hresult_error const& e)
-            {
-                hr = e.code();
-            }
+            deploymentResult = _Initialize(initializeActivityContext, packageFullName, deploymentInitializeOptions);
+        }
+        catch (winrt::hresult_error const& e)
+        {
+            hr = e.code();
         }
         if (FAILED(hr))
         {
@@ -203,28 +197,17 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
 
             // NOTE: IsDebuggerPresent()=TRUE if running under a debugger context.
             //       IsDebuggerPresent()=FALSE if not running under a debugger context, even if AEDebug is set.
-            if (deploymentInitializeOptions.OnError_DebugBreak() ||
-                (deploymentInitializeOptions.OnError_DebugBreak_IfDebuggerAttached() && IsDebuggerPresent()) ||
-                ::Microsoft::Configuration::IsOptionEnabled(L"MICROSOFT_WINDOWSAPPRUNTIME_DEPLOYMENT_INITIALIZE_DEBUGBREAK"))
+            if (IsDebuggerPresent())
             {
                 DebugBreak();
             }
 
-            if (deploymentInitializeOptions.OnError_ShowUI() ||
-                ::Microsoft::Configuration::IsOptionEnabled(L"MICROSOFT_WINDOWSAPPRUNTIME_DEPLOYMENT_INITIALIZE_SHOWUI"))
+            if (deploymentInitializeOptions.OnErrorShowUI() ||
+                ::Microsoft::Configuration::IsOptionEnabled(L"MICROSOFT_WINDOWSAPPRUNTIME_DEPLOYMENT_INITIALIZE_ONERRORSHOWUI"))
             {
-                LOG_IF_FAILED(Initialize_ShowUI_OnError(packageIdentity, release));
+                LOG_IF_FAILED(Initialize_OnError_ShowUI(packageIdentity, release));
             }
 
-            if (deploymentInitializeOptions.OnError_FailFast() ||
-                ::Microsoft::Configuration::IsOptionEnabled(L"MICROSOFT_WINDOWSAPPRUNTIME_DEPLOYMENT_INITIALIZE_FAILFAST"))
-            {
-                const PACKAGE_VERSION version{ packageIdentity.Version() };
-                FAIL_FAST_HR_MSG(hr,
-                                 "DeploymentManager initialize for release %ls (MSIX package version %hu.%hu.%hu.%hu)",
-                                 release.c_str(),
-                                 version.Major, version.Minor, version.Build, version.Revision);
-            }
             Initialize_StopSuccessActivity(initializeActivityContext, deploymentResult.Status(), hr);
             THROW_HR(hr);
         }
@@ -613,7 +596,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
     }
     CATCH_RETURN()
 
-    HRESULT Initialize_ShowUI_OnError(
+    HRESULT Initialize_OnError_ShowUI(
         const AppModel::Identity::PackageIdentity& packageIdentity,
         const std::wstring& release)
     {

diff --git a/dev/Deployment/DeploymentManagerAutoInitializer.cpp b/dev/Deployment/DeploymentManagerAutoInitializer.cpp
@@ -15,11 +15,7 @@
 #if !defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_DEFAULT)
 // Default isn't defined. Define it if no options are defined
 #if defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_NONE)
-#elif defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK)
-#elif defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED)
-#elif defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST)
-#elif defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_SHOWUI)
-#elif defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONNOPACKAGEIDENTITY_NOOP)
+#elif defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERRORSHOWUI)
 #else
 // No options specified! Use the default
 #define MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_DEFAULT
@@ -42,25 +38,13 @@ namespace Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentMan
             ::winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentInitializeOptions options;
 #if defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_DEFAULT)
             // Use the default options
-            options.OnError_ShowUI(true);
+            options.OnErrorShowUI(true);
 #elif defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_NONE)
             // No options!
 #else
             // Use the specified options
-#if defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK)
-            options.OnError_DebugBreak(true);
-#endif
-#if defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED)
-            options.OnError_DebugBreak_IfDebuggerAttached(true);
-#endif
-#if defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST)
-            options.OnError_FailFast(true);
-#endif
-#if defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_SHOWUI)
-            options.OnError_ShowUI(true);
-#endif
-#if defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONNOPACKAGEIDENTITY_NOOP)
-            options.OnNoPackageIdentity_NOOP(true);
+#if defined(MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERRORSHOWUI)
+            options.OnErrorShowUI(true);
 #endif
 #endif
             return options;

diff --git a/dev/Deployment/DeploymentManagerAutoInitializer.cs b/dev/Deployment/DeploymentManagerAutoInitializer.cs
@@ -10,11 +10,7 @@
 #if !MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_DEFAULT
 // Default isn't defined. Define it if no options are defined
 #if MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_NONE
-#elif MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK
-#elif MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED
-#elif MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST
-#elif MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_SHOWUI
-#elif MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONNOPACKAGEIDENTITY_NOOP
+#elif MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERRORSHOWUI
 #else
 // No options specified! Use the default
 #define MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_DEFAULT
@@ -48,25 +44,13 @@ internal static void AccessWindowsAppSDK()
                 var options = new global::Microsoft.Windows.ApplicationModel.WindowsAppRuntime.DeploymentInitializeOptions();
 #if MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_DEFAULT
                 // Use the default options
-                options.OnError_ShowUI = true;
+                options.OnErrorShowUI = true;
 #elif MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_NONE
                 // No options!
 #else
                 // Use the specified options
-#if MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK
-                options.OnError_DebugBreak = true;
-#endif
-#if MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED
-                options.OnError_DebugBreak_IfDebuggerAttached = true;
-#endif
-#if MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST
-                options.OnError_FailFast = true;
-#endif
-#if MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_SHOWUI
-                options.OnError_ShowUI = true;
-#endif
-#if MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONNOPACKAGEIDENTITY_NOOP
-                options.OnNoPackageIdentity_NOOP = true;
+#if MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERRORSHOWUI
+                options.OnErrorShowUI = true;
 #endif
 #endif
                 return options;

diff --git a/...lize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj b/...lize_CPP_Options_Defined/Test_DeploymentManagerAutoInitialize_CPP_Options_Defined.vcxproj
@@ -74,11 +74,7 @@
     <ClCompile>
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <UseFullPaths>true</UseFullPaths>
-      <PreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_DEBUGBREAK_IFDEBUGGERATTACHED;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_FAILFAST;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONERROR_SHOWUI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions>MICROSOFT_WINDOWSAPPSDK_DEPLOYMENTMANAGER_AUTO_INITIALIZE_OPTIONS_ONNOPACKAGEIDENTITY_NOOP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(OutDir)\..\WindowsAppRuntime_DLL;$(OutDir)\..\WindowsAppRuntime_BootstrapDLL</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>