* ApplicationBase.OperatingSystem.InstallDate bugfix for x86 builds

bytecode77 · Sep 19, 2019 · cf31df7 · cf31df7
1 parent b7039dd
commit cf31df7
Show file tree

Hide file tree

Showing 4 changed files with 96 additions and 1 deletion.
diff --git a/BytecodeApi.sln b/BytecodeApi.sln
@@ -39,57 +39,107 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{EA00307E-CE27-4A53-B7DB-052181E1C24C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA00307E-CE27-4A53-B7DB-052181E1C24C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA00307E-CE27-4A53-B7DB-052181E1C24C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA00307E-CE27-4A53-B7DB-052181E1C24C}.Debug|x86.Build.0 = Debug|Any CPU
 		{EA00307E-CE27-4A53-B7DB-052181E1C24C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EA00307E-CE27-4A53-B7DB-052181E1C24C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA00307E-CE27-4A53-B7DB-052181E1C24C}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA00307E-CE27-4A53-B7DB-052181E1C24C}.Release|x86.Build.0 = Release|Any CPU
 		{448B54DE-D62E-44CE-9E25-862F1BD58101}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{448B54DE-D62E-44CE-9E25-862F1BD58101}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{448B54DE-D62E-44CE-9E25-862F1BD58101}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{448B54DE-D62E-44CE-9E25-862F1BD58101}.Debug|x86.Build.0 = Debug|Any CPU
 		{448B54DE-D62E-44CE-9E25-862F1BD58101}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{448B54DE-D62E-44CE-9E25-862F1BD58101}.Release|Any CPU.Build.0 = Release|Any CPU
+		{448B54DE-D62E-44CE-9E25-862F1BD58101}.Release|x86.ActiveCfg = Release|Any CPU
+		{448B54DE-D62E-44CE-9E25-862F1BD58101}.Release|x86.Build.0 = Release|Any CPU
 		{A3E69E94-20B1-4E18-B3E3-15E56A7F0288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3E69E94-20B1-4E18-B3E3-15E56A7F0288}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3E69E94-20B1-4E18-B3E3-15E56A7F0288}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3E69E94-20B1-4E18-B3E3-15E56A7F0288}.Debug|x86.Build.0 = Debug|Any CPU
 		{A3E69E94-20B1-4E18-B3E3-15E56A7F0288}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3E69E94-20B1-4E18-B3E3-15E56A7F0288}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3E69E94-20B1-4E18-B3E3-15E56A7F0288}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3E69E94-20B1-4E18-B3E3-15E56A7F0288}.Release|x86.Build.0 = Release|Any CPU
 		{8F135820-20DE-4950-AEB0-98CFE29F297A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8F135820-20DE-4950-AEB0-98CFE29F297A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8F135820-20DE-4950-AEB0-98CFE29F297A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8F135820-20DE-4950-AEB0-98CFE29F297A}.Debug|x86.Build.0 = Debug|Any CPU
 		{8F135820-20DE-4950-AEB0-98CFE29F297A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8F135820-20DE-4950-AEB0-98CFE29F297A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8F135820-20DE-4950-AEB0-98CFE29F297A}.Release|x86.ActiveCfg = Release|Any CPU
