2 files changed, 13 insertions, 2 deletions

diff --git a/src/burn/engine/registration.cpp b/src/burn/engine/registration.cpp
index 0117a993..01ed30d7 100644
--- a/src/burn/engine/registration.cpp
+++ b/src/burn/engine/registration.cpp
@@ -10,6 +10,7 @@ const LPCWSTR REGISTRY_RUN_ONCE_KEY = L"SOFTWARE\\Microsoft\\Windows\\CurrentVer
 const LPCWSTR REGISTRY_BUNDLE_DISPLAY_ICON = L"DisplayIcon";
 const LPCWSTR REGISTRY_BUNDLE_DISPLAY_VERSION = L"DisplayVersion";
 const LPCWSTR REGISTRY_BUNDLE_ESTIMATED_SIZE = L"EstimatedSize";
+const LPCWSTR REGISTRY_BUNDLE_INSTALL_DATE = L"InstallDate";
 const LPCWSTR REGISTRY_BUNDLE_PUBLISHER = L"Publisher";
 const LPCWSTR REGISTRY_BUNDLE_HELP_LINK = L"HelpLink";
 const LPCWSTR REGISTRY_BUNDLE_HELP_TELEPHONE = L"HelpTelephone";
@@ -610,6 +611,7 @@ extern "C" HRESULT RegistrationSessionBegin(
     HKEY hkRegistration = NULL;
     BOOL fCreated = FALSE;
     LPWSTR sczPublisher = NULL;
+    SYSTEMTIME systime = { };
     DWORD er = ERROR_SUCCESS;
 
     AssertSz(BOOTSTRAPPER_REGISTRATION_TYPE_NONE != registrationType, "Registration type can't be NONE");
@@ -814,10 +816,17 @@ extern "C" HRESULT RegistrationSessionBegin(
         ExitOnFailure(hr, "Failed to write update registration.");
     }
 
-    // Only set estimated size here for the first time.
-    // It will always get updated at the end of the session.
+    // Only set install date and initial estimated size here for the first time.
+    // Estimated size will always get updated at the end of the session.
     if (fCreated)
     {
+        // Write the install date.
+        ::GetLocalTime(&systime);
+
+        hr = RegWriteStringFormatted(hkRegistration, REGISTRY_BUNDLE_INSTALL_DATE, L"%04u%02u%02u", systime.wYear, systime.wMonth, systime.wDay);
+        ExitOnFailure(hr, "Failed to write %ls value.", REGISTRY_BUNDLE_INSTALL_DATE);
+
+        // Write the initial estimated size.
         hr = UpdateEstimatedSize(hkRegistration, qwEstimatedSize);
         ExitOnFailure(hr, "Failed to update estimated size.");
     }
diff --git a/src/burn/test/BurnUnitTest/RegistrationTest.cpp b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
index f95c011f..fc84511d 100644
--- a/src/burn/test/BurnUnitTest/RegistrationTest.cpp
+++ b/src/burn/test/BurnUnitTest/RegistrationTest.cpp
@@ -111,6 +111,7 @@ namespace Bootstrapper
                 Assert::True(Directory::Exists(cacheDirectory), "Cache directory didn't exist.");
                 Assert::True(File::Exists(Path::Combine(cacheDirectory, gcnew String(L"setup.exe"))), "Bundle exe wasn't cached.");
 
+                this->ValidateUninstallKeyString(L"InstallDate", DateTime::Now.ToString("yyyyMMdd"));
                 this->ValidateUninstallKeyResume(Int32(BURN_RESUME_MODE_ACTIVE));
                 this->ValidateRunOnceKeyEntry(cacheExePath);
 
@@ -121,6 +122,7 @@ namespace Bootstrapper
                 // verify that registration was removed
                 Assert::False(Directory::Exists(cacheDirectory), "Cache directory wasn't removed.");
 
+                this->ValidateUninstallKeyNull(L"InstallDate");
                 this->ValidateUninstallKeyNull(L"Resume");
                 this->ValidateRunOnceKeyString(TEST_BUNDLE_ID, nullptr);
             }