Correctly handle different architectures for devdeviceID (#43471)

Author: marcpopMSFT

src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs

@@ -38,8 +38,8 @@ private static string GetCachedDeviceId()
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                // Get device Id from Windows registry
-                using (var key = Registry.CurrentUser.OpenSubKey(@"SOFTWARE\Microsoft\DeveloperTools"))
+                // Get device Id from Windows registry matching the OS architecture
+                using (var key = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64).OpenSubKey(@"SOFTWARE\Microsoft\DeveloperTools"))
                 {
                     deviceId = key?.GetValue("deviceid") as string;
                 }
@@ -80,10 +80,16 @@ private static void CacheDeviceId(string deviceId)
         {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                // Cache device Id in Windows registry
-                using (var key = Registry.CurrentUser.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools"))
+                // Cache device Id in Windows registry matching the OS architecture
+                using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64))
                 {
-                    key.SetValue("deviceid", deviceId);
+                    using(var key = baseKey.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools"))
+                    {
+                        if (key != null)
+                        {
+                          key.SetValue("deviceid", deviceId);
+                        }
+                    }
                 }
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))

src/Tests/dotnet.Tests/TelemetryCommonPropertiesTests.cs

@@ -50,12 +50,16 @@ public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotGetMacAddress(
         }
 
         [Fact]
-        public void TelemetryCommonPropertiesShouldReturnNewGuidWhenCannotDevDeviceId()
+        public void TelemetryCommonPropertiesShouldEnsureDevDeviceIDIsCached()
         {
             var unitUnderTest = new TelemetryCommonProperties(userLevelCacheWriter: new NothingCache());
             var assignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"];
 
             Guid.TryParse(assignedMachineId, out var _).Should().BeTrue("it should be a guid");
+            var secondAssignedMachineId = unitUnderTest.GetTelemetryCommonProperties()["devdeviceid"];
+
+            Guid.TryParse(secondAssignedMachineId, out var _).Should().BeTrue("it should be a guid");
+            secondAssignedMachineId.Should().Be(assignedMachineId, "it should match the previously assigned guid");
         }
 
         [Fact]