+		{8F135820-20DE-4950-AEB0-98CFE29F297A}.Release|x86.Build.0 = Release|Any CPU
 		{19125B4E-9B75-49F4-A3C2-B6DFD51E2AEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{19125B4E-9B75-49F4-A3C2-B6DFD51E2AEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{19125B4E-9B75-49F4-A3C2-B6DFD51E2AEA}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{19125B4E-9B75-49F4-A3C2-B6DFD51E2AEA}.Debug|x86.Build.0 = Debug|Any CPU
 		{19125B4E-9B75-49F4-A3C2-B6DFD51E2AEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{19125B4E-9B75-49F4-A3C2-B6DFD51E2AEA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{19125B4E-9B75-49F4-A3C2-B6DFD51E2AEA}.Release|x86.ActiveCfg = Release|Any CPU
+		{19125B4E-9B75-49F4-A3C2-B6DFD51E2AEA}.Release|x86.Build.0 = Release|Any CPU
 		{FE6DCECE-1A49-418A-8820-2ABF5ED9F87D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE6DCECE-1A49-418A-8820-2ABF5ED9F87D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FE6DCECE-1A49-418A-8820-2ABF5ED9F87D}.Debug|x86.ActiveCfg = Debug|x86
+		{FE6DCECE-1A49-418A-8820-2ABF5ED9F87D}.Debug|x86.Build.0 = Debug|x86
 		{FE6DCECE-1A49-418A-8820-2ABF5ED9F87D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE6DCECE-1A49-418A-8820-2ABF5ED9F87D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FE6DCECE-1A49-418A-8820-2ABF5ED9F87D}.Release|x86.ActiveCfg = Release|Any CPU
+		{FE6DCECE-1A49-418A-8820-2ABF5ED9F87D}.Release|x86.Build.0 = Release|Any CPU
 		{1F0E9DBD-8CB8-4E57-80BF-465B539E3D4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1F0E9DBD-8CB8-4E57-80BF-465B539E3D4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F0E9DBD-8CB8-4E57-80BF-465B539E3D4F}.Debug|x86.ActiveCfg = Debug|x86
+		{1F0E9DBD-8CB8-4E57-80BF-465B539E3D4F}.Debug|x86.Build.0 = Debug|x86
 		{1F0E9DBD-8CB8-4E57-80BF-465B539E3D4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1F0E9DBD-8CB8-4E57-80BF-465B539E3D4F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F0E9DBD-8CB8-4E57-80BF-465B539E3D4F}.Release|x86.ActiveCfg = Release|Any CPU
+		{1F0E9DBD-8CB8-4E57-80BF-465B539E3D4F}.Release|x86.Build.0 = Release|Any CPU
 		{5EA1BD73-E9C2-453C-A76A-691E2F5096BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5EA1BD73-E9C2-453C-A76A-691E2F5096BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5EA1BD73-E9C2-453C-A76A-691E2F5096BC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5EA1BD73-E9C2-453C-A76A-691E2F5096BC}.Debug|x86.Build.0 = Debug|Any CPU
 		{5EA1BD73-E9C2-453C-A76A-691E2F5096BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5EA1BD73-E9C2-453C-A76A-691E2F5096BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5EA1BD73-E9C2-453C-A76A-691E2F5096BC}.Release|x86.ActiveCfg = Release|Any CPU
+		{5EA1BD73-E9C2-453C-A76A-691E2F5096BC}.Release|x86.Build.0 = Release|Any CPU
 		{18C47386-1D9F-41A8-A21D-E30037C1E04F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{18C47386-1D9F-41A8-A21D-E30037C1E04F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{18C47386-1D9F-41A8-A21D-E30037C1E04F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{18C47386-1D9F-41A8-A21D-E30037C1E04F}.Debug|x86.Build.0 = Debug|Any CPU
 		{18C47386-1D9F-41A8-A21D-E30037C1E04F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{18C47386-1D9F-41A8-A21D-E30037C1E04F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{18C47386-1D9F-41A8-A21D-E30037C1E04F}.Release|x86.ActiveCfg = Release|Any CPU
+		{18C47386-1D9F-41A8-A21D-E30037C1E04F}.Release|x86.Build.0 = Release|Any CPU
 		{A3C1288D-B08D-40EC-AC60-3E70A34CB696}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A3C1288D-B08D-40EC-AC60-3E70A34CB696}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3C1288D-B08D-40EC-AC60-3E70A34CB696}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3C1288D-B08D-40EC-AC60-3E70A34CB696}.Debug|x86.Build.0 = Debug|Any CPU
 		{A3C1288D-B08D-40EC-AC60-3E70A34CB696}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A3C1288D-B08D-40EC-AC60-3E70A34CB696}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3C1288D-B08D-40EC-AC60-3E70A34CB696}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3C1288D-B08D-40EC-AC60-3E70A34CB696}.Release|x86.Build.0 = Release|Any CPU
 		{A36B92E7-6419-48FA-95D6-AC1B7855590D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A36B92E7-6419-48FA-95D6-AC1B7855590D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A36B92E7-6419-48FA-95D6-AC1B7855590D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A36B92E7-6419-48FA-95D6-AC1B7855590D}.Debug|x86.Build.0 = Debug|Any CPU
 		{A36B92E7-6419-48FA-95D6-AC1B7855590D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A36B92E7-6419-48FA-95D6-AC1B7855590D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A36B92E7-6419-48FA-95D6-AC1B7855590D}.Release|x86.ActiveCfg = Release|Any CPU
+		{A36B92E7-6419-48FA-95D6-AC1B7855590D}.Release|x86.Build.0 = Release|Any CPU
 		{E843216D-BD78-4FAB-B2D1-5BB9920F0F5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E843216D-BD78-4FAB-B2D1-5BB9920F0F5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E843216D-BD78-4FAB-B2D1-5BB9920F0F5C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E843216D-BD78-4FAB-B2D1-5BB9920F0F5C}.Debug|x86.Build.0 = Debug|Any CPU
 		{E843216D-BD78-4FAB-B2D1-5BB9920F0F5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E843216D-BD78-4FAB-B2D1-5BB9920F0F5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E843216D-BD78-4FAB-B2D1-5BB9920F0F5C}.Release|x86.ActiveCfg = Release|Any CPU
+		{E843216D-BD78-4FAB-B2D1-5BB9920F0F5C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/BytecodeApi/ApplicationBase.cs b/BytecodeApi/ApplicationBase.cs
@@ -357,7 +357,8 @@ public static class OperatingSystem
 				() => InstallDate,
 				() =>
 				{
-					using (RegistryKey key = Registry.LocalMachine.OpenSubKey(@"Software\Microsoft\Windows NT\CurrentVersion"))
+					using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64))
+					using (RegistryKey key = baseKey.OpenSubKey(@"Software\Microsoft\Windows NT\CurrentVersion"))
 					{
 						int installDate = key.GetInt32Value("InstallDate", 0);
 						return installDate == 0 ? (DateTime?)null : DateTimeEx.ConvertUnixTimeStamp((uint)installDate);

diff --git a/Playground.Console/Playground.Console.csproj b/Playground.Console/Playground.Console.csproj
@@ -38,6 +38,28 @@
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>latest</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>latest</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

diff --git a/Playground.Wpf/Playground.Wpf.csproj b/Playground.Wpf/Playground.Wpf.csproj
@@ -40,6 +40,28 @@
     <LangVersion>latest</LangVersion>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>latest</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <LangVersion>latest</LangVersion>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />